August 2026 - gerrit-log - lists.osmocom.org

[M] Change in ...pyosmocom[master]: Add GSM 7-bit packing and Network Name IE support
by laforge 23 Aug '26

23 Aug '26

Attention is currently required from: biocape, dexter, fixeria. laforge has posted comments on this change by biocape. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/43371?usp=email ) Change subject: Add GSM 7-bit packing and Network Name IE support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/43371?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I4661352e39031dc0041fc7851f675d6083a1035f Gerrit-Change-Number: 43371 Gerrit-PatchSet: 1 Gerrit-Owner: biocape <biofel(a)cape.co> 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: biocape <biofel(a)cape.co> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 23 Aug 2026 10:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: Decode GSM 7-bit packed EF.PNN data
by biocape 23 Aug '26

23 Aug '26

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41913?usp=email to look at the new patch set (#3). Change subject: Decode GSM 7-bit packed EF.PNN data ...................................................................... Decode GSM 7-bit packed EF.PNN data Use the NetworkNameAdapter from pyosmocom to decode the Network Name IEs (TS 24.008 Section 10.5.3.5a) in EF.PNN records, instead of exposing the raw bytes. Depends: pyosmocom.git Change-Id I4661352e39031dc0041fc7851f675d6083a1035f Change-Id: I4558fd011592aeeae2389fe8a1f62f3d7e21d219 --- M pySim/ts_51_011.py M requirements.txt M setup.py 3 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/41913/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4558fd011592aeeae2389fe8a1f62f3d7e21d219 Gerrit-Change-Number: 41913 Gerrit-PatchSet: 3 Gerrit-Owner: biocape <biofel(a)cape.co> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in pysim[master]: Decode GSM 7-bit packed EF.PNN data
by biocape 23 Aug '26

23 Aug '26

Attention is currently required from: fixeria, laforge. biocape has posted comments on this change by biocape. ( https://gerrit.osmocom.org/c/pysim/+/41913?usp=email ) Change subject: Decode GSM 7-bit packed EF.PNN data ...................................................................... Patch Set 1: (1 comment) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/41913/comment/c8daa132_9cfe8b43?usp=em… : PS1, Line 906: return data.decode('utf_16_be') > I'd assume this is all possible without too much imperative code and with some construct-magic. […] Done — moved to pyosmocom as NetworkNameAdapter in I4661352e39031dc0041fc7851f675d6083a1035f. I don't think parameterizing GsmOrUcs2Adapter works here: the Network Name header collides with the Annex A magic bytes. E.g. a 10-septet GSM 7-bit name starts with 0x82, which Annex A would read as UCS-2 variant 3. So I gave it its own adapter. Also fixed two bugs from patchset 1 along the way: coding scheme is bits 7-5 (not bit 7), and the UCS-2 encode header should be 0x90, not 0xC0 (reserved). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4558fd011592aeeae2389fe8a1f62f3d7e21d219 Gerrit-Change-Number: 41913 Gerrit-PatchSet: 1 Gerrit-Owner: biocape <biofel(a)cape.co> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 23 Aug 2026 07:15:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: Decode GSM 7-bit packed EF.PNN data
by biocape 23 Aug '26

23 Aug '26

Attention is currently required from: biocape, fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41913?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: Decode GSM 7-bit packed EF.PNN data ...................................................................... Decode GSM 7-bit packed EF.PNN data Use the NetworkNameAdapter from pyosmocom to decode the Network Name IEs (TS 24.008 Section 10.5.3.5a) in EF.PNN records, instead of exposing the raw bytes. Depends: pyosmocom.git Change-Id I4661352e39031dc0041fc7851f675d6083a1035f Change-Id: I4558fd011592aeeae2389fe8a1f62f3d7e21d219 --- M pySim/ts_51_011.py M requirements.txt M setup.py 3 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/41913/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4558fd011592aeeae2389fe8a1f62f3d7e21d219 Gerrit-Change-Number: 41913 Gerrit-PatchSet: 2 Gerrit-Owner: biocape <biofel(a)cape.co> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: biocape <biofel(a)cape.co>

1 0

[M] Change in ...pyosmocom[master]: Add GSM 7-bit packing and Network Name IE support
by biocape 23 Aug '26

23 Aug '26

biocape has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/43371?usp=email ) Change subject: Add GSM 7-bit packing and Network Name IE support ...................................................................... Add GSM 7-bit packing and Network Name IE support Add gsm7_pack()/gsm7_unpack() (TS 23.038 Section 6.1.2.1) and a NetworkNameAdapter for the Network Name IE (TS 24.008 Section 10.5.3.5a), as used by EF.PNN and MM INFORMATION. This is a separate adapter rather than a parameterization of GsmOrUcs2Adapter: the Network Name header octet clashes with the TS 102 221 Annex A magic bytes, e.g. a 10-septet GSM 7-bit name starts with 0x82, which Annex A reads as UCS-2 variant 3. Change-Id: I4661352e39031dc0041fc7851f675d6083a1035f --- M src/osmocom/construct.py M src/osmocom/utils.py M tests/test_construct.py M tests/test_utils.py 4 files changed, 117 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/71/43371/1 diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 548f22d..ef97943 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -18,7 +18,7 @@ from construct.core import evaluate from construct.lib import integertypes -from osmocom.utils import b2h, h2b, swap_nibbles, int_bytes_required +from osmocom.utils import b2h, h2b, swap_nibbles, int_bytes_required, gsm7_pack, gsm7_unpack # (C) 2021-2022 by Harald Welte <laforge(a)osmocom.org> # @@ -252,6 +252,39 @@ else: return _encode_variant1(obj) +class NetworkNameAdapter(Adapter): + """convert the value part of a Network Name IE (TS 24.008 Section 10.5.3.5a) + to a string (and back). + + Wire format: + octet 1: header + bits 7-5: coding scheme + bit 4: add country initials + bits 3-1: spare bits in last octet + octet 2+: GSM 7-bit packed (TS 23.038) or UCS-2 encoded text + + The encoder prefers GSM 7-bit packed and falls back to UCS-2. + It sets the add country initials bit to 0.""" + def _decode(self, obj, context, path): + if len(obj) < 1: + return '' + coding_scheme = (obj[0] >> 4) & 0x07 + num_spare_bits = obj[0] & 0x07 + if coding_scheme == 0: + # GSM 7 bit default alphabet, packed + return codecs.decode(gsm7_unpack(obj[1:], num_spare_bits), 'gsm03.38') + if coding_scheme == 1: + # UCS-2 (16 bit) + return codecs.decode(obj[1:], 'utf_16_be') + raise ValueError('reserved Network Name coding scheme %u' % coding_scheme) + + def _encode(self, obj, context, path): + try: + packed, num_spare_bits = gsm7_pack(codecs.encode(obj, 'gsm03.38')) + return bytes([0x80 | num_spare_bits]) + packed + except ValueError: + return b'\x90' + codecs.encode(obj, 'utf_16_be') + class BcdAdapter(Adapter): """convert a bytes() type to a string of BCD nibbles.""" diff --git a/src/osmocom/utils.py b/src/osmocom/utils.py index 7963c05..def7cd7 100644 --- a/src/osmocom/utils.py +++ b/src/osmocom/utils.py @@ -8,7 +8,7 @@ import datetime import argparse from io import BytesIO -from typing import Optional, List, NewType +from typing import Optional, List, NewType, Tuple # Copyright (C) 2009-2010 Sylvain Munaut <tnt(a)246tNt.com> # Copyright (C) 2021 Harald Welte <laforge(a)osmocom.org> @@ -109,6 +109,38 @@ return hexstr(''.join([x+y for x, y in zip(s[1::2], s[0::2])])) +def gsm7_unpack(packed: bytes, num_spare_bits: int = 0) -> bytes: + """Unpack GSM 7-bit packed septets (3GPP TS 23.038 Section 6.1.2.1). + + Args: + packed : packed 7-bit data + num_spare_bits : number of spare bits in the last octet (0..7) + Returns: + unpacked bytes, one septet per byte + """ + packed_int = int.from_bytes(packed, byteorder='little') + num_septets = (len(packed) * 8 - num_spare_bits) // 7 + return bytes((packed_int >> (i * 7)) & 0x7f for i in range(num_septets)) + + +def gsm7_pack(septets: bytes) -> Tuple[bytes, int]: + """Pack septets into GSM 7-bit packed format (3GPP TS 23.038 Section 6.1.2.1). + + Args: + septets : one septet per byte; each byte must be within 0..127 + Returns: + tuple of (packed bytes, number of spare bits in the last octet) + """ + packed_int = 0 + for i, septet in enumerate(septets): + if septet > 0x7f: + raise ValueError('septet value 0x%02x exceeds 7 bits' % septet) + packed_int |= septet << (i * 7) + num_bits = len(septets) * 7 + num_bytes = (num_bits + 7) // 8 + return packed_int.to_bytes(num_bytes, byteorder='little'), num_bytes * 8 - num_bits + + def rpad(s: str, l: int, c='f') -> str: """pad string on the right side. Args: diff --git a/tests/test_construct.py b/tests/test_construct.py index 195732d..3ccd169 100755 --- a/tests/test_construct.py +++ b/tests/test_construct.py @@ -4,6 +4,7 @@ from osmocom.utils import b2h, h2b from osmocom.construct import Asn1DerInteger, Bytes, DnsAdapter, GreedyInteger, GreedyBytes, PlmnAdapter from osmocom.construct import StripHeaderAdapter, StripTrailerAdapter, Ucs2Adapter, filter_dict +from osmocom.construct import NetworkNameAdapter # pylint: disable=no-name-in-module from construct import FlagsEnum @@ -79,6 +80,32 @@ re_enc = self.ad._encode(string, None, None) self.assertEqual(encoded, re_enc) +class TestNetworkNameAdapter(unittest.TestCase): + ad = NetworkNameAdapter(GreedyBytes) + + testdata = [ + # GSM 7-bit packed, 2 spare bits + ( "Telekom.de", '82d432bbbc7eb75de432' ), + # GSM 7-bit packed, 4 spare bits + ( "Cape", '84c330bc0c' ), + # UCS-2, as the string is not representable in the GSM default alphabet + ( "МТС", '90041c04220421' ), + ] + + def test_data_decode(self): + for string, encoded_hex in self.testdata: + dec = self.ad._decode(h2b(encoded_hex), None, None) + self.assertEqual(dec, string) + + def test_data_encode(self): + for string, encoded_hex in self.testdata: + re_enc = self.ad._encode(string, None, None) + self.assertEqual(h2b(encoded_hex), re_enc) + + def test_reserved_coding_scheme(self): + with self.assertRaises(ValueError): + self.ad._decode(h2b('a0c330bc0c'), None, None) + class TestTrailerAdapter(unittest.TestCase): Privileges = FlagsEnum(StripTrailerAdapter(GreedyBytes, 3), security_domain=0x800000, dap_verification=0x400000, diff --git a/tests/test_utils.py b/tests/test_utils.py index 1b80011..ca9a42b 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -18,7 +18,7 @@ import unittest -from osmocom.utils import hexstr, int_bytes_required +from osmocom.utils import hexstr, int_bytes_required, gsm7_pack, gsm7_unpack class TestHexstr(unittest.TestCase): def test_cmp(self): @@ -54,6 +54,28 @@ self.assertEqual(str(hexstr('ABCD')), 'abcd') +class TestGsm7PackUnpack(unittest.TestCase): + # (packed, num_spare_bits, septets) + tests = [ + ( b'', 0, b'' ), + ( b'\x61', 1, b'a' ), + ( b'\xd4\x32\xbb\xbc\x7e\xb7\x5d\xe4\x32', 2, b'Telekom.de' ), + ( b'\xc8\x32\x9b\xfd\x06\x5d\xdf\x72\x36\x19', 3, b'Hello World' ), + ] + + def test_gsm7_unpack(self): + for packed, num_spare_bits, septets in self.tests: + self.assertEqual(gsm7_unpack(packed, num_spare_bits), septets) + + def test_gsm7_pack(self): + for packed, num_spare_bits, septets in self.tests: + self.assertEqual(gsm7_pack(septets), (packed, num_spare_bits)) + + def test_gsm7_pack_septet_out_of_range(self): + with self.assertRaises(ValueError): + gsm7_pack(b'\x80') + + class Test_int_bytes_required(unittest.TestCase): def test_int_bytes_required(self): -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/43371?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I4661352e39031dc0041fc7851f675d6083a1035f Gerrit-Change-Number: 43371 Gerrit-PatchSet: 1 Gerrit-Owner: biocape <biofel(a)cape.co>

1 0

[XS] Change in ...pyosmocom[master]: gsmtap: Update repo link from cgit to gitea/forgejo
by laforge 22 Aug '26

22 Aug '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/43370?usp=email ) Change subject: gsmtap: Update repo link from cgit to gitea/forgejo ...................................................................... gsmtap: Update repo link from cgit to gitea/forgejo Change-Id: I4d6e6921dba2b379714ff9ab9d6edfc2759681f8 --- M src/osmocom/gsmtap.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/70/43370/1 diff --git a/src/osmocom/gsmtap.py b/src/osmocom/gsmtap.py index 3474396..0c2edf7 100644 --- a/src/osmocom/gsmtap.py +++ b/src/osmocom/gsmtap.py @@ -28,7 +28,7 @@ from osmocom.construct import parse_construct # The root definition of GSMTAP can be found at -# https://cgit.osmocom.org/cgit/libosmocore/tree/include/osmocom/core/gsmtap.h +# https://gitea.osmocom.org/osmocom/libosmocore/src/branch/master/include/osm… GSMTAP_UDP_PORT = 4729 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/43370?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I4d6e6921dba2b379714ff9ab9d6edfc2759681f8 Gerrit-Change-Number: 43370 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-hlr[master]: debian/copyright: Update Source link from cgit to gitea/forgejo
by laforge 22 Aug '26

22 Aug '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/43369?usp=email ) Change subject: debian/copyright: Update Source link from cgit to gitea/forgejo ...................................................................... debian/copyright: Update Source link from cgit to gitea/forgejo Change-Id: Ib6f4c88ea2629ac1be1b4239b76ae450f0f65527 --- M debian/copyright 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/69/43369/1 diff --git a/debian/copyright b/debian/copyright index b66ed88..c49373f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OsmoHLR -Source: http://cgit.osmocom.org/osmo-hlr/ +Source: https://gitea.osmocom.org/cellular-infrastructure/osmo-hlr Files: * Copyright: 2016-2022 Sysmocom s. f. m. c. GmbH <info(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/43369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib6f4c88ea2629ac1be1b4239b76ae450f0f65527 Gerrit-Change-Number: 43369 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-bts[master]: debian/copyright: Update Source link from cgit to gitea/forgejo
by laforge 22 Aug '26

22 Aug '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/43368?usp=email ) Change subject: debian/copyright: Update Source link from cgit to gitea/forgejo ...................................................................... debian/copyright: Update Source link from cgit to gitea/forgejo Change-Id: I4f8bf41f8ae2038de4dbaeb151d914ddb0050ef5 --- M debian/copyright 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/43368/1 diff --git a/debian/copyright b/debian/copyright index 302d1d9..ed6561d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: osmo-bts -Source: http://cgit.osmocom.org/osmo-bts/ +Source: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts Files: * Copyright: 2008-2014 Harald Welte <laforge(a)gnumonks.org> -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/43368?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f8bf41f8ae2038de4dbaeb151d914ddb0050ef5 Gerrit-Change-Number: 43368 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in libosmocore[master]: gsmtap: Update repo link from cgit to gitea/forgejo
by laforge 22 Aug '26

22 Aug '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/43367?usp=email ) Change subject: gsmtap: Update repo link from cgit to gitea/forgejo ...................................................................... gsmtap: Update repo link from cgit to gitea/forgejo Change-Id: I56c53705b5911e919631eb81126f32bfdede69b3 --- M include/osmocom/core/gsmtap.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/43367/1 diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index d153efc..2a0e1a4 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -17,7 +17,7 @@ /* The GSMTAP format definition is maintained in libosmocore, * specifically the latest version can always be obtained from - * http://cgit.osmocom.org/cgit/libosmocore/tree/include/osmocom/core/gsmtap.h + * https://gitea.osmocom.org/osmocom/libosmocore/src/branch/master/include/osm… * * If you want to introduce new protocol/burst/channel types or extend * GSMTAP in any way, please contact the GSMTAP maintainer at either the -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43367?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I56c53705b5911e919631eb81126f32bfdede69b3 Gerrit-Change-Number: 43367 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: ts_102_221: support EF.ARR record decoding for DF, not just EF
by laforge 22 Aug '26

22 Aug '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/43254?usp=email ) Change subject: ts_102_221: support EF.ARR record decoding for DF, not just EF ...................................................................... ts_102_221: support EF.ARR record decoding for DF, not just EF Sadly, the EF.ARR interpretation, specifically that of the AM_DO depends on whether the rule is for a DF or EF. As we don't know this, allow the user to specify what kind of decode they would like, at least in the file-specific read_arr_record + read_arr_records command. Change-Id: I05e629e8b7dc705730d7039d2d0170ee24f8f844 --- M pySim/ts_102_221.py 1 file changed, 30 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index e38483d..603bc9c 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ from bidict import bidict +import copy from construct import Select, Const, Bit, Struct, Int16ub, FlagsEnum, GreedyString, ValidationError from construct import Optional as COptional, Computed @@ -732,36 +733,57 @@ raise ValueError return by_mode + @staticmethod + def __get_do_sequence(decode_for_df : bool = False): + if decode_for_df: + return DataObjectSequence('arr', sequence=[AM_DO_DF, SC_DO]) + else: + return DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) + def _decode_record_bin(self, raw_bin_data, **kwargs): - # we can only guess if we should decode for EF or DF here :( - arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) + # we can only guess if we should decode for EF or DF here, but our caller may + # be able to pass us a hint: + arr_seq = self.__get_do_sequence(kwargs.get('decode_for_df', False)) dec = arr_seq.decode_multi(raw_bin_data) # we cannot pass the result through flatten() here, as we don't have a related # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0] def _encode_record_bin(self, in_json, **kwargs): - # we can only guess if we should decode for EF or DF here :( - arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) + # we can only guess if we should decode for EF or DF here, but our caller may + # be able to pass us a hint: + arr_seq = self.__get_do_sequence(kwargs.get('encode_for_df', False)) return arr_seq.encode_multi(in_json) @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - @cmd2.with_argparser(LinFixedEF.ShellCommands.read_rec_dec_parser) + read_arr_argparser = copy.deepcopy(LinFixedEF.ShellCommands.read_rec_dec_parser) + read_arr_argparser.add_argument('--decode-for-df', action='store_true', + help='Decode EF.ARR record as if used by a DF (default: EF)') + + @cmd2.with_argparser(read_arr_argparser) def do_read_arr_record(self, opts): """Read one EF.ARR record in flattened, human-friendly form.""" - (data, _sw) = self._cmd.lchan.read_record_dec(opts.RECORD_NR) + (hexdata, _sw) = self._cmd.lchan.read_record(opts.RECORD_NR) + data = self._cmd.lchan.selected_file._decode_record_bin(h2b(hexdata), + decode_for_df = opts.decode_for_df) data = self._cmd.lchan.selected_file.flatten(data) self._cmd.poutput_json(data, opts.oneline) - @cmd2.with_argparser(LinFixedEF.ShellCommands.read_recs_dec_parser) + read_arrs_argparser = copy.deepcopy(LinFixedEF.ShellCommands.read_recs_dec_parser) + read_arrs_argparser.add_argument('--decode-for-df', action='store_true', + help='Decode EF.ARR records as if used by a DF (default: EF)') + + @cmd2.with_argparser(read_arrs_argparser) def do_read_arr_records(self, opts): """Read + decode all EF.ARR records in flattened, human-friendly form.""" num_of_rec = self._cmd.lchan.selected_file_num_of_rec() # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): - (data, _sw) = self._cmd.lchan.read_record_dec(recnr) + (hexdata, _sw) = self._cmd.lchan.read_record(recnr) + data = self._cmd.lchan.selected_file._decode_record_bin(h2b(hexdata), + decode_for_df = opts.decode_for_df) data = self._cmd.lchan.selected_file.flatten(data) data_list.append(data) self._cmd.poutput_json(data_list, opts.oneline) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I05e629e8b7dc705730d7039d2d0170ee24f8f844 Gerrit-Change-Number: 43254 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026