- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: contrib: add a tool to parse the SIMA response from an eUICC
by osmith 28 Aug '25

28 Aug '25

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/40936?usp=email ) Change subject: contrib: add a tool to parse the SIMA response from an eUICC ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40936?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: Ida4c3c5446653b283a3869c0c387f328ae51e55e Gerrit-Change-Number: 40936 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Aug 2025 07:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in pysim[master]: contrib: add a tool to parse the SIMA response from an eUICC
by dexter 28 Aug '25

28 Aug '25

Attention is currently required from: dexter, osmith. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40936?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: contrib: add a tool to parse the SIMA response from an eUICC ...................................................................... contrib: add a tool to parse the SIMA response from an eUICC When an eUICC performs a profile installation it returns a (concatenated) series of ASN.1 encoded strings as "simaResponse". In case the profile installation fails for some reason the simaResponse contains diagnostic information to diagnose why the profile installation failed. Unfortunately there are currently no practical tools available to decode and display the information in the simaResponse. Let's add a tool for that. Related SYS#7617 Change-Id: Ida4c3c5446653b283a3869c0c387f328ae51e55e --- A contrib/analyze_simaResponse.py 1 file changed, 112 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/40936/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40936?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: Ida4c3c5446653b283a3869c0c387f328ae51e55e Gerrit-Change-Number: 40936 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: OBS: --version-append: never override version
by osmith 28 Aug '25

