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

Change in ...osmo_dia2gsup[master]: debian: rework packaging

by daniel

Attention is currently required from: osmith, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28652 ) Change subject: debian: rework packaging ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File debian/osmo-diameter2gsup.install: https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28652/comment/bbcc4ad3_… PS1, Line 2: /_build/default/bin/osmo-dia2gsup /usr/bin/ > Done Interesting that you don't need lib/ for the script to work -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I40add168875de87ef0cc62deeb5377d2ce080e45 Gerrit-Change-Number: 28652 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 20 Jul 2022 10:22:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: debian: add missing Build-Depends debhelper

by daniel

Attention is currently required from: lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28651 ) Change subject: debian: add missing Build-Depends debhelper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I1b5774983d705c54c909823da329068a7aa0a9a8 Gerrit-Change-Number: 28651 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 20 Jul 2022 10:20:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: add rebar.lock to define known working dependencies

by daniel

Attention is currently required from: pespin, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28650 ) Change subject: add rebar.lock to define known working dependencies ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I40660b23cee04ef2b4afbca34522a42a4b057e2e Gerrit-Change-Number: 28650 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 20 Jul 2022 10:19:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: Never use Bytes without any 'Adapter'

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28683 ) Change subject: Never use Bytes without any 'Adapter' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f Gerrit-Change-Number: 28683 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: Wed, 20 Jul 2022 08:40:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: EF.AD: Avoid NotImplementedErrror regarding network names

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28682 ) Change subject: EF.AD: Avoid NotImplementedErrror regarding network names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ed626699d1e4e484d4ffd04349676dadff626a0 Gerrit-Change-Number: 28682 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: Wed, 20 Jul 2022 08:40:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: tlv: Make NotImplementedError more verbose

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28681 ) Change subject: tlv: Make NotImplementedError more verbose ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I017eb4828e9deee80338024c41c93c0f78db3f3b Gerrit-Change-Number: 28681 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: Wed, 20 Jul 2022 08:39:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: README: Mention the manual can also be built from the source

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28680 ) Change subject: README: Mention the manual can also be built from the source ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File README.md: https://gerrit.osmocom.org/c/pysim/+/28680/comment/bc8e6222_6523e19b PS1, Line 18: w vim's artifact -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 Gerrit-Change-Number: 28680 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: Wed, 20 Jul 2022 08:39:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add support for obsolete EF.RPLMNAcT

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28636 ) Change subject: ts_31_102: Add support for obsolete EF.RPLMNAcT ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic7163b2a01f64ef1223cf15b8d0813d3edf5b61a Gerrit-Change-Number: 28636 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 20 Jul 2022 08:31:57 +0000 Gerrit-HasComments: No 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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/28684/1 diff --git a/pySim-shell.py b/pySim-shell.py index c05fd7a..da5ead8 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_list_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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: Never use Bytes without any 'Adapter'

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28683 ) Change subject: Never use Bytes without any 'Adapter' ...................................................................... Never use Bytes without any 'Adapter' Otherwise we have binary/bytes as values inside the dict, rather than a hexadecimal string. That's ugly when printing without json formatting. Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f --- M pySim/gsm_r.py M pySim/sysmocom_sja2.py M pySim/ts_31_102.py M pySim/ts_51_011.py 4 files changed, 34 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/28683/1 diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index 3364b3d..b48469e 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -185,7 +185,7 @@ super().__init__(fid='6ff4', sfid=None, name='EF.Shunting', desc='Shunting', size={8, 8}) self._construct = Struct('common_gid'/Int8ub, - 'shunting_gid'/Bytes(7)) + 'shunting_gid'/HexAdapter(Bytes(7))) class EF_GsmrPLMN(LinFixedEF): diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index f87e45a..2edc916 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -142,13 +142,12 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), - 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + 'key'/HexAdapter(Bytes(16)), + 'op'/ If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) @@ -198,13 +197,13 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), + 'key'/HexAdapter(Bytes(16)), 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) @@ -216,13 +215,13 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), + 'key'/HexAdapter(Bytes(16)), 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 314f3c2..066ee88 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -664,7 +664,7 @@ 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'/Bytes(this._.total_len-28), + self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-28)), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -673,14 +673,14 @@ 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, 'status'/Byte, - 'link_to_phonebook'/Bytes(3)) + 'link_to_phonebook'/HexAdapter(Bytes(3))) # 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}, 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'/Bytes(this._.total_len-27), + self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-27)), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -688,7 +688,7 @@ 'ext5_record_id'/Int8ub, 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, - 'link_to_phonebook'/Bytes(3)) + 'link_to_phonebook'/HexAdapter(Bytes(3))) # TS 31.102 Section 4.2.35 class EF_ICT(CyclicEF): @@ -727,7 +727,7 @@ 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'/GreedyBytes) + self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/HexAdapter(GreedyBytes)) # TS 31.102 Section 4.2.51 class EF_START_HFN(TransparentEF): @@ -771,7 +771,7 @@ 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) msk_ts_constr = Struct('msk_id'/Int32ub, 'timestamp_counter'/Int32ub) - self._construct = Struct('key_domain_id'/Bytes(3), + self._construct = Struct('key_domain_id'/HexAdapter(Bytes(3)), 'num_msk_id'/Int8ub, 'msk_ids'/msk_ts_constr[this.num_msk_id]) # TS 31.102 Section 4.2.81 @@ -865,7 +865,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('guti'/Bytes(12), 'last_visited_registered_tai'/Bytes(5), + self._construct = Struct('guti'/HexAdapter(Bytes(12)), + 'last_visited_registered_tai'/HexAdapter(Bytes(5)), 'eps_update_status'/upd_status_constr) # TS 31.102 Section 4.2.92 @@ -958,7 +959,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('5g_guti'/Bytes(13), 'last_visited_registered_tai_in_5gs'/Bytes(6), + self._construct = Struct('5g_guti'/HexAdapter(Bytes(13)), + 'last_visited_registered_tai_in_5gs'/HexAdapter(Bytes(6)), '5gs_update_status'/upd_status_constr) # TS 31.102 Section 4.4.11.7 @@ -974,7 +976,8 @@ 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) - Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/Bytes(3), 'tac_max'/Bytes(3)) + 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) # TS 31.102 Section 4.4.11.10 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 7e7020b..c6bb194 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -667,7 +667,7 @@ class EF_LOCI(TransparentEF): 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'/Bytes(4), 'lai'/Bytes(5), 'tmsi_time'/Int8ub, + 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, location_area_not_allowed=3)) @@ -806,7 +806,7 @@ class EF_LOCIGPRS(TransparentEF): 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'/Bytes(4), 'ptmsi_sig'/Int8ub, 'rai'/Bytes(6), + 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, routing_area_not_allowed=3)) @@ -897,7 +897,8 @@ class EF_OPL(LinFixedEF): 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'/Bytes(2), 'lac_max'/Bytes(2)), 'pnn_record_id'/Int8ub) + 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): @@ -933,8 +934,8 @@ class EF_MMSN(LinFixedEF): 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'/Bytes(2), 'mms_implementation'/Bytes(1), - 'mms_notification'/Bytes(this._.total_len-4), 'ext_record_nr'/Byte) + 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) # TS 51.011 Annex K.1 class MMS_Implementation(BER_TLV_IE, tag=0x80): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f Gerrit-Change-Number: 28683 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022