- gerrit-log - lists.osmocom.org

[S] Change in osmo-ggsn[master]: gtp: Store rx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp}
by pespin 29 Jul '24

29 Jul '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/37595?usp=email ) Change subject: gtp: Store rx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp} ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia3e360a35d30858eab1e438dc2508fd756c2e22e Gerrit-Change-Number: 37595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 29 Jul 2024 12:07:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: OBS: fix up-to-date check for strongswan-epdg
by osmith 29 Jul '24

29 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37650?usp=email ) Change subject: OBS: fix up-to-date check for strongswan-epdg ...................................................................... OBS: fix up-to-date check for strongswan-epdg Move the code to transform the version from the git tag to the version that we can use in debian/changelog to a separate function. Use it not only when generating the version for debian/changelog, but also when checking if the current git tag is up-to-date. Without this patch, it always considers strongswan-epdg outdated: strongswan-epdg: building source package (outdated: osmo-epdg-0.1.2 <=> 0.1.2.osmo.epdg in OBS) Change-Id: I515695d52f5d37b256ef163875417745897e5900 --- M scripts/obs/lib/debian.py M scripts/obs/update_obs_project.py 2 files changed, 28 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 3c0c2a5..585c447 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -92,6 +92,14 @@ return ret +def transform_version(version): + if "osmo-epdg-" in version: + version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" + + version = version.replace("-", ".") + return version + + def changelog_add_entry_if_needed(project, version): """ Adjust the changelog if the version in the changelog is different from the given version. """ @@ -113,10 +121,7 @@ pass # Debian versions must start with a digit - if "osmo-epdg-" in version: - version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" - - version = version.replace("-", ".") + version = transform_version(latest_version) if version_changelog == version: return diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 08d789d..0852693 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -7,6 +7,7 @@ import traceback import lib import lib.config +import lib.debian import lib.docker import lib.git import lib.metapkg @@ -97,6 +98,7 @@ branch_missing_ok=delete) else: latest_version = lib.git.get_latest_tag_remote(package) + latest_version = lib.debian.transform_version(latest_version) if latest_version is None: if delete and os.path.basename(package) in pkgs_remote: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I515695d52f5d37b256ef163875417745897e5900 Gerrit-Change-Number: 37650 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: OBS: replace - with . in version for d/changelog
by osmith 29 Jul '24

29 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37648?usp=email ) Change subject: OBS: replace - with . in version for d/changelog ...................................................................... OBS: replace - with . in version for d/changelog Fix for: dpkg-buildpackage: info: source version 2:0.1.2-osmo-epdg ... dpkg-source: error: can't build with source format '3.0 (native)': native package version may not have a revision Change-Id: If00469689b107efdf91a5cee4ebe6a3ccc183cec --- M scripts/obs/lib/debian.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 1e48046..91c9dac 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -116,6 +116,8 @@ if version.startswith("osmo-epdg-"): version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" + version = version.replace("-", ".") + if version_changelog == version: return -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If00469689b107efdf91a5cee4ebe6a3ccc183cec Gerrit-Change-Number: 37648 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: OBS: support epoch in strongswan-epdg version
by osmith 29 Jul '24

29 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37649?usp=email ) Change subject: OBS: support epoch in strongswan-epdg version ...................................................................... OBS: support epoch in strongswan-epdg version In the related commit, an epoch has been added to the strongswan-epdg version. Adjust the code that replaces the version to suppor this. Related: https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg/commit/872be0a93… Change-Id: I7abcf82a78fd4c4f6d29d2717dad5c70bc50e683 --- M scripts/obs/lib/debian.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 91c9dac..3c0c2a5 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -113,7 +113,7 @@ pass # Debian versions must start with a digit - if version.startswith("osmo-epdg-"): + if "osmo-epdg-" in version: version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" version = version.replace("-", ".") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7abcf82a78fd4c4f6d29d2717dad5c70bc50e683 Gerrit-Change-Number: 37649 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: OBS: fix up-to-date check for strongswan-epdg
by fixeria 29 Jul '24

29 Jul '24

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37650?usp=email ) Change subject: OBS: fix up-to-date check for strongswan-epdg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I515695d52f5d37b256ef163875417745897e5900 Gerrit-Change-Number: 37650 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jul 2024 11:38:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: OBS: support epoch in strongswan-epdg version
by fixeria 29 Jul '24

29 Jul '24

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37649?usp=email ) Change subject: OBS: support epoch in strongswan-epdg version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7abcf82a78fd4c4f6d29d2717dad5c70bc50e683 Gerrit-Change-Number: 37649 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jul 2024 11:38:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: OBS: replace - with . in version for d/changelog
by fixeria 29 Jul '24

29 Jul '24

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37648?usp=email ) Change subject: OBS: replace - with . in version for d/changelog ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If00469689b107efdf91a5cee4ebe6a3ccc183cec Gerrit-Change-Number: 37648 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jul 2024 11:37:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: pySim.esim.saip: Add subclasses for gsm-access, phonebook, 5gs, saip
by laforge 29 Jul '24

29 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37660?usp=email ) Change subject: pySim.esim.saip: Add subclasses for gsm-access, phonebook, 5gs, saip ...................................................................... pySim.esim.saip: Add subclasses for gsm-access, phonebook, 5gs, saip Those are all optional ProfileElements related to the USIM NAA. Change-Id: I621cc3d2440babdc11b4b038f16acf418bbc88ad --- M pySim/esim/saip/__init__.py 1 file changed, 63 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/37660/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 9185e36..81fef84 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -296,13 +296,13 @@ 'opt-usim': ProfileElementOptUSIM, 'isim': ProfileElementISIM, 'opt-isim': ProfileElementOptISIM, - # TODO: phonebook - # TODO: gsm-access + 'phonebook': ProfileElementPhonebook, + 'gsm-access': ProfileElementGsmAccess, # TODO: csim # TODO: opt-csim # TODO: eap - # TODO: df-5gs - # TODO: df-saip + 'df-5gs': ProfileElementDf5GS, + 'df-saip': ProfileElementDfSAIP, } if pe_type in class4petype: return class4petype[pe_type] @@ -517,6 +517,54 @@ for fname in ['df-telecom', 'ef-arr']: self.decoded[fname] = [] +class ProfileElementPhonebook(FsProfileElement): + type = 'phonebook' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_PHONEBOOK_ADF_USIM) + for fname in ['df-phonebook']: + self.decoded[fname] = [] + +class ProfileElementGsmAccess(FsProfileElement): + type = 'gsm-access' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_GSM_ACCESS_ADF_USIM) + for fname in ['df-gsm-access']: + self.decoded[fname] = [] + +class ProfileElementDf5GS(FsProfileElement): + type = 'df-5gs' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_5GS_v3) + for fname in ['df-5gs']: + self.decoded[fname] = [] + +class ProfileElementDfSAIP(FsProfileElement): + type = 'df-saip' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_SAIP) + for fname in ['df-saip']: + self.decoded[fname] = [] + class SecurityDomainKeyComponent: """Representation of a key-component of a key for a security domain.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37660?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: I621cc3d2440babdc11b4b038f16acf418bbc88ad Gerrit-Change-Number: 37660 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim.ts_102_221: Fix FileDescriptor encoding for BER-TLV case
by laforge 29 Jul '24

