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

[M] Change in pysim[master]: pySim.esim.saip: Meaningful defaults in PE Constructor + test

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37415?usp=email ) Change subject: pySim.esim.saip: Meaningful defaults in PE Constructor + test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I401bca16e58461333733877ec79102a5ae7fe410 Gerrit-Change-Number: 37415 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 10 Jul 2024 06:50:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37436?usp=email ) Change subject: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ ...................................................................... pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ This fixes commit cdf661b24cfebb63b57405c2b55b3c42a8f277c8 "pySim.tlv.COMPR_TLV_IE: Patch comprehension bit if derived class misses it" where we introduce a comprehension-TLV specific derived metaclass, which forgets to pass the kwargs through to the parent metaclass. Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e --- M pySim/cat.py M pySim/tlv.py 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cat.py b/pySim/cat.py index 2f05b93..d2f39f7 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -126,7 +126,7 @@ 'time_interval'/Int8ub) # TS 102 223 Section 8.9 -class Item(COMPR_TLV_IE, tag=0x0f): +class Item(COMPR_TLV_IE, tag=0x8f): _construct = Struct('identifier'/Int8ub, 'text_string'/GsmStringAdapter(GreedyBytes)) @@ -703,7 +703,7 @@ _construct = HexAdapter(GreedyBytes) # TS 102 223 Section 8.103 -class RefreshEnforcementPolicy(COMPR_TLV_IE, tag=0x3A): +class RefreshEnforcementPolicy(COMPR_TLV_IE, tag=0xBA): _construct = FlagsEnum(Byte, even_if_navigating_menus=0, even_if_data_call=1, even_if_voice_call=2) # TS 102 223 Section 8.104 diff --git a/pySim/tlv.py b/pySim/tlv.py index 3d7a420..d7c6876 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -270,7 +270,7 @@ class ComprTlvMeta(TlvMeta): def __new__(mcs, name, bases, namespace, **kwargs): - x = super().__new__(mcs, name, bases, namespace) + x = super().__new__(mcs, name, bases, namespace, **kwargs) if x.tag: # we currently assume that the tag values always have the comprehension bit set; # let's fix it up if a derived class has forgotten about that -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e Gerrit-Change-Number: 37436 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37436?usp=email ) Change subject: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e Gerrit-Change-Number: 37436 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 10 Jul 2024 06:49:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37436?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ ...................................................................... pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ This fixes commit cdf661b24cfebb63b57405c2b55b3c42a8f277c8 "pySim.tlv.COMPR_TLV_IE: Patch comprehension bit if derived class misses it" where we introduce a comprehension-TLV specific derived metaclass, which forgets to pass the kwargs through to the parent metaclass. Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e --- M pySim/cat.py M pySim/tlv.py 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/37436/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e Gerrit-Change-Number: 37436 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37436?usp=email ) Change subject: pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ ...................................................................... pySim.tlv: Fix ComprTlvMeta() not passing kwargs to parent __new__ This fixes commit cdf661b24cfebb63b57405c2b55b3c42a8f277c8 "pySim.tlv.COMPR_TLV_IE: Patch comprehension bit if derived class misses it" where we introduce a comprehension-TLV specific derived metaclass, which forgets to pass the kwargs through to the parent metaclass. Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e --- M pySim/tlv.py 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/37436/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 3d7a420..d7c6876 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -270,7 +270,7 @@ class ComprTlvMeta(TlvMeta): def __new__(mcs, name, bases, namespace, **kwargs): - x = super().__new__(mcs, name, bases, namespace) + x = super().__new__(mcs, name, bases, namespace, **kwargs) if x.tag: # we currently assume that the tag values always have the comprehension bit set; # let's fix it up if a derived class has forgotten about that -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If65a8169bcf91bb2f943d0316f1140e07f0b8b8e Gerrit-Change-Number: 37436 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[M] Change in pysim[master]: pySim.tlv: Add COMPACT_TLV_IE TLV variant

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37435?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.tlv: Add COMPACT_TLV_IE TLV variant ...................................................................... pySim.tlv: Add COMPACT_TLV_IE TLV variant the COMPACT-TLV variant is a TLV variant that ISO7816 uses for encoding tag and length into a single octet. This is used (for example) in ATR historical bytes. Let's add support for this to our pySim TLV encoder/decoder. Change-Id: I9e98d150b97317ae0c6be2366bdaaeaeddf8031c --- M pySim/tlv.py M tests/test_tlv.py 2 files changed, 69 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/37435/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e98d150b97317ae0c6be2366bdaaeaeddf8031c Gerrit-Change-Number: 37435 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

11 months, 2 weeks

1
0
0 0

