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

Change in pysim[master]: filesystem.py: Make CardDF.get_selectables() respect the flags

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28765 ) Change subject: filesystem.py: Make CardDF.get_selectables() respect the flags ...................................................................... filesystem.py: Make CardDF.get_selectables() respect the flags All other get_selectables() understand a flag like 'FIDS' to request only the hexadecimal FIDs and not the file names. However, the CardEF.get_selectables() ignored those flags and unconditionally returned the names. Change-Id: Icdc37cae3eecd36d167da76c30224b9d48c844fd --- M pySim/filesystem.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 598121b..886a48d 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -541,8 +541,10 @@ """ # global selectable names + those of the parent DF sels = super().get_selectables(flags) - sels.update( - {x.name: x for x in self.parent.children.values() if x != self}) + if flags == [] or 'FIDS' in flags: + sels.update({x.fid: x for x in self.parent.children.values() if x.fid and x != self}) + if flags == [] or 'FNAMES' in flags: + sels.update({x.name: x for x in self.parent.children.values() if x.name and x != self}) return sels -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdc37cae3eecd36d167da76c30224b9d48c844fd Gerrit-Change-Number: 28765 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28766 ) Change subject: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id" ...................................................................... apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id" This was [sadly] simply missing from the implementation so far. Change-Id: I7bbd13ce29f5adc1ca3ca01bffabbe02dd17db20 --- M pySim/apdu/ts_102_221.py 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index e5455d0..0ca6702 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -78,6 +78,17 @@ elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') + sels = lchan.selected_file.get_selectables(['FIDS']) + file_hex = b2h(self.cmd_data) + if file_hex in sels: + if self.successful: + #print("\tSELECT %s" % sels[file_hex]) + lchan.selected_file = sels[file_hex] + else: + #print("\tSELECT %s FAILED" % sels[file_hex]) + pass + else: + logger.warning('SELECT UNKNOWN FID %s' % (file_hex)) elif mode == 'df_name': # Select by AID (can be sub-string!) aid = self.cmd_dict['body'] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7bbd13ce29f5adc1ca3ca01bffabbe02dd17db20 Gerrit-Change-Number: 28766 Gerrit-PatchSet: 1 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Fix SELECT of 3f00

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28767 ) Change subject: apdu/ts_102_221: Fix SELECT of 3f00 ...................................................................... apdu/ts_102_221: Fix SELECT of 3f00 In order to be able to explicitly select the MF via 3f00, we need to pass the 'MF' to get_selectables(), so the record is included in the list of selectable files from the current working directory. Change-Id: I27085896142fe547a6e93e01e63e59bbc65c8b8a --- M pySim/apdu/ts_102_221.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 0ca6702..3597db8 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -63,9 +63,10 @@ lchan.selected_adf = sels['ADF.USIM'] lchan.selected_file = lchan.selected_adf #print("\tSELECT CUR_ADF %s" % lchan.selected_file) + # iterate to next element in path continue else: - sels = lchan.selected_file.get_selectables(['FIDS']) + sels = lchan.selected_file.get_selectables(['FIDS','MF']) if file_hex in sels: if self.successful: #print("\tSELECT %s" % sels[file_hex]) @@ -73,12 +74,13 @@ else: #print("\tSELECT %s FAILED" % sels[file_hex]) pass + # iterate to next element in path continue logger.warning('SELECT UNKNOWN FID %s (%s)' % (file_hex, '/'.join([b2h(x) for x in path]))) elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') - sels = lchan.selected_file.get_selectables(['FIDS']) + sels = lchan.selected_file.get_selectables(['FIDS','MF']) file_hex = b2h(self.cmd_data) if file_hex in sels: if self.successful: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I27085896142fe547a6e93e01e63e59bbc65c8b8a Gerrit-Change-Number: 28767 Gerrit-PatchSet: 1 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Fix SELECT of 3f00

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28767 ) Change subject: apdu/ts_102_221: Fix SELECT of 3f00 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I27085896142fe547a6e93e01e63e59bbc65c8b8a Gerrit-Change-Number: 28767 Gerrit-PatchSet: 1 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-Comment-Date: Mon, 25 Jul 2022 12:21:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id"

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28766 ) Change subject: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7bbd13ce29f5adc1ca3ca01bffabbe02dd17db20 Gerrit-Change-Number: 28766 Gerrit-PatchSet: 1 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-Comment-Date: Mon, 25 Jul 2022 12:21:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem.py: Make CardDF.get_selectables() respect the flags

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28765 ) Change subject: filesystem.py: Make CardDF.get_selectables() respect the flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdc37cae3eecd36d167da76c30224b9d48c844fd Gerrit-Change-Number: 28765 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 12:21:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 to look at the new patch set (#2). Change subject: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ ...................................................................... sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ Some functions act on a struct sdp_audio_codecs but begin with the name sdp_audio_codec (singular). That's confusing. Related: SYS#5066 Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.c 3 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/84/28784/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 Gerrit-Change-Number: 28784 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags

by neels

Attention is currently required from: neels. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 to look at the new patch set (#2). Change subject: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags ...................................................................... sdp_msg: add sdp_audio_codecs_cmp(), add compare flags A problem with SDP fmtp handling is visible in this patch: when cmp_fmtp is true, we compare fmtp strings 1:1, which is not how things should be done. The intention is to fix fmtp handling in a later patch. At least there now is a flag to bypass fmtp comparison altogether. Related: SYS#5066 Change-Id: I18d33e189674229501afec950aa1c732386455a2 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/28783/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I18d33e189674229501afec950aa1c732386455a2 Gerrit-Change-Number: 28783 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: pySim-trace: Fix --no-suppress-{select.status} command line arguments

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28763 ) Change subject: pySim-trace: Fix --no-suppress-{select.status} command line arguments ...................................................................... pySim-trace: Fix --no-suppress-{select.status} command line arguments The Tracer implemented those options and the argparser handled it, but we didn't ever connect the two. Change-Id: I7d7d5fc475a8d09efdb63d3d6f1cc1de1996687b --- M pySim-trace.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-trace.py b/pySim-trace.py index 8ee82f3..c480168 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -117,8 +117,10 @@ formatter_class=argparse.ArgumentDefaultsHelpFormatter) global_group = option_parser.add_argument_group('General Options') -global_group.add_argument('--no-suppress-select', help="Don't suppress displaying SELECT APDUs") -global_group.add_argument('--no-suppress-status', help="Don't suppress displaying STATUS APDUs") +global_group.add_argument('--no-suppress-select', action='store_false', dest='suppress_select', + help="Don't suppress displaying SELECT APDUs") +global_group.add_argument('--no-suppress-status', action='store_false', dest='suppress_status', + help="Don't suppress displaying STATUS APDUs") subparsers = option_parser.add_subparsers(help='APDU Source', dest='source', required=True) @@ -153,7 +155,7 @@ elif opts.source == 'rspro-pyshark-live': s = PysharkRsproLive(opts.interface) - tracer = Tracer(source=s) + tracer = Tracer(source=s, suppress_status=opts.suppress_status, suppress_select=opts.suppress_select) logger.info('Entering main loop...') tracer.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7d7d5fc475a8d09efdb63d3d6f1cc1de1996687b Gerrit-Change-Number: 28763 Gerrit-PatchSet: 1 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: pySim-trace: Don't print argparse object at start-up

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28764 ) Change subject: pySim-trace: Don't print argparse object at start-up ...................................................................... pySim-trace: Don't print argparse object at start-up Change-Id: I881471d026457d8ffcfdbd412c7aae0d0bff9344 --- M pySim-trace.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-trace.py b/pySim-trace.py index c480168..33cb75a 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -145,7 +145,6 @@ if __name__ == '__main__': opts = option_parser.parse_args() - pp(opts) logger.info('Opening source %s...' % opts.source) if opts.source == 'gsmtap-udp': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I881471d026457d8ffcfdbd412c7aae0d0bff9344 Gerrit-Change-Number: 28764 Gerrit-PatchSet: 1 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-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022