July 2023 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim/tlv.py: Don't create an exception from within raise
by laforge 11 Jul '23

11 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33661 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pySim/tlv.py: Don't create an exception from within raise ...................................................................... pySim/tlv.py: Don't create an exception from within raise An invalid variable used in a raise ValueError() would cause a further exception, depriving the user of a meaningful error message. Change-Id: I6eb31b91bd69c311f07ff259a424edc58b57529a --- M pySim/tlv.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/tlv.py b/pySim/tlv.py index 22a14cd..3e245b5 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -395,7 +395,7 @@ res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % - (self, i[0], decoded, self.members_by_name.keys())) + (self, k, decoded, self.members_by_name.keys())) self.children = res return res -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6eb31b91bd69c311f07ff259a424edc58b57529a Gerrit-Change-Number: 33661 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: TLV_IE_Collection: use snake-style names during from_dict()
by laforge 11 Jul '23

11 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33660 ) Change subject: TLV_IE_Collection: use snake-style names during from_dict() ...................................................................... TLV_IE_Collection: use snake-style names during from_dict() The TLV_IE_Collection, just like the individual TLV classes, do use their snake-style names when converting from binary to dict using the to_dict() method. It is inconsistent (and a bug) to expect the CamelCase names during encoding (from_dict). After all, we want the output of to_dict() to be used as input to from_dict(). Change-Id: Iabd1ad98c3878659d123eef919c22ca824886f8a --- M pySim/ara_m.py M pySim/global_platform.py M pySim/tlv.py 3 files changed, 28 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ara_m.py b/pySim/ara_m.py index 59f205c..e2e6da1 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -349,28 +349,28 @@ # REF ref_do_content = [] if opts.aid: - ref_do_content += [{'AidRefDO': opts.aid}] + ref_do_content += [{'aid_ref_do': opts.aid}] elif opts.aid_empty: - ref_do_content += [{'AidRefEmptyDO': None}] - ref_do_content += [{'DevAppIdRefDO': opts.device_app_id}] + ref_do_content += [{'aid_ref_empty_do': None}] + ref_do_content += [{'dev_app_id_ref_do': opts.device_app_id}] if opts.pkg_ref: - ref_do_content += [{'PkgRefDO': opts.pkg_ref}] + ref_do_content += [{'pkg_ref_do': opts.pkg_ref}] # AR ar_do_content = [] if opts.apdu_never: - ar_do_content += [{'ApduArDO': {'generic_access_rule': 'never'}}] + ar_do_content += [{'apdu_ar_od': {'generic_access_rule': 'never'}}] elif opts.apdu_always: - ar_do_content += [{'ApduArDO': {'generic_access_rule': 'always'}}] + ar_do_content += [{'apdu_ar_do': {'generic_access_rule': 'always'}}] elif opts.apdu_filter: # TODO: multiple filters - ar_do_content += [{'ApduArDO': {'apdu_filter': [opts.apdu_filter]}}] + ar_do_content += [{'apdu_ar_do': {'apdu_filter': [opts.apdu_filter]}}] if opts.nfc_always: - ar_do_content += [{'NfcArDO': {'nfc_event_access_rule': 'always'}}] + ar_do_content += [{'nfc_ar_do': {'nfc_event_access_rule': 'always'}}] elif opts.nfc_never: - ar_do_content += [{'NfcArDO': {'nfc_event_access_rule': 'never'}}] + ar_do_content += [{'nfc_ar_do': {'nfc_event_access_rule': 'never'}}] if opts.android_permissions: - ar_do_content += [{'PermArDO': {'permissions': opts.android_permissions}}] - d = [{'RefArDO': [{'RefDO': ref_do_content}, {'ArDO': ar_do_content}]}] + ar_do_content += [{'perm_ar_do': {'permissions': opts.android_permissions}}] + d = [{'ref_ar_do': [{'ref_do': ref_do_content}, {'ar_do': ar_do_content}]}] csrado = CommandStoreRefArDO() csrado.from_dict(d) res_do = ADF_ARAM.store_data(self._cmd.card._scc._tp, csrado) diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 1c31ddc..baae234 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -232,8 +232,7 @@ self._cmd.poutput_json(ie.to_dict()) def complete_get_data(self, text, line, begidx, endidx) -> List[str]: - #data_dict = {camel_to_snake(str(x.__name__)): x for x in DataCollection.possible_nested} - data_dict = {str(x.__name__): x for x in DataCollection.possible_nested} + data_dict = {camel_to_snake(str(x.__name__)): x for x in DataCollection.possible_nested} index_dict = {1: data_dict} return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) diff --git a/pySim/tlv.py b/pySim/tlv.py index bd95505..22a14cd 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -318,7 +318,7 @@ self.members_by_tag = {} self.members_by_name = {} self.members_by_tag = {m.tag: m for m in self.members} - self.members_by_name = {m.__name__: m for m in self.members} + self.members_by_name = {camel_to_snake(m.__name__): m for m in self.members} # if we are a constructed IE, [ordered] list of actual child-IE instances self.children = kwargs.get('children', []) self.encoded = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabd1ad98c3878659d123eef919c22ca824886f8a Gerrit-Change-Number: 33660 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: TLV_IE_Collection: use snake-style names during from_dict()
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33660 ) Change subject: TLV_IE_Collection: use snake-style names during from_dict() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabd1ad98c3878659d123eef919c22ca824886f8a Gerrit-Change-Number: 33660 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 11 Jul 2023 09:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-prog: Also accept 18-digit ICCIDs
by laforge 11 Jul '23