28 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email ) Change subject: OBS: --version-append: never override version ...................................................................... OBS: --version-append: never override version We have some branches set up that when pushed to, directly result in building OBS packages. We append a string to the package version there, such as ~rhizomatica.testing. The expectation is that all packages built from that branch have this string in the version. Recently an edge case was found: when amending the commit of the last tagged release, e.g. osmo-sgsn 1.12.0, then the generated version is based on the previous git tag (as the last git tag's commit is not part of the current branch anymore) while having the newer version in debian/changelog. This then results in the newer version being used, without appending the version string: osmo-sgsn: WARNING: version from changelog (1.12.0) is higher than version based on git tag (1.11.1.20-e000e~rhizomatica.production), using version from changelog (git tag not pushed yet?) While IMHO it is a bad idea to just amend the commit of the last release instead of making a separate commit, this results in unexpected behavior so adjust the script to not override the version if --version-append is used. Related: OS#5981 Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe --- M scripts/obs/lib/debian.py 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/40965/1 diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 9193d66..0438dd8 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -112,12 +112,13 @@ try: if packaging.version.parse(version_changelog.split("-")[0]) > packaging.version.parse(version.split("-")[0]): print( - f"{project}: WARNING: version from changelog" - f" ({version_changelog}) is higher than version based on git tag" - f" ({version}), using version from changelog (git tag not pushed" - " yet?)" + f"{project}: WARNING: version from changelog ({version_changelog}) is higher than version based on git tag ({version})" ) - return + if lib.args.version_append: + print(f"{project}: WARNING: assuming commit from last git tag was amended, ignoring...") + else: + print(f"{project}: WARNING: using version from changelog (git tag not pushed yet?)") + return except packaging.version.InvalidVersion: # packaging.version.parse can parse the version numbers used in Osmocom # projects (where we need the above check), but not e.g. some versions -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe Gerrit-Change-Number: 40965 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: OBS: lib/debian: format with ruff
by osmith 28 Aug '25

28 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40964?usp=email ) Change subject: OBS: lib/debian: format with ruff ...................................................................... OBS: lib/debian: format with ruff Change-Id: I9aeade2c81f9d7bcfe0c04a0b9c75012217af90f --- M .ruff.toml M scripts/obs/lib/debian.py 2 files changed, 36 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/40964/1 diff --git a/.ruff.toml b/.ruff.toml index d8e72e2..a75a783 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -11,7 +11,6 @@ "scripts/obs/lib/binpkg_deb.py", "scripts/obs/lib/binpkg_rpm.py", "scripts/obs/lib/config.py", - "scripts/obs/lib/debian.py", "scripts/obs/lib/docker.py", "scripts/obs/lib/git.py", "scripts/obs/lib/metapkg.py", diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 8e0fd5e..9193d66 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -15,9 +15,10 @@ except ImportError: pass + def control_add_depend(project, pkgname, version): - """ :param pkgname: of the meta-package to depend on (e.g. osmocom-nightly) - :param version: of the meta-pkgname to depend on or None """ + """:param pkgname: of the meta-package to depend on (e.g. osmocom-nightly) + :param version: of the meta-pkgname to depend on or None""" repo_path = lib.git.get_repo_path(project) if version: @@ -30,7 +31,7 @@ def changelog_add_entry(project, version): - """ :param version: for the new changelog entry """ + """:param version: for the new changelog entry""" feed = lib.args.feed repo_path = lib.git.get_repo_path(project) changelog_path = f"{repo_path}/debian/changelog" @@ -52,8 +53,7 @@ with open(changelog_path, "w") as f: f.write(f"{pkgname} ({version}) unstable; urgency=medium\n") f.write("\n") - f.write(" * Automatically generated changelog entry for building the" - f" Osmocom {feed} feed\n") + f.write(f" * Automatically generated changelog entry for building the Osmocom {feed} feed\n") f.write("\n") f.write(f" -- Osmocom OBS scripts <info(a)osmocom.org> {date_str}\n") f.write("\n") @@ -61,7 +61,7 @@ def fix_source_format(project): - """ Always use format "3.0 (native)" (e.g. limesuite has "3.0 (quilt)").""" + """Always use format "3.0 (native)" (e.g. limesuite has "3.0 (quilt)").""" repo_path = lib.git.get_repo_path(project) format_path = f"{repo_path}/debian/source/format" if not os.path.exists(format_path): @@ -104,18 +104,19 @@ def changelog_add_entry_if_needed(project, version): - """ Adjust the changelog if the version in the changelog is different from - the given version. """ + """Adjust the changelog if the version in the changelog is different from + the given version.""" version_changelog = get_last_version_from_changelog(project) # Don't use a lower number (OS#6173) try: - if packaging.version.parse(version_changelog.split("-")[0]) > \ - packaging.version.parse(version.split("-")[0]): - print(f"{project}: WARNING: version from changelog" - f" ({version_changelog}) is higher than version based on git tag" - f" ({version}), using version from changelog (git tag not pushed" - " yet?)") + if packaging.version.parse(version_changelog.split("-")[0]) > packaging.version.parse(version.split("-")[0]): + print( + f"{project}: WARNING: version from changelog" + f" ({version_changelog}) is higher than version based on git tag" + f" ({version}), using version from changelog (git tag not pushed" + " yet?)" + ) return except packaging.version.InvalidVersion: # packaging.version.parse can parse the version numbers used in Osmocom @@ -129,15 +130,14 @@ if version_changelog == version: return - print(f"{project}: adding debian/changelog entry ({version_changelog} =>" - f" {version})") + print(f"{project}: adding debian/changelog entry ({version_changelog} => {version})") changelog_add_entry(project, version) def configure_append(project, parameters): - """ Add one or more configure parameters like --enable-sanitize to the - dh_auto_configure line, also add the override_dh_auto_configure block - if missing. """ + """Add one or more configure parameters like --enable-sanitize to the + dh_auto_configure line, also add the override_dh_auto_configure block + if missing.""" print(f"{project}: adding configure parameters: {parameters}") rules = f"{lib.git.get_repo_path(project)}/debian/rules" override_found = False @@ -154,20 +154,21 @@ if " -- " in line.replace("\t", " "): lines[i] = line.replace(" --", f" -- {parameters}", 1) else: - lines[i] = line.replace("dh_auto_configure", - f"dh_auto_configure -- {parameters}", 1) + lines[i] = line.replace("dh_auto_configure", f"dh_auto_configure -- {parameters}", 1) break if not override_found: - lines += ["\n", - "override_dh_auto_configure:\n", - f"\tdh_auto_configure -- {parameters}\n"] + lines += [ + "\n", + "override_dh_auto_configure:\n", + f"\tdh_auto_configure -- {parameters}\n", + ] with open(rules, "w") as f: f.writelines(lines) def disable_manuals(project): - """ Disabling manuals speeds up the build time significantly, we don't - need them for e.g. the asan repository. """ + """Disabling manuals speeds up the build time significantly, we don't + need them for e.g. the asan repository.""" print(f"{project}: disabling manuals") debian = f"{lib.git.get_repo_path(project)}/debian" # Remove dependencies @@ -183,11 +184,16 @@ def build_source_package(project): fix_source_format(project) print(f"{project}: building debian source package") - lib.run_cmd(["dpkg-buildpackage", "-S", "-uc", "-us", "-d"], - cwd=lib.git.get_repo_path(project)) + lib.run_cmd( + ["dpkg-buildpackage", "-S", "-uc", "-us", "-d"], + cwd=lib.git.get_repo_path(project), + ) def move_files_to_output(project): path_output = lib.get_output_path(project) - lib.run_cmd(f"mv *.tar* *.dsc {shlex.quote(path_output)}", shell=True, - cwd=lib.config.path_cache) + lib.run_cmd( + f"mv *.tar* *.dsc {shlex.quote(path_output)}", + shell=True, + cwd=lib.config.path_cache, + ) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40964?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9aeade2c81f9d7bcfe0c04a0b9c75012217af90f Gerrit-Change-Number: 40964 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: ignore builtin modules
by osmith 28 Aug '25

