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

Change in osmo-bsc[master]: call osmo_timer_del() unconditionally, without osmo_timer_pending()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28722 ) Change subject: call osmo_timer_del() unconditionally, without osmo_timer_pending() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e42a74d59b8e8d0d46cc4027676149689cc18a3 Gerrit-Change-Number: 28722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 22:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: .gitignore: remove non-existing files

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28721 ) Change subject: .gitignore: remove non-existing files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7c74a4770cb64520a711a41f4a19fbbf87b78a12 Gerrit-Change-Number: 28721 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 22:40:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: gb/gprs_ns: call osmo_timer_del() unconditionally

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28720 ) Change subject: gb/gprs_ns: call osmo_timer_del() unconditionally ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020 Gerrit-Change-Number: 28720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 22:39:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: call osmo_timer_del() unconditionally

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28719 ) Change subject: trxcon: call osmo_timer_del() unconditionally ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4ede5b19eeb847fe8fdaed52a8b5c801b3de209a Gerrit-Change-Number: 28719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 22:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Fix cbc_vty_go_parent() not being called

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28717 ) Change subject: Fix cbc_vty_go_parent() not being called ...................................................................... Patch Set 1: (1 comment) File src/cbc_main.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28717/comment/554b92ce_c8f4c538 PS1, Line 117: .go_parent_cb = cbc_vty_go_parent, see here ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I946c503f5a40eafbee6e7fa359781548b74e45a6 Gerrit-Change-Number: 28717 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 22:38:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: Introduce APDU/TPDU trace decoder

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28725 ) Change subject: Introduce APDU/TPDU trace decoder ...................................................................... Patch Set 1: Code-Review+1 (3 comments) Patchset: PS1: Looks good in general, nice idea! File pySim/gsmtap.py: https://gerrit.osmocom.org/c/pysim/+/28725/comment/4edc8505_5da03304 PS1, Line 153: Int8ub I would use Const(b'\x02') to enforce GSMTAPv2 (GSMTAP_VERSION). File pySim/ts_31_102.py: https://gerrit.osmocom.org/c/pysim/+/28725/comment/14119eb8_c837b440 PS1, Line 303: # 3gPP TS 31.102 Section 7.5.2.1 unrelated? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I862d93163d495a294364168f7818641e47b18c0a Gerrit-Change-Number: 28725 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 21 Jul 2022 21:33:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: introduce fully_qualified_path_str() method

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28684 ) Change subject: introduce fully_qualified_path_str() method ...................................................................... introduce fully_qualified_path_str() method Reduce all the copy+pasted '/'.join(path_list) constructs with a method returning the formatted path string. Change-Id: I5e9bfb425c3a3fade13ca4ccd2b891a0c21ed56d --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 24 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index c05fd7a..f9ab115 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -227,9 +227,8 @@ def update_prompt(self): if self.lchan: - path_list = self.lchan.selected_file.fully_qualified_path( - not self.numeric_path) - self.prompt = 'pySIM-shell (%s)> ' % ('/'.join(path_list)) + path_str = self.lchan.selected_file.fully_qualified_path_str(not self.numeric_path) + self.prompt = 'pySIM-shell (%s)> ' % (path_str) else: if self.card: self.prompt = 'pySIM-shell (no card profile)> ' @@ -483,10 +482,10 @@ self._cmd.lchan.selected_file.get_selectable_names(flags=flags)) directory_str = tabulate_str_list( selectables, width=79, hspace=2, lspace=1, align_left=True) - path_list = self._cmd.lchan.selected_file.fully_qualified_path(True) - self._cmd.poutput('/'.join(path_list)) - path_list = self._cmd.lchan.selected_file.fully_qualified_path(False) - self._cmd.poutput('/'.join(path_list)) + path = self._cmd.lchan.selected_file.fully_qualified_path_str(True) + self._cmd.poutput(path) + path = self._cmd.lchan.selected_file.fully_qualified_path_str(False) + self._cmd.poutput(path) self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) @@ -518,8 +517,8 @@ except Exception as e: skip_df = True df = self._cmd.lchan.selected_file - df_path_list = df.fully_qualified_path(True) - df_skip_reason_str = '/'.join(df_path_list) + \ + df_path = df.fully_qualified_path_str(True) + df_skip_reason_str = df_path + \ "/" + str(f) + ", " + str(e) if context: context['DF_SKIP'] += 1 @@ -559,13 +558,13 @@ "currently selected file %s is not a DF or ADF" % str(df)) df_path_list = df.fully_qualified_path(True) - df_path_list_fid = df.fully_qualified_path(False) + df_path = df.fully_qualified_path_str(True) + df_path_fid = df.fully_qualified_path_str(False) - file_str = '/'.join(df_path_list) + "/" + str(filename) + file_str = df_path + "/" + str(filename) self._cmd.poutput(boxed_heading_str(file_str)) - self._cmd.poutput("# directory: %s (%s)" % - ('/'.join(df_path_list), '/'.join(df_path_list_fid))) + self._cmd.poutput("# directory: %s (%s)" % (df_path, df_path_fid)) try: fcp_dec = self._cmd.lchan.select(filename, self._cmd) self._cmd.poutput("# file: %s (%s)" % ( @@ -629,8 +628,7 @@ raise RuntimeError( 'Unsupported structure "%s" of file "%s"' % (structure, filename)) except Exception as e: - bad_file_str = '/'.join(df_path_list) + \ - "/" + str(filename) + ", " + str(e) + bad_file_str = df_path + "/" + str(filename) + ", " + str(e) self._cmd.poutput("# bad file: %s" % bad_file_str) context['ERR'] += 1 context['BAD'].append(bad_file_str) @@ -734,11 +732,9 @@ def do_select(self, opts): """SELECT a File (ADF/DF/EF)""" if len(opts.arg_list) == 0: - path_list = self._cmd.lchan.selected_file.fully_qualified_path(True) - path_list_fid = self._cmd.lchan.selected_file.fully_qualified_path( - False) - self._cmd.poutput("currently selected file: " + - '/'.join(path_list) + " (" + '/'.join(path_list_fid) + ")") + path = self._cmd.lchan.selected_file.fully_qualified_path_str(True) + path_fid = self._cmd.lchan.selected_file.fully_qualified_path_str(False) + self._cmd.poutput("currently selected file: %s (%s)" % (path, path_fid)) return path = opts.arg_list[0] diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 5e697bf..182889b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -112,6 +112,14 @@ else: return self.fid + def fully_qualified_path_str(self, prefer_name: bool = True) -> str: + """Return fully qualified path to file as string. + + Args: + prefer_name : Preferably build path of names; fall-back to FIDs as required + """ + return '/'.join(self.fully_qualified_path(prefer_name)) + def fully_qualified_path(self, prefer_name: bool = True) -> List[str]: """Return fully qualified path to file as list of FID or name strings. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5e9bfb425c3a3fade13ca4ccd2b891a0c21ed56d Gerrit-Change-Number: 28684 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: Use Tuple for record length

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28710 ) Change subject: filesystem: Use Tuple for record length ...................................................................... filesystem: Use Tuple for record length The size should be a *tuple*. In reality we so far passed a set. The problem with the set is that ordering is not guaranteed, and hence we cannot assume the first and second item have meaning (minimum vs. default record length). Change-Id: I470f4e69c83cb2761861b3350bf8d49e31f4d957 --- M pySim/filesystem.py M pySim/gsm_r.py M pySim/sysmocom_sja2.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_51_011.py 6 files changed, 47 insertions(+), 47 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index fe8f591..598121b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -913,7 +913,7 @@ self._cmd.poutput_json(data) def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, - parent: Optional[CardDF] = None, rec_len={1, None}, **kwargs): + parent: Optional[CardDF] = None, rec_len: Size = (1, None), **kwargs): """ Args: fid : File Identifier (4 hex digits) @@ -921,7 +921,7 @@ name : Brief name of the file, lik EF_ICCID desc : Description of the file parent : Parent CardFile object within filesystem hierarchy - rec_len : set of {minimum_length, recommended_length} + rec_len : Tuple of (minimum_length, recommended_length) """ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, parent=parent, **kwargs) self.rec_len = rec_len @@ -1044,7 +1044,7 @@ # we don't really have any special support for those; just recycling LinFixedEF here def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, parent: CardDF = None, - rec_len={1, None}, **kwargs): + rec_len: Size = (1, None), **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, parent=parent, rec_len=rec_len, **kwargs) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index ccab87f..8464197 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -61,7 +61,7 @@ def __init__(self): super().__init__(fid='6ff1', sfid=None, name='EF.EN', - desc='Functional numbers', rec_len={9, 9}) + desc='Functional numbers', rec_len=(9, 9)) self._construct = Struct('functional_number_and_type'/FuncNTypeAdapter(Bytes(8)), 'list_number'/Int8ub) @@ -166,7 +166,7 @@ """Section 7.5""" def __init__(self): - super().__init__(fid='6ff3', sfid=None, name='EF.CallconfI', rec_len={21, 21}, + super().__init__(fid='6ff3', sfid=None, name='EF.CallconfI', rec_len=(21, 21), desc='Call Configuration of emergency calls Information') self._construct = Struct('t_dur'/Int24ub, 't_relcalc'/Int32ub, @@ -193,7 +193,7 @@ def __init__(self): super().__init__(fid='6ff5', sfid=None, name='EF.GsmrPLMN', - desc='GSM-R network selection', rec_len={9, 9}) + desc='GSM-R network selection', rec_len=(9, 9)) self._construct = Struct('plmn'/BcdAdapter(Bytes(3)), 'class_of_network'/BitStruct('supported'/FlagsEnum(BitsInteger(5), vbs=1, vgcs=2, emlpp=4, fn=8, eirene=16), 'preference'/BitsInteger(3)), @@ -207,7 +207,7 @@ def __init__(self): super().__init__(fid='6f8d', sfid=None, name='EF.IC', - desc='International Code', rec_len={7, 7}) + desc='International Code', rec_len=(7, 7)) self._construct = Struct('next_table_type'/NextTableType, 'id_of_next_table'/HexAdapter(Bytes(2)), 'ic_decision_value'/BcdAdapter(Bytes(2)), @@ -219,7 +219,7 @@ def __init__(self): super().__init__(fid='6f80', sfid=None, name='EF.NW', - desc='Network Name', rec_len={8, 8}) + desc='Network Name', rec_len=(8, 8)) self._construct = GsmString(8) @@ -228,7 +228,7 @@ def __init__(self, fid, name, desc): super().__init__(fid=fid, sfid=None, - name=name, desc=desc, rec_len={6, 6}) + name=name, desc=desc, rec_len=(6, 6)) self._construct = Struct('next_table_type'/NextTableType, 'id_of_next_table'/HexAdapter(Bytes(2)), 'decision_value'/BcdAdapter(Bytes(2)), @@ -240,7 +240,7 @@ def __init__(self, fid, name, desc): super().__init__(fid=fid, sfid=None, - name=name, desc=desc, rec_len={3, 3}) + name=name, desc=desc, rec_len=(3, 3)) # header and other records have different structure. WTF !?! self._construct = Struct('next_table_type'/NextTableType, 'id_of_next_table'/HexAdapter(Bytes(2)), diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 2edc916..d00a2cb 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -85,7 +85,7 @@ class EF_0348_KEY(LinFixedEF): def __init__(self, fid='6f22', name='EF.0348_KEY', desc='TS 03.48 OTA Keys'): - super().__init__(fid, name=name, desc=desc, rec_len={27, 35}) + super().__init__(fid, name=name, desc=desc, rec_len=(27, 35)) def _decode_record_bin(self, raw_bin_data): u = unpack('!BBB', raw_bin_data[0:3]) @@ -103,7 +103,7 @@ class EF_0348_COUNT(LinFixedEF): def __init__(self, fid='6f23', name='EF.0348_COUNT', desc='TS 03.48 OTA Counters'): - super().__init__(fid, name=name, desc=desc, rec_len={7, 7}) + super().__init__(fid, name=name, desc=desc, rec_len=(7, 7)) def _decode_record_bin(self, raw_bin_data): u = unpack('!BB5s', raw_bin_data) @@ -118,7 +118,7 @@ class EF_GP_COUNT(LinFixedEF): def __init__(self, fid='6f26', name='EF.GP_COUNT', desc='GP SCP02 Counters'): - super().__init__(fid, name=name, desc=desc, rec_len={5, 5}) + super().__init__(fid, name=name, desc=desc, rec_len=(5, 5)) def _decode_record_bin(self, raw_bin_data): u = unpack('!BBHB', raw_bin_data) @@ -127,7 +127,7 @@ class EF_GP_DIV_DATA(LinFixedEF): def __init__(self, fid='6f27', name='EF.GP_DIV_DATA', desc='GP SCP02 key diversification data'): - super().__init__(fid, name=name, desc=desc, rec_len={12, 12}) + super().__init__(fid, name=name, desc=desc, rec_len=(12, 12)) def _decode_record_bin(self, raw_bin_data): u = unpack('!BB8s', raw_bin_data) @@ -241,7 +241,7 @@ class EF_GBA_INT_KEY(LinFixedEF): def __init__(self, fid='af33', name='EF.GBA_INT_KEY'): super().__init__(fid, name=name, - desc='Secret key for GBA key derivation', rec_len={32, 32}) + desc='Secret key for GBA key derivation', rec_len=(32, 32)) self._construct = GreedyBytes diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 6e04e96..83ddb85 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -588,7 +588,7 @@ pass def __init__(self, fid='2f00', sfid=0x1e, name='EF.DIR', desc='Application Directory'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={5, 54}) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(5, 54)) self._tlv = EF_DIR.ApplicationTemplate # TS 102 221 Section 13.2 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index b8a33e7..5df7369 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -333,7 +333,7 @@ IdsOfSelectedEpsAlgos]): pass - def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len={57, None}, + def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len=(57, None), desc='5GS 3GPP Access NAS Security Context', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext @@ -597,7 +597,7 @@ def __init__(self, fid='6fb7', sfid=0x01, name='EF.ECC', desc='Emergency Call Codes'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4, 20}) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(4, 20)) def _decode_record_bin(self, in_bin): # mandatory parts @@ -661,7 +661,7 @@ # TS 31.102 Section 4.2.33 class EF_ICI(CyclicEF): - def __init__(self, fid='6f80', sfid=0x14, name='EF.ICI', rec_len={28, 48}, + def __init__(self, fid='6f80', sfid=0x14, name='EF.ICI', rec_len=(28, 48), desc='Incoming Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-28)), @@ -677,7 +677,7 @@ # TS 31.102 Section 4.2.34 class EF_OCI(CyclicEF): - def __init__(self, fid='6f81', sfid=0x15, name='EF.OCI', rec_len={27, 47}, + def __init__(self, fid='6f81', sfid=0x15, name='EF.OCI', rec_len=(27, 47), desc='Outgoing Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-27)), @@ -692,7 +692,7 @@ # TS 31.102 Section 4.2.35 class EF_ICT(CyclicEF): - def __init__(self, fid='6f82', sfid=None, name='EF.ICT', rec_len={3, 3}, + def __init__(self, fid='6f82', sfid=None, name='EF.ICT', rec_len=(3, 3), desc='Incoming Call Timer', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('accumulated_call_timer'/Int24ub) @@ -700,7 +700,7 @@ # TS 31.102 Section 4.2.38 class EF_CCP2(LinFixedEF): def __init__(self, fid='6f4f', sfid=0x16, name='EF.CCP2', desc='Capability Configuration Parameters 2', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={15, None}, **kwargs) + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(15, None), **kwargs) # TS 31.102 Section 4.2.47 class EF_EST(EF_UServiceTable): @@ -769,7 +769,7 @@ # TS 31.102 Section 4.2.80 class EF_MSK(LinFixedEF): def __init__(self, fid='6fd7', sfid=None, name='EF.MSK', desc='MBMS Service Key List', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={20, None}, **kwargs) + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(20, None), **kwargs) msk_ts_constr = Struct('msk_id'/Int32ub, 'timestamp_counter'/Int32ub) self._construct = Struct('key_domain_id'/HexAdapter(Bytes(3)), 'num_msk_id'/Int8ub, @@ -792,7 +792,7 @@ pass def __init__(self, fid='6fd8', sfid=None, name='EF.MUK', desc='MBMS User Key', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={None, None}, **kwargs) + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(None, None), **kwargs) self._tlv = EF_MUK.EF_MUK_Collection # TS 31.102 Section 4.2.83 @@ -807,7 +807,7 @@ pass def __init__(self, fid='6fda', sfid=None, name='EF.GBANL', desc='GBA NAF List', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={None, None}, **kwargs) + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(None, None), **kwargs) self._tlv = EF_GBANL.EF_GBANL_Collection # TS 31.102 Section 4.2.85 @@ -822,7 +822,7 @@ class EF_NAFKCA(LinFixedEF): class NAF_KeyCentreAddress(BER_TLV_IE, tag=0x80): _construct = HexAdapter(GreedyBytes) - def __init__(self, fid='6fdd', sfid=None, name='EF.NAFKCA', rec_len={None, None}, + def __init__(self, fid='6fdd', sfid=None, name='EF.NAFKCA', rec_len=(None, None), desc='NAF Key Centre Address', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_NAFKCA.NAF_KeyCentreAddress @@ -853,7 +853,7 @@ class EF_NCP_IP_Collection(TLV_IE_Collection, nested=[AccessPointName, Login, Password, BearerDescription]): pass - def __init__(self, fid='6fe2', sfid=None, name='EF.NCP-IP', rec_len={None, None}, + def __init__(self, fid='6fe2', sfid=None, name='EF.NCP-IP', rec_len=(None, None), desc='Network Connectivity Parameters for USIM IP connections', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_NCP_IP.EF_NCP_IP_Collection @@ -890,7 +890,7 @@ nested=[KSI_ASME, K_ASME, UplinkNASCount, DownlinkNASCount, IDofNASAlgorithms]): pass - def __init__(self, fid='6fe4', sfid=0x18, name='EF.EPSNSC', rec_len={54, 128}, + def __init__(self, fid='6fe4', sfid=0x18, name='EF.EPSNSC', rec_len=(54, 128), desc='EPS NAS Security Context', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_EPSNSC.EPS_NAS_Security_Context @@ -905,7 +905,7 @@ # TS 31.102 Section 4.2.101 class EF_IPS(CyclicEF): - def __init__(self, fid='6ff1', sfid=None, name='EF.IPS', rec_len={4, 4}, + def __init__(self, fid='6ff1', sfid=None, name='EF.IPS', rec_len=(4, 4), desc='IMEI(SV) Pairing Status', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('status'/PaddedString(2, 'ascii'), @@ -975,7 +975,7 @@ # TS 31.102 Section 4.4.11.9 class EF_OPL5G(LinFixedEF): def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={10, None}, **kwargs) + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(10, None), **kwargs) Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/HexAdapter(Bytes(3)), 'tac_max'/HexAdapter(Bytes(3))) self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) @@ -1131,7 +1131,7 @@ EF_ACMmax(service=13), EF_UST(), CyclicEF('6f39', None, 'EF.ACM', - 'Accumulated call meter', rec_len={3, 3}, service=13), + 'Accumulated call meter', rec_len=(3, 3), service=13), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1', service=17), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2', service=18), EF_SPN(service=19), diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 68b32ce..d16ea72 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -343,7 +343,7 @@ # TS 51.011 Section 10.5.1 class EF_ADN(LinFixedEF): def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', **kwargs): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={14, 30}, **kwargs) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(14, 30), **kwargs) self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-14)), codec='ascii')), 'len_of_bcd'/Int8ub, 'ton_npi'/TonNpi, @@ -354,7 +354,7 @@ # TS 51.011 Section 10.5.5 class EF_SMS(LinFixedEF): def __init__(self, fid='6f3c', sfid=None, name='EF.SMS', desc='Short messages', **kwargs): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={176, 176}, **kwargs) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(176, 176), **kwargs) def _decode_record_bin(self, raw_bin_data): def decode_status(status): @@ -385,7 +385,7 @@ # TS 51.011 Section 10.5.5 class EF_MSISDN(LinFixedEF): def __init__(self, fid='6f40', sfid=None, name='EF.MSISDN', desc='MSISDN', **kwargs): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={15, 34}, **kwargs) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(15, 34), **kwargs) def _decode_record_hex(self, raw_hex_data): return {'msisdn': dec_msisdn(raw_hex_data)} @@ -427,7 +427,7 @@ raise ValueError def __init__(self, fid='6f42', sfid=None, name='EF.SMSP', desc='Short message service parameters', **kwargs): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={28, None}, **kwargs) + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(28, None), **kwargs) ScAddr = Struct('length'/Int8ub, 'ton_npi'/TonNpi, 'call_number'/BcdAdapter(Rpad(Bytes(10)))) self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-28)))), 'parameter_indicators'/InvertAdapter(FlagsEnum(Byte, tp_dest_addr=1, tp_sc_addr=2, @@ -455,21 +455,21 @@ # TS 51.011 Section 10.5.8 class EF_SMSR(LinFixedEF): - def __init__(self, fid='6f47', sfid=None, name='EF.SMSR', desc='SMS status reports', rec_len={30, 30}, **kwargs): + def __init__(self, fid='6f47', sfid=None, name='EF.SMSR', desc='SMS status reports', rec_len=(30, 30), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( 'sms_record_id'/Int8ub, 'sms_status_report'/HexAdapter(Bytes(29))) class EF_EXT(LinFixedEF): - def __init__(self, fid, sfid=None, name='EF.EXT', desc='Extension', rec_len={13, 13}, **kwargs): + def __init__(self, fid, sfid=None, name='EF.EXT', desc='Extension', rec_len=(13, 13), **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( 'record_type'/Int8ub, 'extension_data'/HexAdapter(Bytes(11)), 'identifier'/Int8ub) # TS 51.011 Section 10.5.16 class EF_CMI(LinFixedEF): - def __init__(self, fid='6f58', sfid=None, name='EF.CMI', rec_len={2, 21}, + def __init__(self, fid='6f58', sfid=None, name='EF.CMI', rec_len=(2, 21), desc='Comparison Method Information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( @@ -484,9 +484,9 @@ EF_ADN(fid='6f3b', name='EF.FDN', desc='Fixed dialling numbers'), EF_SMS(), LinFixedEF(fid='6f3d', name='EF.CCP', - desc='Capability Configuration Parameters', rec_len={14, 14}), + desc='Capability Configuration Parameters', rec_len=(14, 14)), LinFixedEF(fid='6f4f', name='EF.ECCP', - desc='Extended Capability Configuration Parameters', rec_len={15, 32}), + desc='Extended Capability Configuration Parameters', rec_len=(15, 32)), EF_MSISDN(), EF_SMSP(), EF_SMSS(), @@ -790,7 +790,7 @@ # TS 51.011 Section 10.3.31 class EF_NIA(LinFixedEF): - def __init__(self, fid='6f51', sfid=None, name='EF.NIA', rec_len={1, 32}, + def __init__(self, fid='6f51', sfid=None, name='EF.NIA', rec_len=(1, 32), desc='Network\'s Indication of Alerting', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( @@ -895,21 +895,21 @@ # TS 51.011 Section 10.3.42 class EF_OPL(LinFixedEF): - def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): + def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len=(8, 8), desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('lai'/Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac_min'/HexAdapter(Bytes(2)), 'lac_max'/HexAdapter(Bytes(2))), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): - def __init__(self, fid='6fc9', sfid=None, name='EF.MBI', rec_len={4, 5}, desc='Mailbox Identifier', **kwargs): + def __init__(self, fid='6fc9', sfid=None, name='EF.MBI', rec_len=(4, 5), desc='Mailbox Identifier', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('mbi_voicemail'/Int8ub, 'mbi_fax'/Int8ub, 'mbi_email'/Int8ub, 'mbi_other'/Int8ub, 'mbi_videocall'/COptional(Int8ub)) # TS 51.011 Section 10.3.45 + TS 31.102 4.2.63 class EF_MWIS(LinFixedEF): - def __init__(self, fid='6fca', sfid=None, name='EF.MWIS', rec_len={5, 6}, + def __init__(self, fid='6fca', sfid=None, name='EF.MWIS', rec_len=(5, 6), desc='Message Waiting Indication Status', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('mwi_status'/FlagsEnum(Byte, voicemail=1, fax=2, email=4, other=8, videomail=16), @@ -932,7 +932,7 @@ # TS 51.011 Section 10.3.51 class EF_MMSN(LinFixedEF): - def __init__(self, fid='6fce', sfid=None, name='EF.MMSN', rec_len={4, 20}, desc='MMS Notification', **kwargs): + def __init__(self, fid='6fce', sfid=None, name='EF.MMSN', rec_len=(4, 20), desc='MMS Notification', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('mms_status'/HexAdapter(Bytes(2)), 'mms_implementation'/HexAdapter(Bytes(1)), 'mms_notification'/HexAdapter(Bytes(this._.total_len-4)), 'ext_record_nr'/Byte) @@ -974,7 +974,7 @@ class MMS_User_Preferences(TLV_IE_Collection, nested=[MMS_Implementation, MMS_UserPref_ProfileName, MMS_UserPref_Info]): pass - def __init__(self, fid='6fd1', sfid=None, name='EF.MMSUP', rec_len={1, None}, + def __init__(self, fid='6fd1', sfid=None, name='EF.MMSUP', rec_len=(1, None), desc='MMS User Preferences', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_MMSUP.MMS_User_Preferences @@ -1000,7 +1000,7 @@ EF_ServiceTable('6f38', None, 'EF.SST', 'SIM service table', table=EF_SST_map, size=(2, 16)), CyclicEF('6f39', None, 'EF.ACM', - 'Accumulated call meter', rec_len={3, 3}), + 'Accumulated call meter', rec_len=(3, 3)), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), EF_SPN(), 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I470f4e69c83cb2761861b3350bf8d49e31f4d957 Gerrit-Change-Number: 28710 Gerrit-PatchSet: 3 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]: filesystem: Use Tuple for transparent file size

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28709 ) Change subject: filesystem: Use Tuple for transparent file size ...................................................................... filesystem: Use Tuple for transparent file size As the documentation strings say: The size should be a *tuple*. In reality we so far passed a set. The problem with the set is that ordering is not guaranteed, and hence we cannot assume the first and second item have meaning (minimum vs. default size). While at it, use a type annotation to catch such bugs easily. Change-Id: I553616f8c6c4aaa8f635b3d7d94e8e8f49ed5a56 --- M pySim/filesystem.py M pySim/gsm_r.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py M pySim/ts_31_103.py M pySim/ts_51_011.py 7 files changed, 72 insertions(+), 70 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 182889b..fe8f591 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -49,6 +49,8 @@ # tuple: logical-and of the listed services requires this file CardFileService = Union[int, List[int], Tuple[int, ...]] +Size = Tuple[int, Optional[int]] + def lchan_nr_from_cla(cla: int) -> int: """Resolve the logical channel number from the CLA byte.""" # TS 102 221 10.1.1 Coding of Class Byte @@ -642,7 +644,7 @@ self._cmd.poutput_json(data) def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, parent: CardDF = None, - size={1, None}, **kwargs): + size: Size = (1, None), **kwargs): """ Args: fid : File Identifier (4 hex digits) @@ -1057,7 +1059,7 @@ """ def __init__(self, fid: str, rec_len: int, sfid: str = None, name: str = None, desc: str = None, - parent: Optional[CardDF] = None, size={1, None}, **kwargs): + parent: Optional[CardDF] = None, size: Size = (1, None), **kwargs): """ Args: fid : File Identifier (4 hex digits) @@ -1245,7 +1247,7 @@ self._cmd.poutput(data) def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, parent: CardDF = None, - size={1, None}, **kwargs): + size: Size = (1, None), **kwargs): """ Args: fid : File Identifier (4 hex digits) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index b48469e..ccab87f 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -149,7 +149,7 @@ """Section 7.3""" def __init__(self): - super().__init__(fid='6ff2', sfid=None, name='EF.CallconfC', size={24, 24}, + super().__init__(fid='6ff2', sfid=None, name='EF.CallconfC', size=(24, 24), desc='Call Configuration of emergency calls Configuration') self._construct = Struct('pl_conf'/PlConfAdapter(Int8ub), 'conf_nr'/BcdAdapter(Bytes(8)), @@ -183,7 +183,7 @@ def __init__(self): super().__init__(fid='6ff4', sfid=None, - name='EF.Shunting', desc='Shunting', size={8, 8}) + name='EF.Shunting', desc='Shunting', size=(8, 8)) self._construct = Struct('common_gid'/Int8ub, 'shunting_gid'/HexAdapter(Bytes(7))) @@ -253,7 +253,7 @@ """Section 8.6""" def __init__(self, fid, name, desc): - super().__init__(fid=fid, sfid=None, name=name, desc=desc, size={4, 4}) + super().__init__(fid=fid, sfid=None, name=name, desc=desc, size=(4, 4)) self._construct = Struct('next_table_type'/NextTableType, 'id_of_next_table'/HexAdapter(Bytes(2)), 'dialed_digits'/BcdAdapter(Bytes(1))) diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 8578f68..6e04e96 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -594,7 +594,7 @@ # TS 102 221 Section 13.2 class EF_ICCID(TransparentEF): def __init__(self, fid='2fe2', sfid=0x02, name='EF.ICCID', desc='ICC Identification'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size={10, 10}) + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=(10, 10)) def _decode_hex(self, raw_hex): return {'iccid': dec_iccid(raw_hex)} @@ -606,7 +606,7 @@ class EF_PL(TransRecEF): def __init__(self, fid='2f05', sfid=0x05, name='EF.PL', desc='Preferred Languages'): super().__init__(fid, sfid=sfid, name=name, - desc=desc, rec_len=2, size={2, None}) + desc=desc, rec_len=2, size=(2, None)) def _decode_record_bin(self, bin_data): if bin_data == b'\xff\xff': @@ -706,7 +706,7 @@ # TS 102 221 Section 13.6 class EF_UMPC(TransparentEF): def __init__(self, fid='2f08', sfid=0x08, name='EF.UMPC', desc='UICC Maximum Power Consumption'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size={5, 5}) + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=(5, 5)) addl_info = FlagsEnum(Byte, req_inc_idle_current=1, support_uicc_suspend=2) self._construct = Struct( diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 066ee88..b8a33e7 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -349,7 +349,7 @@ class FiveGAuthKeys(TLV_IE_Collection, nested=[K_AUSF, K_SEAF]): pass - def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size={68, None}, + def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size=(68, None), desc='5G authentication keys', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys @@ -383,7 +383,7 @@ # TS 31.102 4.4.11.8 class EF_SUCI_Calc_Info(TransparentEF): - def __init__(self, fid="4f07", sfid=0x07, name='EF.SUCI_Calc_Info', size={2, None}, + def __init__(self, fid="4f07", sfid=0x07, name='EF.SUCI_Calc_Info', size=(2, None), desc='SUCI Calc Info', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) @@ -506,7 +506,7 @@ class EF_LI(TransRecEF): - def __init__(self, fid='6f05', sfid=None, name='EF.LI', size={2, None}, rec_len=2, + def __init__(self, fid='6f05', sfid=None, name='EF.LI', size=(2, None), rec_len=2, desc='Language Indication'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) @@ -526,7 +526,7 @@ class EF_Keys(TransparentEF): - def __init__(self, fid='6f08', sfid=0x08, name='EF.Keys', size={33, 33}, + def __init__(self, fid='6f08', sfid=0x08, name='EF.Keys', size=(33, 33), desc='Ciphering and Integrity Keys'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Struct( @@ -534,14 +534,14 @@ # TS 31.102 Section 4.2.6 class EF_HPPLMN(TransparentEF): - def __init__(self, fid='6f31', sfid=0x12, name='EF.HPPLMN', size={1, 1}, + def __init__(self, fid='6f31', sfid=0x12, name='EF.HPPLMN', size=(1, 1), desc='Higher Priority PLMN search period'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Int8ub class EF_UST(EF_UServiceTable): def __init__(self, **kwargs): - super().__init__(fid='6f38', sfid=0x04, name='EF.UST', desc='USIM Service Table', size={1,17}, table=EF_UST_map, **kwargs) + super().__init__(fid='6f38', sfid=0x04, name='EF.UST', desc='USIM Service Table', size=(1,17), table=EF_UST_map, **kwargs) # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] @@ -625,7 +625,7 @@ # TS 31.102 Section 4.2.17 class EF_LOCI(TransparentEF): - def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size={11, 11}): + def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size=(11, 11)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) Lai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac'/HexAdapter(Bytes(2))) self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/Lai, 'rfu'/Int8ub, 'lu_status'/Int8ub) @@ -639,7 +639,7 @@ maintenance_off_line = 0x02 cell_test = 0x04 - def __init__(self, fid='6fad', sfid=0x03, name='EF.AD', desc='Administrative Data', size={4, 6}): + def __init__(self, fid='6fad', sfid=0x03, name='EF.AD', desc='Administrative Data', size=(4, 6)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = BitStruct( # Byte 1 @@ -654,7 +654,7 @@ # TS 31.102 Section 4.2.23 class EF_PSLOCI(TransparentEF): - def __init__(self, fid='6f73', sfid=0x0c, name='EF.PSLOCI', desc='PS Location information', size={14, 14}): + def __init__(self, fid='6f73', sfid=0x0c, name='EF.PSLOCI', desc='PS Location information', size=(14, 14)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Struct('ptmsi'/HexAdapter(Bytes(4)), 'ptmsi_sig'/HexAdapter(Bytes(3)), 'rai'/HexAdapter(Bytes(6)), 'rau_status'/Int8ub) @@ -705,7 +705,7 @@ # TS 31.102 Section 4.2.47 class EF_EST(EF_UServiceTable): def __init__(self, **kwargs): - super().__init__(fid='6f56', sfid=0x05, name='EF.EST', desc='Enabled Services Table', size={1,None}, table=EF_EST_map, **kwargs) + super().__init__(fid='6f56', sfid=0x05, name='EF.EST', desc='Enabled Services Table', size=(1,None), table=EF_EST_map, **kwargs) # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] @@ -724,28 +724,28 @@ # TS 31.102 Section 4.2.48 class EF_ACL(TransparentEF): - def __init__(self, fid='6f57', sfid=None, name='EF.ACL', size={32, None}, + def __init__(self, fid='6f57', sfid=None, name='EF.ACL', size=(32, None), desc='Access Point Name Control List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/HexAdapter(GreedyBytes)) # TS 31.102 Section 4.2.51 class EF_START_HFN(TransparentEF): - def __init__(self, fid='6f5b', sfid=0x0f, name='EF.START-HFN', size={6, 6}, + def __init__(self, fid='6f5b', sfid=0x0f, name='EF.START-HFN', size=(6, 6), desc='Initialisation values for Hyperframe number', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('start_cs'/Int24ub, 'start_ps'/Int24ub) # TS 31.102 Section 4.2.52 class EF_THRESHOLD(TransparentEF): - def __init__(self, fid='6f5c', sfid=0x10, name='EF.THRESHOLD', size={3, 3}, + def __init__(self, fid='6f5c', sfid=0x10, name='EF.THRESHOLD', size=(3, 3), desc='Maximum value of START', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('max_start'/Int24ub) # TS 31.102 (old releases like 3.8.0) Section 4.2.56 class EF_RPLMNAcT(TransRecEF): - def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size={2, 4}, rec_len=2, + def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size=(2, 4), rec_len=2, desc='RPLMN Last used Access Technology', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) def _decode_record_hex(self, in_hex): @@ -754,14 +754,14 @@ # TS 31.102 Section 4.2.77 class EF_VGCSCA(TransRecEF): - def __init__(self, fid='6fd4', sfid=None, name='EF.VGCSCA', size={2, 100}, rec_len=2, + def __init__(self, fid='6fd4', sfid=None, name='EF.VGCSCA', size=(2, 100), rec_len=2, desc='Voice Group Call Service Ciphering Algorithm', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = Struct('alg_v_ki_1'/Int8ub, 'alg_v_ki_2'/Int8ub) # TS 31.102 Section 4.2.79 class EF_GBABP(TransparentEF): - def __init__(self, fid='6fd6', sfid=None, name='EF.GBABP', size={3, 50}, + def __init__(self, fid='6fd6', sfid=None, name='EF.GBABP', size=(3, 50), desc='GBA Bootstrapping parameters', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('rand'/LV, 'b_tid'/LV, 'key_lifetime'/LV) @@ -812,7 +812,7 @@ # TS 31.102 Section 4.2.85 class EF_EHPLMNPI(TransparentEF): - def __init__(self, fid='6fdb', sfid=None, name='EF.EHPLMNPI', size={1, 1}, + def __init__(self, fid='6fdb', sfid=None, name='EF.EHPLMNPI', size=(1, 1), desc='Equivalent HPLMN Presentation Indication', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('presentation_ind' / @@ -860,7 +860,7 @@ # TS 31.102 Section 4.2.91 class EF_EPSLOCI(TransparentEF): - def __init__(self, fid='6fe3', sfid=0x1e, name='EF.EPSLOCI', size={18, 18}, + def __init__(self, fid='6fe3', sfid=0x1e, name='EF.EPSLOCI', size=(18, 18), desc='EPS Location Information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( @@ -897,7 +897,7 @@ # TS 31.102 Section 4.2.96 class EF_PWS(TransparentEF): - def __init__(self, fid='6fec', sfid=None, name='EF.PWS', desc='Public Warning System', size={1, 1}, **kwargs): + def __init__(self, fid='6fec', sfid=None, name='EF.PWS', desc='Public Warning System', size=(1, 1), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) pws_config = FlagsEnum( Byte, ignore_pws_in_hplmn_and_equivalent=1, ignore_pws_in_vplmn=2) @@ -926,7 +926,7 @@ # TS 31.102 Section 4.2.106 class EF_FromPreferred(TransparentEF): - def __init__(self, fid='6ff7', sfid=None, name='EF.FromPreferred', size={1, 1}, + def __init__(self, fid='6ff7', sfid=None, name='EF.FromPreferred', size=(1, 1), desc='From Preferred', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Bit) @@ -954,7 +954,7 @@ # TS 31.102 Section 4.4.11.2 class EF_5GS3GPPLOCI(TransparentEF): - def __init__(self, fid='4f01', sfid=0x01, name='EF.5GS3GPPLOCI', size={20, 20}, + def __init__(self, fid='4f01', sfid=0x01, name='EF.5GS3GPPLOCI', size=(20, 20), desc='5S 3GP location information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( @@ -965,7 +965,7 @@ # TS 31.102 Section 4.4.11.7 class EF_UAC_AIC(TransparentEF): - def __init__(self, fid='4f06', sfid=0x06, name='EF.UAC_AIC', size={4, 4}, + def __init__(self, fid='4f06', sfid=0x06, name='EF.UAC_AIC', size=(4, 4), desc='UAC Access Identities Configuration', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) cfg_constr = FlagsEnum(Byte, multimedia_priority_service=1, @@ -1104,7 +1104,7 @@ EF_OPL5G(service=129), EF_SUPI_NAI(service=130), TransparentEF('4F0A', 0x0a, 'EF.Routing_Indicator', - 'Routing Indicator', size={4, 4}, service=124), + 'Routing Indicator', size=(4, 4), service=124), TransparentEF('4F0B', 0x0b, 'EF.URSP', 'UE Route Selector Policies per PLMN', service=132), EF_TN3GPPSNN(service=133), @@ -1136,11 +1136,11 @@ TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2', service=18), EF_SPN(service=19), TransparentEF('6f41', None, 'EF.PUCT', - 'Price per unit and currency table', size={5, 5}, service=13), + 'Price per unit and currency table', size=(5, 5), service=13), EF_CBMI(service=15), EF_ACC(sfid=0x06), EF_PLMNsel('6f7b', 0x0d, 'EF.FPLMN', - 'Forbidden PLMNs', size={12, None}), + 'Forbidden PLMNs', size=(12, None)), EF_LOCI(), EF_AD(), EF_CBMID(sfid=0x0e, service=29), @@ -1204,7 +1204,7 @@ EF_MSK(service=69), EF_MUK(service=69), EF_GBANL(service=68), - EF_PLMNsel('6fd9', 0x1d, 'EF.EHPLMN', 'Equivalent HPLMN', size={12, None}, service=71), + EF_PLMNsel('6fd9', 0x1d, 'EF.EHPLMN', 'Equivalent HPLMN', size=(12, None), service=71), EF_EHPLMNPI(service=(71, 73)), # EF_LRPLMNSI ('6fdc', service=74) EF_NAFKCA(service=(68, 76)), @@ -1213,7 +1213,7 @@ EF_NCP_IP(service=80), EF_EPSLOCI('6fe3', 0x1e, 'EF.EPSLOCI', 'EPS location information', service=85), EF_EPSNSC(service=85), - TransparentEF('6fe6', None, 'EF.UFC', 'USAT Facility Control', size={1, 16}), + TransparentEF('6fe6', None, 'EF.UFC', 'USAT Facility Control', size=(1, 16)), TransparentEF('6fe8', None, 'EF.NASCONFIG', 'Non Access Stratum Configuration', service=96), # UICC IARI (only in cards that have no ISIM) service=95 EF_PWS(service=97), diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index c020a07..06317b9 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -234,7 +234,7 @@ # TS 31.102 Section 4.6.4.1 class EF_MST(EF_UServiceTable): - def __init__(self, fid='4F01', sfid=0x01, name='EF.MST', desc='MCS Service Table', size={2,2}, + def __init__(self, fid='4F01', sfid=0x01, name='EF.MST', desc='MCS Service Table', size=(2,2), table=EF_MST_map, **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, table=table) @@ -265,7 +265,7 @@ # TS 31.102 Section 4.6.5.2 class EF_VST(EF_UServiceTable): - def __init__(self, fid='4F01', sfid=0x01, name='EF.VST', desc='V2X Service Table', size={2,2}, + def __init__(self, fid='4F01', sfid=0x01, name='EF.VST', desc='V2X Service Table', size=(2,2), table=EF_VST_map, **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, table=table) diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index ef60a7d..30df0b7 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -108,7 +108,7 @@ # TS 31.103 Section 4.2.7 class EF_IST(EF_UServiceTable): def __init__(self, **kwargs): - super().__init__('6f07', 0x07, 'EF.IST', 'ISIM Service Table', {1, None}, EF_IST_map) + super().__init__('6f07', 0x07, 'EF.IST', 'ISIM Service Table', (1, None), EF_IST_map) # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index c6bb194..68b32ce 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -448,7 +448,7 @@ def _encode(self, obj, context, path): return 0 if obj else 1 - def __init__(self, fid='6f43', sfid=None, name='EF.SMSS', desc='SMS status', size={2, 8}, **kwargs): + def __init__(self, fid='6f43', sfid=None, name='EF.SMSS', desc='SMS status', size=(2, 8), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct( 'last_used_tpmr'/Int8ub, 'memory_capacity_exceeded'/self.MemCapAdapter(Int8ub)) @@ -512,7 +512,7 @@ # TS 51.011 Section 10.3.1 class EF_LP(TransRecEF): - def __init__(self, fid='6f05', sfid=None, name='EF.LP', size={1, None}, rec_len=1, + def __init__(self, fid='6f05', sfid=None, name='EF.LP', size=(1, None), rec_len=1, desc='Language Preference'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) @@ -524,7 +524,7 @@ # TS 51.011 Section 10.3.2 class EF_IMSI(TransparentEF): - def __init__(self, fid='6f07', sfid=None, name='EF.IMSI', desc='IMSI', size={9, 9}): + def __init__(self, fid='6f07', sfid=None, name='EF.IMSI', desc='IMSI', size=(9, 9)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands(self)] @@ -563,7 +563,7 @@ # TS 51.011 Section 10.3.4 class EF_PLMNsel(TransRecEF): def __init__(self, fid='6f30', sfid=None, name='EF.PLMNsel', desc='PLMN selector', - size={24, None}, rec_len=3, **kwargs): + size=(24, None), rec_len=3, **kwargs): super().__init__(fid, name=name, sfid=sfid, desc=desc, size=size, rec_len=rec_len, **kwargs) def _decode_record_hex(self, in_hex): @@ -580,7 +580,7 @@ # TS 51.011 Section 10.3.6 class EF_ACMmax(TransparentEF): - def __init__(self, fid='6f37', sfid=None, name='EF.ACMmax', size={3, 3}, + def __init__(self, fid='6f37', sfid=None, name='EF.ACMmax', size=(3, 3), desc='ACM maximum value', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('acm_max'/Int24ub) @@ -638,7 +638,7 @@ # TS 51.011 Section 10.3.11 class EF_SPN(TransparentEF): def __init__(self, fid='6f46', sfid=None, name='EF.SPN', - desc='Service Provider Name', size={17, 17}, **kwargs): + desc='Service Provider Name', size=(17, 17), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct( # Byte 1 @@ -651,7 +651,7 @@ # TS 51.011 Section 10.3.13 class EF_CBMI(TransRecEF): - def __init__(self, fid='6f45', sfid=None, name='EF.CBMI', size={2, None}, rec_len=2, + def __init__(self, fid='6f45', sfid=None, name='EF.CBMI', size=(2, None), rec_len=2, desc='Cell Broadcast message identifier selection', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = GreedyRange(Int16ub) @@ -659,13 +659,13 @@ # TS 51.011 Section 10.3.15 class EF_ACC(TransparentEF): def __init__(self, fid='6f78', sfid=None, name='EF.ACC', - desc='Access Control Class', size={2, 2}, **kwargs): + desc='Access Control Class', size=(2, 2), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = HexAdapter(Bytes(2)) # TS 51.011 Section 10.3.16 class EF_LOCI(TransparentEF): - def __init__(self, fid='6f7e', sfid=None, name='EF.LOCI', desc='Location Information', size={11, 11}): + def __init__(self, fid='6f7e', sfid=None, name='EF.LOCI', desc='Location Information', size=(11, 11)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'tmsi_time'/Int8ub, 'lu_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, @@ -683,7 +683,7 @@ #OP_MODE_DICT = {int(v) : str(v) for v in EF_AD.OP_MODE} #OP_MODE_DICT_REVERSED = {str(v) : int(v) for v in EF_AD.OP_MODE} - def __init__(self, fid='6fad', sfid=None, name='EF.AD', desc='Administrative Data', size={3, 4}): + def __init__(self, fid='6fad', sfid=None, name='EF.AD', desc='Administrative Data', size=(3, 4)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = BitStruct( # Byte 1 @@ -704,14 +704,14 @@ # TS 51.011 Section 10.3.20 / 10.3.22 class EF_VGCS(TransRecEF): - def __init__(self, fid='6fb1', sfid=None, name='EF.VGCS', size={4, 200}, rec_len=4, + def __init__(self, fid='6fb1', sfid=None, name='EF.VGCS', size=(4, 200), rec_len=4, desc='Voice Group Call Service', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = BcdAdapter(Bytes(4)) # TS 51.011 Section 10.3.21 / 10.3.23 class EF_VGCSS(TransparentEF): - def __init__(self, fid='6fb2', sfid=None, name='EF.VGCSS', size={7, 7}, + def __init__(self, fid='6fb2', sfid=None, name='EF.VGCSS', size=(7, 7), desc='Voice Group Call Service Status', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct( @@ -719,7 +719,7 @@ # TS 51.011 Section 10.3.24 class EF_eMLPP(TransparentEF): - def __init__(self, fid='6fb5', sfid=None, name='EF.eMLPP', size={2, 2}, + def __init__(self, fid='6fb5', sfid=None, name='EF.eMLPP', size=(2, 2), desc='enhanced Multi Level Pre-emption and Priority', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) FlagsConstruct = FlagsEnum( @@ -729,7 +729,7 @@ # TS 51.011 Section 10.3.25 class EF_AAeM(TransparentEF): - def __init__(self, fid='6fb6', sfid=None, name='EF.AAeM', size={1, 1}, + def __init__(self, fid='6fb6', sfid=None, name='EF.AAeM', size=(1, 1), desc='Automatic Answer for eMLPP Service', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) FlagsConstruct = FlagsEnum( @@ -738,28 +738,28 @@ # TS 51.011 Section 10.3.26 class EF_CBMID(EF_CBMI): - def __init__(self, fid='6f48', sfid=None, name='EF.CBMID', size={2, None}, rec_len=2, + def __init__(self, fid='6f48', sfid=None, name='EF.CBMID', size=(2, None), rec_len=2, desc='Cell Broadcast Message Identifier for Data Download', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = GreedyRange(Int16ub) # TS 51.011 Section 10.3.27 class EF_ECC(TransRecEF): - def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', size={3, 15}, rec_len=3, + def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', size=(3, 15), rec_len=3, desc='Emergency Call Codes', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = GreedyRange(BcdAdapter(Bytes(3))) # TS 51.011 Section 10.3.28 class EF_CBMIR(TransRecEF): - def __init__(self, fid='6f50', sfid=None, name='EF.CBMIR', size={4, None}, rec_len=4, + def __init__(self, fid='6f50', sfid=None, name='EF.CBMIR', size=(4, None), rec_len=4, desc='Cell Broadcast message identifier range selection', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = GreedyRange(Struct('lower'/Int16ub, 'upper'/Int16ub)) # TS 51.011 Section 10.3.29 class EF_DCK(TransparentEF): - def __init__(self, fid='6f2c', sfid=None, name='EF.DCK', size={16, 16}, + def __init__(self, fid='6f2c', sfid=None, name='EF.DCK', size=(16, 16), desc='Depersonalisation Control Keys', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('network'/BcdAdapter(Bytes(4)), @@ -768,7 +768,7 @@ 'corporate'/BcdAdapter(Bytes(4))) # TS 51.011 Section 10.3.30 class EF_CNL(TransRecEF): - def __init__(self, fid='6f32', sfid=None, name='EF.CNL', size={6, None}, rec_len=6, + def __init__(self, fid='6f32', sfid=None, name='EF.CNL', size=(6, None), rec_len=6, desc='Co-operative Network List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) @@ -798,13 +798,13 @@ # TS 51.011 Section 10.3.32 class EF_Kc(TransparentEF): - def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size={9, 9}, **kwargs): + def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size=(9, 9), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('kc'/HexAdapter(Bytes(8)), 'cksn'/Int8ub) # TS 51.011 Section 10.3.33 class EF_LOCIGPRS(TransparentEF): - def __init__(self, fid='6f53', sfid=None, name='EF.LOCIGPRS', desc='GPRS Location Information', size={14, 14}): + def __init__(self, fid='6f53', sfid=None, name='EF.LOCIGPRS', desc='GPRS Location Information', size=(14, 14)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Struct('ptmsi'/HexAdapter(Bytes(4)), 'ptmsi_sig'/Int8ub, 'rai'/HexAdapter(Bytes(6)), 'rau_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, @@ -812,7 +812,7 @@ # TS 51.011 Section 10.3.35..37 class EF_xPLMNwAcT(TransRecEF): - def __init__(self, fid, sfid=None, name=None, desc=None, size={40, None}, rec_len=5, **kwargs): + def __init__(self, fid, sfid=None, name=None, desc=None, size=(40, None), rec_len=5, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) def _decode_record_hex(self, in_hex): @@ -861,14 +861,14 @@ # TS 51.011 Section 10.3.38 class EF_CPBCCH(TransRecEF): - def __init__(self, fid='6f63', sfid=None, name='EF.CPBCCH', size={2, 14}, rec_len=2, + def __init__(self, fid='6f63', sfid=None, name='EF.CPBCCH', size=(2, 14), rec_len=2, desc='CPBCCH Information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = Struct('cpbcch'/Int16ub) # TS 51.011 Section 10.3.39 class EF_InvScan(TransparentEF): - def __init__(self, fid='6f64', sfid=None, name='EF.InvScan', size={1, 1}, + def __init__(self, fid='6f64', sfid=None, name='EF.InvScan', size=(1, 1), desc='IOnvestigation Scan', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = FlagsEnum( @@ -958,7 +958,7 @@ class MMS_ConnectivityParamters(TLV_IE_Collection, nested=[MMS_Implementation, MMS_Relay_Server, Interface_to_CN, Gateway]): pass - def __init__(self, fid='6fd0', sfid=None, name='EF.MMSICP', size={1, None}, + def __init__(self, fid='6fd0', sfid=None, name='EF.MMSICP', size=(1, None), desc='MMS Issuer Connectivity Parameters', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._tlv = EF_MMSICP.MMS_ConnectivityParamters @@ -981,7 +981,7 @@ # TS 51.011 Section 10.3.55 class EF_MMSUCP(TransparentEF): - def __init__(self, fid='6fd2', sfid=None, name='EF.MMSUCP', size={1, None}, + def __init__(self, fid='6fd2', sfid=None, name='EF.MMSUCP', size=(1, None), desc='MMS User Connectivity Parameters', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) @@ -998,24 +998,24 @@ 'Higher Priority PLMN search period'), EF_ACMmax(), EF_ServiceTable('6f38', None, 'EF.SST', - 'SIM service table', table=EF_SST_map, size={2, 16}), + 'SIM service table', table=EF_SST_map, size=(2, 16)), CyclicEF('6f39', None, 'EF.ACM', 'Accumulated call meter', rec_len={3, 3}), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), EF_SPN(), TransparentEF('6f41', None, 'EF.PUCT', - 'Price per unit and currency table', size={5, 5}), + 'Price per unit and currency table', size=(5, 5)), EF_CBMI(), TransparentEF('6f7f', None, 'EF.BCCH', - 'Broadcast control channels', size={16, 16}), + 'Broadcast control channels', size=(16, 16)), EF_ACC(), EF_PLMNsel('6f7b', None, 'EF.FPLMN', - 'Forbidden PLMNs', size={12, 12}), + 'Forbidden PLMNs', size=(12, 12)), EF_LOCI(), EF_AD(), TransparentEF('6fa3', None, 'EF.Phase', - 'Phase identification', size={1, 1}), + 'Phase identification', size=(1, 1)), EF_VGCS(), EF_VGCSS(), EF_VGCS('6fb3', None, 'EF.VBS', 'Voice Broadcast Service'), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I553616f8c6c4aaa8f635b3d7d94e8e8f49ed5a56 Gerrit-Change-Number: 28709 Gerrit-PatchSet: 3 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]: filesystem: Use Tuple for transparent file size

by fixeria

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28709 ) Change subject: filesystem: Use Tuple for transparent file size ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I553616f8c6c4aaa8f635b3d7d94e8e8f49ed5a56 Gerrit-Change-Number: 28709 Gerrit-PatchSet: 3 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 20:52:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022