29 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37653?usp=email ) Change subject: pySim.ts_102_221: Fix FileDescriptor encoding for BER-TLV case ...................................................................... pySim.ts_102_221: Fix FileDescriptor encoding for BER-TLV case This fixes a long-standing bug in the FileDescriptor IE class which so far only supported decoding, but not encoding of BER-TLV file descriptors. Change-Id: I598b0e1709ee004bcf01a53beb91f68470e1f3da --- M pySim/ts_102_221.py 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/37653/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 1b40b09..5661cf4 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -94,24 +94,20 @@ # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): - _test_decode = [ - # FIXME: this doesn't work as _encode test for some strange reason. - ( '82027921', { "file_descriptor_byte": { "shareable": True, "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), - ] _test_de_encode = [ + ( '82027921', { "file_descriptor_byte": { "shareable": True, "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), ( '82027821', { "file_descriptor_byte": { "shareable": True, "file_type": "df", "structure": "no_info_given" }, "record_len": None, "num_of_rec": None }), ( '82024121', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "transparent" }, "record_len": None, "num_of_rec": None } ), ( '82054221006e05', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "linear_fixed" }, "record_len": 110, "num_of_rec": 5 } ), ] class BerTlvAdapter(Adapter): - def _parse(self, obj, context, path): - data = obj.read() - if data == b'\x01\x01\x01\x00\x00\x01': + def _decode(self, obj, context, path): + if obj == 0x39: return 'ber_tlv' raise ValidationError - def _build(self, obj, context, path): + def _encode(self, obj, context, path): if obj == 'ber_tlv': - return b'\x01\x01\x01\x00\x00\x01' + return 0x39 raise ValidationError FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37653?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: I598b0e1709ee004bcf01a53beb91f68470e1f3da Gerrit-Change-Number: 37653 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pySim.filesystem: Add Path for abstraction/utility around file system...
by laforge 29 Jul '24

29 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37652?usp=email ) Change subject: pySim.filesystem: Add Path for abstraction/utility around file system paths ...................................................................... pySim.filesystem: Add Path for abstraction/utility around file system paths Change-Id: I202baa378988431a318850e3593ff1929d94d268 --- M pySim/filesystem.py 1 file changed, 55 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/37652/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 5414fb9..0c7d51d 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -9,7 +9,7 @@ not the actual contents / runtime state of interacting with a given smart card. """ -# (C) 2021 by Harald Welte <laforge(a)osmocom.org> +# (C) 2021-2024 by Harald Welte <laforge(a)osmocom.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1448,3 +1448,48 @@ for m in CardModel.__subclasses__(): if m.match(scc): m.add_files(rs) + + +class Path: + """Representation of a file-system path.""" + def __init__(self, p: Union[str, List[str]]): + # split if given as single string with slahes + if isinstance(p, str): + p = p.split('/') + # make sure internal representation alwas is uppercase only + self.list = [x.upper() for x in p] + + def __str__(self) -> str: + return '/'.join(self.list) + + def __repr__(self) -> str: + return 'Path(%s)' % (str(self)) + + def __eq__(self, other: 'Path') -> bool: + return self.list == other.list + + def __getitem__(self, i): + return self.list[i] + + def __add__(self, a): + if isinstance(a, list): + l = self.list + a + elif isinstance(a, Path): + l = self.list + a.list + else: + l = self.list + [a] + return Path(l) + + def relative_to_mf(self) -> 'Path': + """Return a path relative to MF, i.e. without initial explicit MF.""" + if self.list[0] == 'MF': + return Path(self.list[1:]) + return self + + def is_parent(self, other: 'Path') -> bool: + """Is this instance a parent of the given other instance?""" + if len(self.list) >= len(other.list): + return False + if other.list[:len(self.list)] == self.list: + return True + return False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37652?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: I202baa378988431a318850e3593ff1929d94d268 Gerrit-Change-Number: 37652 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log