28 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40955?usp=email ) Change subject: testenv: qemu: ignore builtin modules ...................................................................... testenv: qemu: ignore builtin modules In debian 13, the virtio_pci kernel module is now builtin. Adjust the code paths that add kernel modules to the initramfs and load them to ignore builtin modules. This fixes the ttcn3-ggsn-test-kernel-latest job job, which currently fails with: + modprobe -a --dry-run --show-depends --set-version=6.12.41+deb13-amd64 virtio_net virtio_pci + sort -u + cut -d -f 2 + local files=virtio_pci /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/net_failover.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/virtio_net.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/net/core/failover.ko.xz + qemu_initrd_add_file virtio_pci /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/net_failover.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/virtio_net.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/net/core/failover.ko.xz /usr/lib/modules/6.12.41+deb13-amd64/modules.alias + local i + local cp=cp --no-dereference --recursive --parents + cp --no-dereference --recursive --parents virtio_pci <https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-test-kernel-latest/1665/…> cp: cannot stat 'virtio_pci': No such file or directory Change-Id: Ied8acf18d0a1f47fac805619d15896918a365ff2 --- M _testenv/data/scripts/qemu/qemu_functions.sh M _testenv/data/scripts/qemu/qemu_init.sh 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index c1ef8b8..e8aad5d 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -38,6 +38,7 @@ --show-depends \ --set-version="$kernel" \ "$@" \ + | grep -v '^builtin ' \ | sort -u \ | cut -d ' ' -f 2)" diff --git a/_testenv/data/scripts/qemu/qemu_init.sh b/_testenv/data/scripts/qemu/qemu_init.sh index 1c100f8..4981e49 100755 --- a/_testenv/data/scripts/qemu/qemu_init.sh +++ b/_testenv/data/scripts/qemu/qemu_init.sh @@ -22,7 +22,7 @@ # Load modules from qemu_initrd_add_mod() if [ -e /modules ]; then - cat /modules | xargs -t -n1 modprobe + cat /modules | xargs -t -n1 modprobe || true fi ip link set lo up -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40955?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied8acf18d0a1f47fac805619d15896918a365ff2 Gerrit-Change-Number: 40955 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>

1 0

[M] Change in osmo-sgsn[master]: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h}
by lynxis lazus 27 Aug '25

27 Aug '25

Attention is currently required from: pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h} ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: Hey Pau, I think is a good idea. I would like to block the merge until I've fixed the TTCN3 patches before introducing more moving parts. Currently there are 4 broken Iu tests. I'll investigate this on tomorrow/thursday. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I09c19689fd7016b76ebeee821b551427965b7cf1 Gerrit-Change-Number: 40954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 23:20:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-sgsn[master]: sccp: Introduce helper func sgsn_scu_iups_tx_data_req()
by pespin 27 Aug '25

27 Aug '25

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40958?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: sccp: Introduce helper func sgsn_scu_iups_tx_data_req() ...................................................................... sccp: Introduce helper func sgsn_scu_iups_tx_data_req() This avoid code deduplication plus moving SCCP SAP logic into sccp.c. Change-Id: Id34f86b4f5e40ddceac4066ec18ebc60529cafab --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/sccp.h M src/sgsn/gprs_ranap.c M src/sgsn/sccp.c 4 files changed, 34 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/40958/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40958?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id34f86b4f5e40ddceac4066ec18ebc60529cafab Gerrit-Change-Number: 40958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-sgsn[master]: iu_rnc: Constify function params
by pespin 27 Aug '25

