September 2025 - gerrit-log - lists.osmocom.org

[XL] Change in libosmo-netif[master]: bring twrtp into libosmo-netif

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39281?usp=email ) Change subject: bring twrtp into libosmo-netif ...................................................................... Patch Set 7: (9 comments) File include/osmocom/netif/twrtp.h: https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/24aabbf7_88ec686… : PS1, Line 26: struct osmo_twrtp_stats { > Please see how I handle it in Patchset 7. Done File src/twrtp.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/e32d73c2_19c0a0e… : PS6, Line 231: endp->iofd_rtp = osmo_iofd_setup(endp, -1, NULL, > Please see how I handle it in Patchset 7. Done File src/twrtp.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/6e241ec1_b6a1b9c… : PS7, Line 304: close(rtcp_fd); if (rtcp_fd >= 0) close(rtcp_fd); https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/c2e0c004_3ba7c52… : PS7, Line 313: close(rtcp_fd); if (rtcp_fd >= 0) close(rtcp_fd); https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/15f382b7_7a580ec… : PS7, Line 322: close(rtcp_fd); if (rtcp_fd >= 0) close(rtcp_fd); https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/5c828ce9_226dadf… : PS7, Line 333: close(rtcp_fd); if (rtcp_fd >= 0) close(rtcp_fd); https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/a7083f49_6118359… : PS7, Line 343: close(rtcp_fd); if (rtcp_fd >= 0) close(rtcp_fd); https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/3f71ef68_97e0184… : PS7, Line 348: return 0; You could add return goto tags here for failing cases to make closing/freeing more organized and clean. File src/twrtp_base.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39281/comment/7201a664_e91a75d… : PS1, Line 132: * another variant of this API with that alternative behavior. > Please see how I handle it in Patchset 7. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib63215aaf13ef8ab8f2e0c8d310164cd5c8824eb Gerrit-Change-Number: 39281 Gerrit-PatchSet: 7 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 01 Sep 2025 08:45:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 weeks, 6 days

1
0
0 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif

by pespin

Attention is currently required from: falconia, fixeria, jolly, laforge. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 7: (1 comment) File include/osmocom/netif/twjit.h: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/ec1f3339_b1caaf2… : PS7, Line 173: int osmo_twjit_set_buffer_depth(struct osmo_twjit_config *conf, I'd like these to be prefixed osmo_twjit_config_set_*, like you did to the above one. Not mandatory, but maybe since a config ptr is passed to osmo_twjit_create you may want to move these osmo_twjit_config APIs above that one. Other than that I'm fine with it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 7 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Sep 2025 08:41:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 weeks, 6 days

1
0
0 0

[XS] Change in osmo-dev[master]: gen_makefile: --targets: fix subdir projects

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email ) Change subject: gen_makefile: --targets: fix subdir projects ...................................................................... gen_makefile: --targets: fix subdir projects Some projects are in subdirectories of git repositories, such as simtrace2_host, or osmocom-bb_layer23. When filtering the targets to be added to the Makefile, we must also add the main projects of such projects in subdirectories, so Makefile rules like the following work: .make.simtrace2_host.clone: .make.simtrace2.clone Fix for: make: *** No rule to make target '.make.simtrace2.clone', needed by '.make.simtrace2_host.clone'. Stop. Fixes: 1d13c9d7 ("gen_makefile: add --targets") Change-Id: I136f0d9cd982653b109005aeb35885b6f015eec8 --- M gen_makefile.py M tests/test_gen_makefile.py 2 files changed, 8 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/gen_makefile.py b/gen_makefile.py index 4730c59..3885e10 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -243,6 +243,12 @@ print() sys.exit(1) + # simtrace2_host -> simtrace2 + if "_" in project: + project_main = project.split("_")[0] + if project_main in projects_deps and project_main not in ret: + queue += [project_main] + deps = projects_deps[project] ret[project] = deps diff --git a/tests/test_gen_makefile.py b/tests/test_gen_makefile.py index 6232003..622f6e7 100644 --- a/tests/test_gen_makefile.py +++ b/tests/test_gen_makefile.py @@ -67,10 +67,11 @@ def test_gen_makefile_with_targets_arg(tmp_path): - run_cmd(["./gen_makefile.py", "-m", tmp_path, "--targets", "trxcon,osmo-mgw"], cwd=osmo_dev_path) + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--targets", "trxcon,osmo-mgw,simtrace2_host"], cwd=osmo_dev_path) run_cmd("grep -q '^osmocom-bb_trxcon_files :=' Makefile", cwd=tmp_path, shell=True) run_cmd("grep -q '^osmo-mgw_files :=' Makefile", cwd=tmp_path, shell=True) run_cmd("grep -q '^libosmocore_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("grep -q '^simtrace2_files :=' Makefile", cwd=tmp_path, shell=True) run_cmd("! grep -q '^osmo-bts_files :=' Makefile", cwd=tmp_path, shell=True) run_cmd("! grep -q '^osmo-s1gw_files :=' Makefile", cwd=tmp_path, shell=True) run_cmd("! grep -q '^open5gs_files :=' Makefile", cwd=tmp_path, shell=True) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I136f0d9cd982653b109005aeb35885b6f015eec8 Gerrit-Change-Number: 40978 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>

2 weeks, 6 days

1
0
0 0

[XS] Change in osmo-dev[master]: gen_makefile: --targets: fix subdir projects

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email ) Change subject: gen_makefile: --targets: fix subdir projects ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File gen_makefile.py: https://gerrit.osmocom.org/c/osmo-dev/+/40978/comment/b89d12e5_764eb93a?usp… : PS1, Line 247: if "_" in project: > No, because this doesn't change `project` and because it checks if the resulting splitted string is […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I136f0d9cd982653b109005aeb35885b6f015eec8 Gerrit-Change-Number: 40978 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, 01 Sep 2025 07:11:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 6 days

1
0
0 0

[XS] Change in osmo-dev[master]: gen_makefile: --targets: fix subdir projects

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email ) Change subject: gen_makefile: --targets: fix subdir projects ...................................................................... Patch Set 1: (1 comment) File gen_makefile.py: https://gerrit.osmocom.org/c/osmo-dev/+/40978/comment/f6241805_702e8016?usp… : PS1, Line 247: if "_" in project: > Wouldn't this turn `osmo_dia2gsup` into `osmo`? No, because this doesn't change `project` and because it checks if the resulting splitted string is a valid project from the `all.deps` file before attempting to placing it in the queue. With `osmo_dia2gsup` this happens: ``` project_main = "osmo" if "osmo" in project_deps: # -> False # this gets skipped # continue the same as without this change ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I136f0d9cd982653b109005aeb35885b6f015eec8 Gerrit-Change-Number: 40978 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Sep 2025 06:38:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-ci[master]: OBS: --version-append: never override version