[M] Change in pysim[master]: pySim.tlv: Add COMPACT_TLV_IE TLV variant

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37435?usp=email ) Change subject: pySim.tlv: Add COMPACT_TLV_IE TLV variant ...................................................................... pySim.tlv: Add COMPACT_TLV_IE TLV variant the COMPACT-TLV variant is a TLV variant that ISO7816 uses for encoding tag and length into a single octet. This is used (for example) in ATR historical bytes. Let's add support for this to our pySim TLV encoder/decoder. Change-Id: I9e98d150b97317ae0c6be2366bdaaeaeddf8031c --- M pySim/tlv.py M tests/test_tlv.py 2 files changed, 68 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/37435/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 3d7a420..e93462f 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -246,6 +246,35 @@ return dec, remainder +class COMPACT_TLV_IE(TLV_IE): + """TLV_IE formatted as COMPACT-TLV described in ISO 7816""" + + @classmethod + def _parse_tag_raw(cls, do: bytes) -> Tuple[int, bytes]: + return do[0] >> 4, do + + @classmethod + def _decode_tag(cls, do: bytes) -> Tuple[dict, bytes]: + rawtag, remainder = cls._parse_tag_raw(do) + return {'tag': rawtag}, remainder + + @classmethod + def _parse_len(cls, do: bytes) -> Tuple[int, bytes]: + return do[0] & 0xf, do[1:] + + def _encode_tag(self) -> bytes: + """Not needed as we override the to_tlv() method to encode tag+length into one byte.""" + raise NotImplementedError + + def _encode_len(self): + """Not needed as we override the to_tlv() method to encode tag+length into one byte.""" + raise NotImplementedError + + def to_tlv(self, context: dict = {}): + val = self.to_bytes(context=context) + return bytes([(self.tag << 4) | (len(val) & 0xF)]) + val + + class BER_TLV_IE(TLV_IE): """TLV_IE formatted as ASN.1 BER described in ITU-T X.690 8.1.2.""" diff --git a/tests/test_tlv.py b/tests/test_tlv.py index 0e73ab1..3dc3a89 100644 --- a/tests/test_tlv.py +++ b/tests/test_tlv.py @@ -17,8 +17,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import unittest -from construct import Int8ub +from construct import Int8ub, GreedyBytes from pySim.tlv import * +from pySim.utils import h2b class TestUtils(unittest.TestCase): def test_camel_to_snake(self): @@ -117,5 +118,27 @@ self.assertEqual(ie.to_bytes(), b'\x42') self.assertEqual(ie.to_ie(), b'\x42') +class TestCompact(unittest.TestCase): + class IE_3(COMPACT_TLV_IE, tag=0x3): + _construct = GreedyBytes + class IE_7(COMPACT_TLV_IE, tag=0x7): + _construct = GreedyBytes + class IE_5(COMPACT_TLV_IE, tag=0x5): + _construct = GreedyBytes + class IE_Coll(TLV_IE_Collection, nested=[IE_3, IE_7, IE_5]): + _construct = GreedyBytes + def test_ATR(self): + atr = h2b("31E073FE211F5745437531301365") + c = self.IE_Coll() + c.from_tlv(atr) + self.assertEqual(c.children[0].tag, 3) + self.assertEqual(c.children[0].to_bytes(), b'\xe0') + self.assertEqual(c.children[1].tag, 7) + self.assertEqual(c.children[1].to_bytes(), b'\xfe\x21\x1f') + self.assertEqual(c.children[2].tag, 5) + self.assertEqual(c.children[2].to_bytes(), b'\x45\x43\x75\x31\x30\x13\x65') + self.assertEqual(c.to_tlv(), atr) + + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e98d150b97317ae0c6be2366bdaaeaeddf8031c Gerrit-Change-Number: 37435 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: update logging config in osmo-s1gw.config

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37427?usp=email ) Change subject: ttcn3-s1gw-test: update logging config in osmo-s1gw.config ...................................................................... ttcn3-s1gw-test: update logging config in osmo-s1gw.config Bring logging configuration in sync with erlang/osmo-s1gw.git. Change-Id: I3853c40c94d3ee2bbd5d6f6b345bfd87cce134d0 Related: erlang/osmo-s1gw.git Ib88801b8d38976b98a02ed06e1638e0e9056bafb --- M ttcn3-s1gw-test/osmo-s1gw.config 1 file changed, 16 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-s1gw-test/osmo-s1gw.config b/ttcn3-s1gw-test/osmo-s1gw.config index 13b5058..b621ef9 100644 --- a/ttcn3-s1gw-test/osmo-s1gw.config +++ b/ttcn3-s1gw-test/osmo-s1gw.config @@ -25,9 +25,10 @@ #{level => debug, formatter => {logger_formatter, #{template => [time, " ", - "[", level, "] ", - {pid, ["", pid, " "], ""}, - msg, + "[", level, "]", + {pid, [" ", pid, ""], ""}, + {prefix, [" ", prefix, " ::"], ""}, + " ", msg, {mfa, [" (", mfa, ":", line, ")"], ""}, "\n"]}}}}]}]}]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37427?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3853c40c94d3ee2bbd5d6f6b345bfd87cce134d0 Gerrit-Change-Number: 37427 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Forward Hold/Resume SIP UA -> IMS Core

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37434?usp=email ) Change subject: asterisk: pjsip.conf: Forward Hold/Resume SIP UA -> IMS Core ...................................................................... asterisk: pjsip.conf: Forward Hold/Resume SIP UA -> IMS Core This is needed for forward the a=sendonly when a local SIP UA wishes to hold a call. Related: SYS#7002 Change-Id: I70e7e5df2d9c91acdc85c689cf8e48c5a44b2a34 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/37434/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 574ecf6..bd33845 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -115,6 +115,7 @@ direct_media=no ims_aka=yes 100rel=peer_supported +moh_passthrough=yes [volte_ims] type=auth -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I70e7e5df2d9c91acdc85c689cf8e48c5a44b2a34 Gerrit-Change-Number: 37434 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mo_holdresume_mo

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37426?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mo_holdresume_mo ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37426?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifffa1c4021f324871f11a60264c17b640569e18b Gerrit-Change-Number: 37426 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 09 Jul 2024 16:00:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024