11 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33672 ) Change subject: pySim-prog: Also accept 18-digit ICCIDs ...................................................................... pySim-prog: Also accept 18-digit ICCIDs There are cards with 18-digit ICCIDs, so let's be a bit more tolerant. Change-Id: I5395daeb2e96987335f6f9bf540c28d516001394 --- M pySim-prog.py 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/33672/1 diff --git a/pySim-prog.py b/pySim-prog.py index 7c644b7..028db55 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -357,8 +357,8 @@ # ICCID (19 digits, E.118), though some phase1 vendors use 20 :( if opts.iccid is not None: iccid = opts.iccid - if not _isnum(iccid, 19) and not _isnum(iccid, 20): - raise ValueError('ICCID must be 19 or 20 digits !') + if not _isnum(iccid, 18) and not _isnum(iccid, 19) and not _isnum(iccid, 20): + raise ValueError('ICCID must be 18, 19 or 20 digits !') else: if opts.num is None: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5395daeb2e96987335f6f9bf540c28d516001394 Gerrit-Change-Number: 33672 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-bts[master]: osmo-bts-trx: implement CSD scheduling support
by pespin 11 Jul '23

11 Jul '23

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32727 ) Change subject: osmo-bts-trx: implement CSD scheduling support ...................................................................... Patch Set 14: (1 comment) File include/osmo-bts/scheduler.h: https://gerrit.osmocom.org/c/osmo-bts/+/32727/comment/9fb3007d_379799fd PS14, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 entries */ it may be good to document here where this 24 comes from. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I08ffbf8e79ce76a586d61f5463890c6e72a6d9b9 Gerrit-Change-Number: 32727 Gerrit-PatchSet: 14 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 08:56:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: fix bts_supports_cm(): properly check feature flags for VGCS/VBS
by pespin 11 Jul '23

11 Jul '23