27 Aug '25

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40959?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: iu_rnc: Constify function params ...................................................................... iu_rnc: Constify function params Change-Id: I288bc21d24aa5abd3d9bd97e796ac9f8590290bd --- M include/osmocom/sgsn/iu_rnc.h M src/sgsn/iu_rnc.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/40959/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40959?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I288bc21d24aa5abd3d9bd97e796ac9f8590290bd Gerrit-Change-Number: 40959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-sgsn[master]: Split Iu RANAP RAB PS act/deact over different layers
by pespin 27 Aug '25

27 Aug '25

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40961?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: Split Iu RANAP RAB PS act/deact over different layers ...................................................................... Split Iu RANAP RAB PS act/deact over different layers Properly separate logic acting on objects vs logic building and generating RANAP msg on the wire. Change-Id: I98788468b7e50619cfd99b3aef2311bb601fb6be --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/mmctx.h M include/osmocom/sgsn/pdpctx.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_ranap.c M src/sgsn/mmctx.c M src/sgsn/pdpctx.c M src/sgsn/sgsn_libgtp.c 8 files changed, 78 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/40961/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I98788468b7e50619cfd99b3aef2311bb601fb6be Gerrit-Change-Number: 40961 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: Apply uniform prefix to remaining APIs in gprs_ranap.h
by pespin 27 Aug '25

