- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: transport: Pass argparse.Namespace directly into transport classes
by laforge 21 Dec '23

21 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35382?usp=email ) Change subject: transport: Pass argparse.Namespace directly into transport classes ...................................................................... transport: Pass argparse.Namespace directly into transport classes It's odd that the individual transport driver specifies their argparse options but then the core transport part evaluates them individually. This means we cannot add new options within a transport. Let's pass the Namespace instance into the constructor of the specific transport to improve this. Change-Id: Ib977007dd605ec9a9c09a3d143d2c2308991a12c --- M contrib/sim-rest-server.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 6 files changed, 39 insertions(+), 21 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/sim-rest-server.py b/contrib/sim-rest-server.py index fc8afd9..0e44b23 100755 --- a/contrib/sim-rest-server.py +++ b/contrib/sim-rest-server.py @@ -38,7 +38,7 @@ pass def connect_to_card(slot_nr:int): - tp = PcscSimLink(slot_nr, apdu_tracer=ApduPrintTracer()) + tp = PcscSimLink(argparse.Namespace(pcsc_dev=slot_nr), apdu_tracer=ApduPrintTracer()) tp.connect() scc = SimCardCommands(tp) diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 2ffb9c3..e0e1e62 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -289,17 +289,15 @@ """ if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink - sl = PcscSimLink(opts.pcsc_dev, **kwargs) + sl = PcscSimLink(opts, **kwargs) elif opts.osmocon_sock is not None: from pySim.transport.calypso import CalypsoSimLink - sl = CalypsoSimLink(sock_path=opts.osmocon_sock, **kwargs) + sl = CalypsoSimLink(opts, **kwargs) elif opts.modem_dev is not None: from pySim.transport.modem_atcmd import ModemATCommandLink - sl = ModemATCommandLink( - device=opts.modem_dev, baudrate=opts.modem_baud, **kwargs) + sl = ModemATCommandLink(opts, **kwargs) else: # Serial reader is default print("No reader/driver specified; falling back to default (Serial reader)") from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, - baudrate=opts.baudrate, **kwargs) + sl = SerialSimLink(opts, **kwargs) return sl diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index 98330a9..01bbe23 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -77,7 +77,8 @@ class CalypsoSimLink(LinkBase): """Transport Link for Calypso based phones.""" - def __init__(self, sock_path: str = "/tmp/osmocom_l2", **kwargs): + def __init__(self, opts: argparse.Namespace = argparse.Namespace(osmocon_sock="/tmp/osmocom_l2"), **kwargs): + sock_path = opts.osmocon_sock super().__init__(**kwargs) if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": print("Using Calypso-based (OsmocomBB) reader interface") diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index 71f76e2..9a4f0a5 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -35,7 +35,10 @@ class ModemATCommandLink(LinkBase): """Transport Link for 3GPP TS 27.007 compliant modems.""" - def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 115200, **kwargs): + def __init__(self, opts: argparse.Namespace = argparse.Namespace(modem_dev='/dev/ttyUSB0', + modem_baud=115200), **kwargs): + device = opts.modem_dev + baudrate = opts.modem_baud super().__init__(**kwargs) if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": print("Using modem for Generic SIM Access (3GPP TS 27.007)") diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index 762908c..6afcdac 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -34,18 +34,18 @@ class PcscSimLink(LinkBase): """ pySim: PCSC reader transport link.""" - def __init__(self, reader_number: int = 0, **kwargs): + def __init__(self, opts: argparse.Namespace = argparse.Namespace(pcsc_dev=0), **kwargs): super().__init__(**kwargs) if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": print("Using PC/SC reader interface") else: - print("Using PC/SC reader number %u" % reader_number) + print("Using PC/SC reader number %u" % opts.pcsc_dev) r = readers() - if reader_number >= len(r): - raise ReaderError('No reader found for number %d' % reader_number) - self._reader = r[reader_number] + if opts.pcsc_dev >= len(r): + raise ReaderError('No reader found for number %d' % opts.pcsc_dev) + self._reader = r[opts.pcsc_dev] self._con = self._reader.createConnection() - self._reader_number = reader_number + self._reader_number = opts.pcsc_dev def __del__(self): try: diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index ad800ed..e6803be 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -30,24 +30,24 @@ class SerialSimLink(LinkBase): """ pySim: Transport Link for serial (RS232) based readers included with simcard""" - def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 9600, rst: str = '-rts', + def __init__(self, opts = argparse.Namespace(device='/dev/ttyUSB0', baudrate=9600), rst: str = '-rts', debug: bool = False, **kwargs): super().__init__(**kwargs) if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": print("Using serial reader interface") else: - print("Using serial reader interface at port %s" % device) - if not os.path.exists(device): - raise ValueError("device file %s does not exist -- abort" % device) + print("Using serial reader interface at port %s" % opts.device) + if not os.path.exists(opts.device): + raise ValueError("device file %s does not exist -- abort" % opts.device) self._sl = serial.Serial( - port=device, + port=opts.device, parity=serial.PARITY_EVEN, bytesize=serial.EIGHTBITS, stopbits=serial.STOPBITS_TWO, timeout=1, xonxoff=0, rtscts=0, - baudrate=baudrate, + baudrate=opts.baudrate, ) self._rst_pin = rst self._debug = debug -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35382?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib977007dd605ec9a9c09a3d143d2c2308991a12c Gerrit-Change-Number: 35382 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: transport: Extend the documentation for each transport driver
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34962?usp=email ) Change subject: transport: Extend the documentation for each transport driver ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34962?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8807bfb11f43b167f1321d556e09ec5234fff629 Gerrit-Change-Number: 34962 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: transport: Move printing of reader number/name to generic code
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34961?usp=email ) Change subject: transport: Move printing of reader number/name to generic code ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I663a9ea69bf7e7aaa6502896b6a71ef692f8d844 Gerrit-Change-Number: 34961 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: transport/pcsc: Allow opening PC/SC readers by a regex of their name
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34960?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: transport/pcsc: Allow opening PC/SC readers by a regex of their name ...................................................................... Patch Set 4: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34960?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I983f19c6741904c1adf27749c9801b44a03a5d78 Gerrit-Change-Number: 34960 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: transport/pcsc: Allow opening PC/SC readers by a regex of their name
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34960?usp=email ) Change subject: transport/pcsc: Allow opening PC/SC readers by a regex of their name ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34960?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I983f19c6741904c1adf27749c9801b44a03a5d78 Gerrit-Change-Number: 34960 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: transport: Pass argparse.Namespace directly into transport classes
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35382?usp=email ) Change subject: transport: Pass argparse.Namespace directly into transport classes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35382?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib977007dd605ec9a9c09a3d143d2c2308991a12c Gerrit-Change-Number: 35382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: fixeria, jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Neels: I think you're right. Changed to CR-1. […] In general we are breaking compatibility *way* too often with interfaces like PCU or MNCC. This creates difficulties for our users so we should avoid it if at all possible. So yes, in this situation with larger mncc messages we should test compatibility between new version of osmo-msc and old/unmodified versions of osmo-sip-connector and the TTCN3 MNCC implementation. If it works as expected with both of those, then we should be fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 11:31:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton
by fixeria 21 Dec '23

21 Dec '23

Attention is currently required from: jolly, laforge, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Patch Set 2: Code-Review-1 (1 comment) Patchset: PS2: > @vyanitskiy@sysmocom. […] Neels: I think you're right. Changed to CR-1. The problem with adding new fields is that we enlarge the MNCC PDU. While it may be fine sending a larger PDU to a peer; we may have problems when a peer is sending a shorter PDU than we expect. If you're sure this works fine and: * an older version of osmo-sip-connector can still "talk" to recent osmo-msc, * an older version of osmo-msc can still "talk" to recent osmo-sip-connector, as long as they "speak" the same MNCC protocol version, we must be absolutely sure that this would not cause any fallout for the respective TTCN-3 testsuites. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 21 Dec 2023 01:47:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch
by neels 21 Dec '23

21 Dec '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email ) Change subject: mgw: do not fail MGCP on codec mismatch ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/35302/comment/1327b37f_24e71f52 PS1, Line 21: Still fail if one side has no codecs -- the only reason is that changing > I?m not following here. I don't understand why failing when the other side has no codecs set. only because that is what osmo-mgw is currently doing, and I don't want to change too many things at once. updating the commit log... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 00:25:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton
by neels 21 Dec '23

21 Dec '23

Attention is currently required from: fixeria, jolly, laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > We cannot add new fields to the MNCC protocol without bumping the protocol version. @vyanitskiy@sysmocom.de a vote of -2 is sticky and means "the idea of this patch is flawed and we will never merge this no matter what" ... I guess instead you mean to -1 until the version number is bumped along with this patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Dec 2023 00:04:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log