Attention is currently required from: jolly, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33667 ) Change subject: fix bts_supports_cm(): properly check feature flags for VGCS/VBS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I914c84be04da819df9e60e2f5ecc5bac9b61b2e5 Gerrit-Change-Number: 33667 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(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: Tue, 11 Jul 2023 08:51:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: Install liburing as osmocom build dep
by daniel 11 Jul '23

11 Jul '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33671 ) Change subject: ansible: Install liburing as osmocom build dep ...................................................................... ansible: Install liburing as osmocom build dep Change-Id: I2535672959e307ef2fa184e2eaf54f883f5c78dc --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/33671/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 8faab77..f8ebc4e 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -86,6 +86,7 @@ - libsystemd-dev - libtalloc-dev - libuhd-dev + - liburing-dev - libusb-1.0-0-dev - libusb-dev - libzmq3-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2535672959e307ef2fa184e2eaf54f883f5c78dc Gerrit-Change-Number: 33671 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: GlobalPlatform ADF.SD: Add command line reference + error message
by laforge 11 Jul '23

11 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33670 ) Change subject: GlobalPlatform ADF.SD: Add command line reference + error message ...................................................................... GlobalPlatform ADF.SD: Add command line reference + error message The get_data shell command didn't have any interactive help / syntax, and no meaningful error message in case an unknown data object name was specified by the user. Let's fix that. Change-Id: I09faaf5d45118635cf832c8c513033aede1427e5 --- M docs/shell.rst M pySim/global_platform.py 2 files changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/33670/1 diff --git a/docs/shell.rst b/docs/shell.rst index ef08fcf..73b988a 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -795,8 +795,9 @@ get_data ~~~~~~~~ -Performs the GET DATA command as specified by GlobalPlatform. - +.. argparse:: + :module: pySim.global_platform + :func: ADF_SD.AddlShellCommands.get_data_parser cmd2 settable parameters ------------------------ diff --git a/pySim/global_platform.py b/pySim/global_platform.py index baae234..ea8b70d 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -223,9 +223,21 @@ def __init__(self): super().__init__() + get_data_parser = argparse.ArgumentParser() + get_data_parser.add_argument('data_object_name', type=str, + help='Name of the data object to be retrieved from the card') + + @cmd2.with_argparser(get_data_parser) def do_get_data(self, opts): - tlv_cls_name = opts.arg_list[0] - tlv_cls = DataCollection().members_by_name[tlv_cls_name] + """Perform the GlobalPlatform GET DATA command in order to obtain some card-specific data.""" + tlv_cls_name = opts.data_object_name + try: + tlv_cls = DataCollection().members_by_name[tlv_cls_name] + except KeyError: + do_names = [camel_to_snake(str(x.__name__)) for x in DataCollection.possible_nested] + self._cmd.poutput('Unknown data object "%s", available options: %s' % (tlv_cls_name, + do_names)) + return (data, sw) = self._cmd.card._scc.get_data(cla=0x80, tag=tlv_cls.tag) ie = tlv_cls() ie.from_tlv(h2b(data)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I09faaf5d45118635cf832c8c513033aede1427e5 Gerrit-Change-Number: 33670 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: TLV_IE_Collection: use snake-style names during from_dict()
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33660 to look at the new patch set (#2). Change subject: TLV_IE_Collection: use snake-style names during from_dict() ...................................................................... TLV_IE_Collection: use snake-style names during from_dict() The TLV_IE_Collection, just like the individual TLV classes, do use their snake-style names when converting from binary to dict using the to_dict() method. It is inconsistent (and a bug) to expect the CamelCase names during encoding (from_dict). After all, we want the output of to_dict() to be used as input to from_dict(). Change-Id: Iabd1ad98c3878659d123eef919c22ca824886f8a --- M pySim/ara_m.py M pySim/global_platform.py M pySim/tlv.py 3 files changed, 28 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/33660/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabd1ad98c3878659d123eef919c22ca824886f8a Gerrit-Change-Number: 33660 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-mgw[master]: ASCI: Add new mode for voice group/broadcast call
by jolly 11 Jul '23

11 Jul '23

Attention is currently required from: pespin, dexter. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33546 ) Change subject: ASCI: Add new mode for voice group/broadcast call ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/33546/comment/b1665749_456f681a PS3, Line 23: connection receives RTP in case of a conference. > I'm still not really understanding this paragraph sorry :/ […] Sending and receiving is from the MGW point of view. This is how the modes are named. RTP may be received from multiple connection at a time. This is true for a point to point conversation. In this case there is only one destination connection for the RTP, the other connection. This is because there is no echo, the receiving connection does not echo it back. In cases of conference or having additional echo (confecho), it may be possible that a connection must mix RTP from different (receiving) connections. In case of two confecho connections, the two connections receive audio at a time and both connection must send the mixed RTP. This would only be possible with transcoding. This is currently not possible. In this case the MSC must switch the mode so that only one connection receives RTP and no mixing is required. In case of a conference, the talking connection is switched to receive RTP only (or confecho), all other connections are switched to send RTP only. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0639c663e119d85bef1010c7aa45e2f133a9daf0 Gerrit-Change-Number: 33546 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 07:13:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0