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

[S] Change in osmo-msc[master]: sqlite optimisation: Avoid unneeded database operation
by fixeria 13 Oct '25

13 Oct '25

Attention is currently required from: keith, pespin. fixeria has posted comments on this change by keith. ( https://gerrit.osmocom.org/c/osmo-msc/+/28340?usp=email ) Change subject: sqlite optimisation: Avoid unneeded database operation ...................................................................... Patch Set 5: (2 comments) File src/libmsc/db.c: https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/80b7de71_ed68cf76?usp… : PS4, Line 302: id = $id LIMIT 1 > I consider it standard practice to add a LIMIT 1 to a query that is only intended to ever delete max […] Not sure if this really a standard practice, given that not all database bacnends support the `LIMIT` statement in `DELETE FROM` queries. I am not strictly against this as it does not hurt, but it looks redundant to me. The uniqueness of `id` (primary key) must be guaranteed by the database engine, so either you have exactly one record matching your query or none. https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/d55a8767_86c83c79?usp… : PS4, Line 303: DB_STMT_SMS_DEL_EXPIRED I believe this was already brought up here by other reviewers: we now have two identical queries in the array. One of them should be removed to avoid duplication (can be done in a separate patch). -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28340?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I777155c0f818b979c636bb59953719e472771603 Gerrit-Change-Number: 28340 Gerrit-PatchSet: 5 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:44:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: keith <keith(a)rhizomatica.org>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: add --install-package
by osmith 13 Oct '25

13 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?usp=email ) Change subject: testenv: add --install-package ...................................................................... testenv: add --install-package Add an option to quickly install packages in the container. This is useful when making a new SUT run with osmo-ttcn3-hacks and figuring out which packages need to be installed to make the build pass (without rebuilding the whole container for each missing dependency). It can also be used to quickly install additional debugging tools (strace, valgrind, etc.). A cache for the deb files is already getting mounted inside the container. Change-Id: Ie54817e6c0334a224a612521beb378537c10d39d --- M _testenv/testenv/__init__.py M _testenv/testenv/podman.py 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 44259c2..8a3b728 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -210,6 +210,14 @@ action="store_true", help="run an interactive shell before stopping daemons/container", ) + group.add_argument( + "-I", + "--install-package", + dest="install_packages", + action="append", + metavar="PACKAGE", + help="temporarily install a debian package in the container", + ) group = sub_run.add_argument_group("output options") group.add_argument( @@ -272,6 +280,9 @@ if args.kernel == "debian" and not args.podman: raise NoTraceException("--kernel-debian requires --podman") + if args.install_packages and not args.podman: + raise NoTraceException("--install-packages requires --podman") + if args.kernel == "custom" and not os.path.exists(custom_kernel_path): logging.critical( "See _testenv/README.md for more information on downloading a pre-built kernel or building your own kernel." diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 678a0c1..2013699 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -285,6 +285,9 @@ if not os.path.exists(pkgcache): exec_cmd(["apt-get", "-q", "update"]) + if testenv.args.install_packages: + exec_cmd(["apt-get", "install", "-y", "--no-install-recommends"] + testenv.args.install_packages) + def check_titan_version(): version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?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: Ie54817e6c0334a224a612521beb378537c10d39d Gerrit-Change-Number: 41215 Gerrit-PatchSet: 3 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>

1 0

[XS] Change in osmo-dev[master]: gen_makefile: erlang: fix missing clone and deps
by osmith 13 Oct '25

13 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email ) Change subject: gen_makefile: erlang: fix missing clone and deps ...................................................................... gen_makefile: erlang: fix missing clone and deps Add a dummy configure target for erlang that ensures the git clone and building of dependencies is done before attempting to build erlang projects. A dummy target is used to make the logic consistent with autotools and meson. This is in preparation for building python libraries for pyhss, which will work similarly. Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27 --- M gen_makefile.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/gen_makefile.py b/gen_makefile.py index 3885e10..e5f07ab 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -382,7 +382,10 @@ touch $@ ''' elif buildsystem == "erlang": - return "" + return f''' +.make.{proj}.configure: .make.{proj}.clone {deps_installed} + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -414,7 +417,7 @@ ''' elif buildsystem == "erlang": return f''' -.make.{proj}.build: $({proj}_files) +.make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" set -x && \\ export REBAR_BASE_DIR="$$PWD/{build_proj}" && \\ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?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: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27 Gerrit-Change-Number: 41212 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-dev[master]: gen_makefile: support building PyHSS
by osmith 13 Oct '25

13 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email ) Change subject: gen_makefile: support building PyHSS ...................................................................... gen_makefile: support building PyHSS Support cloning and building PyHSS and "interesting" dependencies (that we might want to patch while hacking on PyHSS). Other dependencies such as sqlalchemy get installed via pip into a venv that is currently shared by all python projects that osmo-dev can build. We can change this later on to use multiple venvs or change the dependencies that get built from source, if needed. Python projects get built with "python3 -m build" into a whl file, and then installed into the venv with "pip install". The above works with projects that have a pyproject.toml. PyHSS currently doesn't have this yet, but this patchset adds one: https://github.com/nickvsnetworking/pyhss/pull/258 python-venv-requirements.txt in this patch is a combination of the relevant dependencies from PyHSS and dependencies that get built from source. Related: OS#6862 Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae --- M all.buildsystems M all.deps M all.urls M gen_makefile.py A python-venv-requirements.txt 5 files changed, 76 insertions(+), 2 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/all.buildsystems b/all.buildsystems index 7b5a573..63eab23 100644 --- a/all.buildsystems +++ b/all.buildsystems @@ -4,3 +4,9 @@ osmo-s1gw erlang osmo-epdg erlang osmo_dia2gsup erlang + +comp128-python python +gsm0338 python +pyosmocom python +pysctp python +pyhss python diff --git a/all.deps b/all.deps index a49eb87..3439de7 100644 --- a/all.deps +++ b/all.deps @@ -60,3 +60,10 @@ strongswan-epdg libosmocore upf-benchmark libosmocore libosmo-pfcp + +# PyHSS + deps +comp128-python +gsm0338 +pyosmocom gsm0338 +pysctp +pyhss comp128-python pyosmocom pysctp diff --git a/all.urls b/all.urls index ef1b0ab..41b7bb5 100644 --- a/all.urls +++ b/all.urls @@ -5,3 +5,9 @@ open5gs https://github.com/open5gs/open5gs strongswan-epdg https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg osmo-gsm-shark https://gitea.osmocom.org/nhofmeyr/osmo-gsm-shark + +comp128-python https://github.com/Takuto88/comp128-python +gsm0338 https://github.com/dsch/gsm0338 +pyosmocom https://gerrit.osmocom.org/python/pyosmocom +pysctp https://github.com/P1sec/pysctp +pyhss https://github.com/nickvsnetworking/pyhss diff --git a/gen_makefile.py b/gen_makefile.py index e5f07ab..cfc681b 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -55,6 +55,7 @@ topdir = os.path.dirname(os.path.realpath(__file__)) all_deps_file = os.path.join(topdir, "all.deps") all_urls_file = os.path.join(topdir, "all.urls") +venv_req_file = os.path.join(topdir, "python-venv-requirements.txt") all_buildsystems_file = os.path.join(topdir, "all.buildsystems") parser = argparse.ArgumentParser(epilog=__doc__, formatter_class=argparse.RawTextHelpFormatter) @@ -218,6 +219,9 @@ ret += f"{short}: {' '.join(full)}\n" return ret +def gen_venv_activate(): + return f". {shlex.quote(args.install_prefix)}/venv/bin/activate" + def filter_projects_deps_targets(): if not args.targets: return projects_deps @@ -345,7 +349,7 @@ sync touch $@ ''' - elif buildsystem in ["meson", "erlang"]: + elif buildsystem in ["meson", "erlang", "python"]: return "" else: assert False, f"unknown buildsystem: {buildsystem}" @@ -381,7 +385,7 @@ sync touch $@ ''' - elif buildsystem == "erlang": + elif buildsystem in ["erlang", "python"]: return f''' .make.{proj}.configure: .make.{proj}.clone {deps_installed} touch $@ @@ -426,6 +430,19 @@ sync touch $@ ''' + elif buildsystem == "python": + return f''' +.make.{proj}.build: .make.{proj}.configure .make.{proj}.clone $({proj}_files) + @echo "\\n\\n\\n===== $@\\n" + rm -f {build_proj}/*.whl + python3 \ + -m build \ + --no-isolation \ + {src_proj} \ + --outdir {build_proj} + sync + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -474,6 +491,14 @@ sync touch $@ ''' + elif buildsystem == "python": + return f''' +.make.{proj}.install: .make.venv .make.{proj}.build + @echo "\\n\\n\\n===== $@\\n" + {gen_venv_activate()} && pip install {shlex.quote(build_proj)}/*.whl --force-reinstall + sync + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -556,6 +581,7 @@ \\( \\ -name "*.[hc]" \\ -or -name "*.py" \\ + -or -name "pyproject.toml" \\ -or -name "*.cpp" \\ -or -name "*.tpl" \\ -or -name "*.map" \\ @@ -651,6 +677,12 @@ $(MAKE) --dry-run -d all | grep "is newer than target" $(MAKE) all +# one shared venv for python projects +.make.venv: {venv_req_file} + python3 -m venv {args.install_prefix}/venv + {gen_venv_activate()} && pip install -r {venv_req_file} + touch $@ + # regenerate this Makefile, in case the deps or opts changed .PHONY: regen regen: diff --git a/python-venv-requirements.txt b/python-venv-requirements.txt new file mode 100644 index 0000000..2f5ab59 --- /dev/null +++ b/python-venv-requirements.txt @@ -0,0 +1,23 @@ +# These dependencies will be installed into one shared venv in the make dir +# when building python projects such as pyhss. Dependencies that are built from +# source are in all.deps. + +Flask==2.2.3 +Jinja2==3.1.2 +PyYAML +Requests==2.31.0 +SQLAlchemy==2.0.43 +SQLAlchemy_Utils==0.41.1 +Werkzeug==2.2.3 +aiohttp +alembic +comp128==1.0.0 +flask_restx==1.1.0 +prometheus_flask_exporter +pycryptodome==3.17 +pydantic==2.8.2 +pydantic_core==2.20.1 +pysnmp==4.4.12 +redis==5.0.0 +tzlocal==4.3 +xmltodict==0.14.2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41213?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: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae Gerrit-Change-Number: 41213 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: osmo_trau_frame_encode(): reduce space requirement in common case
by osmith 13 Oct '25

13 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41209?usp=email ) Change subject: osmo_trau_frame_encode(): reduce space requirement in common case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9f3541b0618ebef26e53b69041e5b74abefd3b85 Gerrit-Change-Number: 41209 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:32:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-abis[master]: osmo_trau_frame_encode(): fix encoding of 16k O&M frames
by osmith 13 Oct '25

13 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41208?usp=email ) Change subject: osmo_trau_frame_encode(): fix encoding of 16k O&M frames ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia366d5b0385b764c492bbed9a030ca27db71fcff Gerrit-Change-Number: 41208 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:29:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: gsm/protocol/gsm_48_103.h: new header file
by fixeria 13 Oct '25

13 Oct '25

Attention is currently required from: falconia. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmocore/+/41211?usp=email ) Change subject: gsm/protocol/gsm_48_103.h: new header file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41211?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id41d4dffd0eb562df4fc948b237d629e858e495b Gerrit-Change-Number: 41211 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:15:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: add --install-package
by fixeria 13 Oct '25

13 Oct '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?usp=email ) Change subject: testenv: add --install-package ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie54817e6c0334a224a612521beb378537c10d39d Gerrit-Change-Number: 41215 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:12:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-dev[master]: gen_makefile: support building PyHSS
by fixeria 13 Oct '25

13 Oct '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email ) Change subject: gen_makefile: support building PyHSS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41213?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: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae Gerrit-Change-Number: 41213 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:11:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: gen_makefile: erlang: fix missing clone and deps
by fixeria 13 Oct '25

13 Oct '25

Attention is currently required from: jolly, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email ) Change subject: gen_makefile: erlang: fix missing clone and deps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?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: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27 Gerrit-Change-Number: 41212 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 13 Oct 2025 07:08:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0