27 Aug '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40963?usp=email ) Change subject: Apply uniform prefix to remaining APIs in gprs_ranap.h ...................................................................... Apply uniform prefix to remaining APIs in gprs_ranap.h Change-Id: I4f253f35013085bdebf80e94ab0d2f771e40dba6 --- M include/osmocom/sgsn/gprs_ranap.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_attach.c M src/sgsn/gprs_ranap.c M src/sgsn/iu_client.c 5 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/40963/1 diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index 92b453d..491ef6c 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -15,17 +15,17 @@ int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data); -int ranap_iu_tx(struct msgb *msg, uint8_t sapi); +int sgsn_ranap_iu_tx(struct msgb *msg, uint8_t sapi); int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei); -int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, +int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, int send_ck, int new_key); -int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi); -int ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr, +int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi); +int sgsn_ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr, const char *imsi, const uint32_t *tmsi, bool is_ps, uint32_t paging_cause); -int ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause); +int sgsn_ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause); /* Transmit a Iu Release Command and submit event RANAP_IU_EVENT_IU_RELEASE upon * Release Complete or timeout. Caller is responsible to free the context and * closing the SCCP connection (sgsn_ranap_iu_free_ue) upon recieval of the event. */ diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 2a10b92..439eca3 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -123,13 +123,13 @@ rate_ctr_inc(rate_ctr_group_get_ctr(mm->ctrg, GMM_CTR_PKTS_SIG_OUT)); #ifdef BUILD_IU if (mm->ran_type == MM_CTX_T_UTRAN_Iu) - return ranap_iu_tx(msg, GPRS_SAPI_GMM); + return sgsn_ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif } #ifdef BUILD_IU if (MSG_IU_UE_CTX(msg)) - return ranap_iu_tx(msg, GPRS_SAPI_GMM); + return sgsn_ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif /* caller needs to provide TLLI, BVCI and NSEI */ @@ -979,7 +979,7 @@ send_ck ? "sending" : "not sending", sgsn->cfg.uea_encryption_mask); /* FIXME: we should send the set of allowed UEA, as in ranap_new_msg_sec_mod_cmd2(). However, this * is not possible in the iu_client API. See OS#5487. */ - rc = ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key); + rc = sgsn_ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key); ctx->iu.new_key = 0; return rc; } @@ -1453,7 +1453,7 @@ #ifdef BUILD_IU if (mmctx->iu.ue_ctx) { - ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL); + sgsn_ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL); } #endif diff --git a/src/sgsn/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c index 839ad83..3dc581d 100644 --- a/src/sgsn/gprs_gmm_attach.c +++ b/src/sgsn/gprs_gmm_attach.c @@ -277,7 +277,7 @@ /* FIXME: we should send the set of allowed UEA, as in ranap_new_msg_sec_mod_cmd2(). However, this * is not possible in the iu_client API. See OS#5487. */ - ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key); + sgsn_ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, send_ck, ctx->iu.new_key); ctx->iu.new_key = 0; #endif } diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 91d06e2..950e234 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -214,7 +214,7 @@ */ /* Continue authentication here */ mm->iu.ue_ctx->integrity_active = 1; - ranap_iu_tx_common_id(mm->iu.ue_ctx, mm->imsi); + sgsn_ranap_iu_tx_common_id(mm->iu.ue_ctx, mm->imsi); /* FIXME: remove gmm_authorize */ if (mm->pending_req != GSM48_MT_GMM_ATTACH_REQ) @@ -271,7 +271,7 @@ return sgsn_sccp_user_iups_tx_data_req(ue_ctx->scu_iups, ue_ctx->conn_id, msg); } -int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, +int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, int send_ck, int new_key) { struct msgb *msg; @@ -282,7 +282,7 @@ return sgsn_sccp_user_iups_tx_data_req(uectx->scu_iups, uectx->conn_id, msg); } -int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi) +int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi) { struct msgb *msg; @@ -299,7 +299,7 @@ * * If TMSI is given, the IMSI is not sent over the air interface. Nevertheless, * the IMSI is still required for resolution in the HNB-GW and/or(?) RNC. */ -int ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr, +int sgsn_ranap_iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr, const char *imsi, const uint32_t *tmsi, bool is_ps, uint32_t paging_cause) { @@ -309,7 +309,7 @@ return osmo_sccp_tx_unitdata_msg(sgsn->sccp.scu_iups->scu, &sgsn->sccp.scu_iups->local_sccp_addr, called_addr, msg); } -int ranap_iu_tx(struct msgb *msg_nas, uint8_t sapi) +int sgsn_ranap_iu_tx(struct msgb *msg_nas, uint8_t sapi) { struct ranap_ue_conn_ctx *uectx = msg_nas->dst; struct msgb *msg; @@ -332,7 +332,7 @@ /* Send Iu Release for the given UE connection. * If cause is NULL, Normal Release cause is sent, otherwise * the provided cause. */ -int ranap_iu_tx_release(struct ranap_ue_conn_ctx *uectx, const struct RANAP_Cause *cause) +int sgsn_ranap_iu_tx_release(struct ranap_ue_conn_ctx *uectx, const struct RANAP_Cause *cause) { struct msgb *msg; static const struct RANAP_Cause default_cause = { @@ -353,7 +353,7 @@ { ctx->notification = false; ctx->free_on_release = true; - int ret = ranap_iu_tx_release(ctx, cause); + int ret = sgsn_ranap_iu_tx_release(ctx, cause); /* On Tx failure, trigger timeout immediately, as the response will never arrive */ if (ret) timeout = 0; @@ -511,7 +511,7 @@ static int ranap_handle_co_iu_rel_req(struct ranap_ue_conn_ctx *ue_ctx, const RANAP_Iu_ReleaseRequestIEs_t *ies) { LOGP(DRANAP, LOGL_INFO, "Received Iu Release Request, Sending Release Command\n"); - ranap_iu_tx_release(ue_ctx, &ies->cause); + sgsn_ranap_iu_tx_release(ue_ctx, &ies->cause); return 0; } diff --git a/src/sgsn/iu_client.c b/src/sgsn/iu_client.c index 950a264..d392152 100644 --- a/src/sgsn/iu_client.c +++ b/src/sgsn/iu_client.c @@ -146,7 +146,7 @@ iu_rnc_lac_rac_find_legacy(&rnc, NULL, lac, rac); if (rnc) { - if (ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) { + if (sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) { log_msg = "Paging"; log_level = LOGL_DEBUG; paged = 1; @@ -206,7 +206,7 @@ if (osmo_lai_cmp(&entry->rai.lac, lai)) continue; - rc = ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi, false, 0); + rc = sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi, false, 0); if (rc > 0) { LOGPIU(LOGL_ERROR, "IuCS: Failed to tx Paging RNC %s for LAC %s for IMSI %s / TMSI %08x", osmo_rnc_id_name(&rnc->rnc_id), @@ -252,7 +252,7 @@ if (osmo_rai_cmp(&entry->rai, rai)) continue; - rc = ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, ptmsi, true, 0); + rc = sgsn_ranap_iu_tx_paging_cmd(&rnc->sccp_addr, imsi, ptmsi, true, 0); if (rc > 0) { LOGPIU(LOGL_ERROR, "IuPS: Failed to tx Paging RNC %s for RAC %s for IMSI %s / P-TMSI %08x", osmo_rnc_id_name(&rnc->rnc_id), -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40963?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4f253f35013085bdebf80e94ab0d2f771e40dba6 Gerrit-Change-Number: 40963 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log