by osmith

osmith has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified 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 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: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe Gerrit-Change-Number: 40965 Gerrit-PatchSet: 2 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-CC: keith <keith(a)rhizomatica.org>

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-ci[master]: OBS: --version-append: never override version

by fixeria

Attention is currently required from: keith, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email ) Change subject: OBS: --version-append: never override version ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/40965/comment/289bc60c_90b15c77?usp=… : PS1, Line 25: While IMHO it is a bad idea to just amend the commit of the last release > I think it would still be useful to merge this, it prevents an unexpected outcome and gives a warnin […] Ah, I see now. -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 01 Sep 2025 06:17:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: keith <keith(a)rhizomatica.org>

2 weeks, 6 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: use separate install dir for --asan

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?usp=email ) Change subject: testenv: use separate install dir for --asan ...................................................................... testenv: use separate install dir for --asan The --asan flag builds all Osmocom components with address sanitizer enabled. Use a separate install dir from the non-asan version to ensure we don't end up with using non-asan versions. (A separate make dir is already used.) Bump make_dir_version to avoid having markers for already installed binaries / libraries in the make dir, which are invalid now for asan-builds as we switched the install dir. Fixes: c3657172 ("testenv: add run --asan") Change-Id: Ic75452b75d4c3ee8045b68353830b5532e1ce90e --- M _testenv/testenv/cmd.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 2cc590a..d637129 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -12,7 +12,7 @@ install_dir = None make_dir = None # osmo-dev make dir version, bump when making incompatible changes -make_dir_version = 3 +make_dir_version = 4 def distro_cache_suffix(): @@ -33,6 +33,8 @@ install_dir = "/" else: install_dir = os.path.join(testenv.args.cache, "podman/install") + if testenv.args.asan: + install_dir += "-asan" install_dir += distro_cache_suffix() else: install_dir = os.path.join(testenv.args.cache, "host/install") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?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: Ic75452b75d4c3ee8045b68353830b5532e1ce90e Gerrit-Change-Number: 40979 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>

2 weeks, 6 days

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: enable upf latest

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40977?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: enable upf latest ...................................................................... jobs/ttcn3-testsuites-testenv: enable upf latest All tests are passing with upf latest now, so enable it. Change-Id: Ia148d627d5f02e165354665e0b1629cf5e3f330a --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 4140ddd..40309a0 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -300,7 +300,6 @@ testsuite: upf args: -b osmocom:latest timer: H 12 * * * - disabled: true - ttcn3-s1gw-test-latest: # ~2 min testsuite: s1gw -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40977?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia148d627d5f02e165354665e0b1629cf5e3f330a Gerrit-Change-Number: 40977 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>

2 weeks, 6 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025