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

[S] Change in osmo-ttcn3-hacks[master]: hlr: don't test OsmoHLR-only features with PyHSS
by osmith 09 Oct '25

09 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41218?usp=email ) Change subject: hlr: don't test OsmoHLR-only features with PyHSS ...................................................................... hlr: don't test OsmoHLR-only features with PyHSS Proxy, mslookup and creating subscriber on demand are not implemented in PyHSS, so don't test these features when testing PyHSS. Related: OS#6862 Change-Id: I0c4905dd3f73abfe9f7cc77fc045368b9499aade --- M hlr/HLR_Tests.ttcn 1 file changed, 18 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/41218/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f86a6bc..806f45e 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -2115,11 +2115,9 @@ execute( TC_gsup_sai_num_auth_vectors() ); execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); - execute( TC_gsup_ul_unknown_imsi_via_proxy() ); execute( TC_gsup_ul_unknown_imsi_roaming_not_allowed() ); execute( TC_gsup_sai_err_unknown_imsi() ); execute( TC_gsup_ul() ); - execute( TC_gsup_ul_via_proxy() ); execute( TC_gsup_ul_subscriber_data() ); execute( TC_vty() ); execute( TC_vty_msisdn_isd() ); @@ -2130,9 +2128,7 @@ execute( TC_mo_ussd_unknown() ); execute( TC_mo_ussd_euse_disc() ); execute( TC_mo_ussd_iuse_imsi() ); - execute( TC_mo_ussd_iuse_imsi_via_proxy() ); execute( TC_mo_ussd_iuse_msisdn() ); - execute( TC_mo_ussd_iuse_msisdn_via_proxy() ); execute( TC_mo_ussd_euse() ); execute( TC_mo_ussd_euse_continue() ); execute( TC_mo_ussd_euse_defaultroute() ); @@ -2141,18 +2137,27 @@ execute( TC_mo_sss_reject() ); execute( TC_gsup_check_imei() ); - execute( TC_gsup_check_imei_via_proxy() ); execute( TC_gsup_check_imei_invalid_len() ); execute( TC_gsup_check_imei_unknown_imsi() ); - execute( TC_subscr_create_on_demand_check_imei_early() ); - execute( TC_subscr_create_on_demand_ul() ); - execute( TC_subscr_create_on_demand_sai() ); - execute( TC_MSLookup_mDNS_service_other_home() ); - execute( TC_MSLookup_GSUP_proxy() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); - execute( TC_MSLookup_mDNS_service_other_proxy() ); + /* Test features that are only implemented in OsmoHLR */ + if (m_hlr_impl == HLR_IMPL_OSMOCOM) { + execute( TC_gsup_ul_unknown_imsi_via_proxy() ); + execute( TC_gsup_ul_via_proxy() ); + execute( TC_mo_ussd_iuse_imsi_via_proxy() ); + execute( TC_mo_ussd_iuse_msisdn_via_proxy() ); + execute( TC_gsup_check_imei_via_proxy() ); + + execute( TC_subscr_create_on_demand_check_imei_early() ); + execute( TC_subscr_create_on_demand_ul() ); + execute( TC_subscr_create_on_demand_sai() ); + + execute( TC_MSLookup_mDNS_service_other_home() ); + execute( TC_MSLookup_GSUP_proxy() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); + execute( TC_MSLookup_mDNS_service_other_proxy() ); + } }; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c4905dd3f73abfe9f7cc77fc045368b9499aade Gerrit-Change-Number: 41218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: hlr: add MSC to ccm_pars.name
by osmith 09 Oct '25

09 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41219?usp=email ) Change subject: hlr: add MSC to ccm_pars.name ...................................................................... hlr: add MSC to ccm_pars.name Fix an immediate disconnect from pyHSS: [ERROR] 127.0.0.1:9999: Role not found in tags. 'sgsn' or 'msc' must appear in one of there tags: TYPE, UNIT, UNITNAME. Closing connection. Related: OS#6862 Change-Id: I1813e49ec286892c1a637deb99908903613696aa --- M hlr/HLR_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/41219/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 806f45e..3b1b03e 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -178,7 +178,7 @@ } ccm_pars := c_IPA_default_ccm_pars; - ccm_pars.name := "Osmocom TTCN-3 GSUP Simulator"; + ccm_pars.name := "Osmocom TTCN-3 GSUP Simulator (MSC)"; ccm_pars.ser_nr := "MSC-00-00-00-00-00-00"; vc_IPA := IPA_Emulation_CT.create(id & "-IPA"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1813e49ec286892c1a637deb99908903613696aa Gerrit-Change-Number: 41219 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

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

09 Oct '25

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-dev/+/41213?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: 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, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/13/41213/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: newpatchset Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae Gerrit-Change-Number: 41213 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de>

1 0

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

09 Oct '25

osmith 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: (1 comment) Patchset: PS1: Fix for the CI error (unrelated): https://gerrit.osmocom.org/c/docker-playground/+/41214 -- 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-Comment-Date: Thu, 09 Oct 2025 12:37:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in docker-playground[master]: debian-trixie-build: add libgcrypt20-dev
by osmith 09 Oct '25

09 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/41214?usp=email ) Change subject: debian-trixie-build: add libgcrypt20-dev ...................................................................... debian-trixie-build: add libgcrypt20-dev Add libgcrypt20-dev as it is needed by open5gs's dependency freeDiameter: ../../../../../build/src/open5gs/subprojects/freeDiameter/include/freeDiameter/meson.build:146:15: ERROR: C shared or static library 'gcrypt' not found Without this installed, gerrit-verifications for osmo-dev fails. Change-Id: Ifc0cc2e3900530cb75651125c0f769f8689748b2 --- M debian-trixie-build/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/14/41214/1 diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile index 7f82fe5..b046748 100644 --- a/debian-trixie-build/Dockerfile +++ b/debian-trixie-build/Dockerfile @@ -105,6 +105,7 @@ libelf-dev \ libffi-dev \ libfftw3-dev \ + libgcrypt20-dev \ libgmp-dev \ libgnutls28-dev \ libgps-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifc0cc2e3900530cb75651125c0f769f8689748b2 Gerrit-Change-Number: 41214 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

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

09 Oct '25

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/12/41212/1 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: newchange 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>

1 0

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

09 Oct '25

osmith has uploaded this change for review. ( 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, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/13/41213/1 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..507399e 100644 --- a/all.urls +++ b/all.urls @@ -5,3 +5,8 @@ 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 +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..aba74c7 --- /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.9 +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: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae Gerrit-Change-Number: 41213 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

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

08 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41211?usp=email ) Change subject: gsm/protocol/gsm_48_103.h: new header file ...................................................................... gsm/protocol/gsm_48_103.h: new header file 3GPP TS 48.103 prescribes a set of fixed RTP payload type numbers for use on GSM AoIP interface - however, until now there was no Osmocom header file that formally captures these spec definitions. Fix this omission. Change-Id: Id41d4dffd0eb562df4fc948b237d629e858e495b --- M include/osmocom/gsm/protocol/Makefile.am A include/osmocom/gsm/protocol/gsm_48_103.h 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/41211/1 diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am index 23429dc..ada2ce2 100644 --- a/include/osmocom/gsm/protocol/Makefile.am +++ b/include/osmocom/gsm/protocol/Makefile.am @@ -22,6 +22,7 @@ gsm_44_318.h \ gsm_48_049.h \ gsm_48_071.h \ + gsm_48_103.h \ gsm_49_031.h \ ipaccess.h \ smpp34_osmocom.h \ diff --git a/include/osmocom/gsm/protocol/gsm_48_103.h b/include/osmocom/gsm/protocol/gsm_48_103.h new file mode 100644 index 0000000..d40acac --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_48_103.h @@ -0,0 +1,21 @@ +/* + * This header file captures the set of fixed RTP payload type definitions + * specified in 3GPP TS 48.103 (GSM AoIP interface) Table 5.4.2.2.1. + */ + +#pragma once + +/* uncompressed speech */ +#define OSMO_AOIP_RTP_PT_PCMU 0 +#define OSMO_AOIP_RTP_PT_PCMA 8 + +/* compressed speech */ +#define OSMO_AOIP_RTP_PT_FR1 3 +#define OSMO_AOIP_RTP_PT_EFR 110 +#define OSMO_AOIP_RTP_PT_HR1 111 +#define OSMO_AOIP_RTP_PT_AMR 112 +#define OSMO_AOIP_RTP_PT_AMRWB 113 + +/* circuit-switched data */ +#define OSMO_AOIP_RTP_PT_CSD 120 /* without redundancy */ +#define OSMO_AOIP_RTP_PT_CSD_RED 121 /* with redundancy */ -- 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: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id41d4dffd0eb562df4fc948b237d629e858e495b Gerrit-Change-Number: 41211 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

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

08 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41208?usp=email ) Change subject: osmo_trau_frame_encode(): fix encoding of 16k O&M frames ...................................................................... osmo_trau_frame_encode(): fix encoding of 16k O&M frames The behavior of osmo_trau_frame_encode() for OSMO_TRAU16_FT_OAM has the same unfortunate (but now officially documented) design quirk as all other 16k frame types: bits C1..C5 are set internally by the encoding function and not from caller-supplied fr->c_bits[]. However, there was also a bug: bits C6..C15, which are taken from fr->c_bits[] for all frame types, were copied from the wrong part of this fr->c_bits[] array. Fix the latter bug. Change-Id: Ia366d5b0385b764c492bbed9a030ca27db71fcff --- M src/trau/trau_frame.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/08/41208/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 652c703..ad7a102 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -397,7 +397,7 @@ /* C1 .. C5 */ memcpy(trau_bits + 17, cbits5, 5); /* C6 .. C15 */ - memcpy(trau_bits + 17 + 5, fr->c_bits, 15 - 5); + memcpy(trau_bits + 17 + 5, fr->c_bits + 5, 15 - 5); /* D1 .. D255 */ for (i = 32, d_idx = 0; i < 304; i += 16, d_idx += 15) { -- 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: newchange 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>

1 0

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

08 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41209?usp=email ) Change subject: osmo_trau_frame_encode(): reduce space requirement in common case ...................................................................... osmo_trau_frame_encode(): reduce space requirement in common case Since its introduction in 2020, osmo_trau_frame_encode() API has had the ability to emit TRAU-DL frames that are either lengthened or shortened for timing adjustment, like real TRAUs do. However, this capability was never exercised in OsmoMGW-E1, nor is it used in the new tw-e1abis-mgw: given the constraint of having to submit 160-byte blocks to the E1 stack every 20 ms, it is not really feasible for our current sw-only implementation to achieve the same 125 us timing optimizations that are possible and desirable in a hardware or FPGA implementation. Since all current users of osmo_trau_frame_encode() API call it with fr->dl_ta_usec set to 0, the doubled output space requirement imposed by the function becomes an unnecessary burden and an API design bug in need of fixing. Solution: check fr->dir and fr->dl_ta_usec to see if frame output lengthening is actually possible for each given invocation of this function, and require doubled output space only in those cases. Change-Id: I9f3541b0618ebef26e53b69041e5b74abefd3b85 --- M src/trau/trau_frame.c 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/09/41209/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index ad7a102..d0cf3d1 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -1268,6 +1268,8 @@ */ int osmo_trau_frame_encode(ubit_t *bits, size_t n_bits, const struct osmo_trau_frame *fr) { + size_t space_req; + /* check for sufficient space provided by caller in output buffer */ switch (fr->type) { case OSMO_TRAU16_FT_FR: @@ -1276,35 +1278,37 @@ case OSMO_TRAU16_FT_AMR: case OSMO_TRAU16_FT_IDLE: /* timing alignment may happen: increased space requirement */ - if (n_bits < 2 * 40 * 8 - 1) - return -ENOSPC; + if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) + space_req = 2 * 40 * 8 - 1; + else + space_req = 1 * 40 * 8; break; case OSMO_TRAU16_FT_OAM: case OSMO_TRAU16_FT_DATA_HR: case OSMO_TRAU16_FT_DATA: case OSMO_TRAU16_FT_D145_SYNC: case OSMO_TRAU16_FT_EDATA: - if (n_bits < 1 * 40 * 8) - return -ENOSPC; + space_req = 1 * 40 * 8; break; case OSMO_TRAU8_SPEECH: case OSMO_TRAU8_AMR_LOW: case OSMO_TRAU8_AMR_6k7: case OSMO_TRAU8_AMR_7k4: /* timing alignment may happen: increased space requirement */ - if (n_bits < 2 * 20 * 8 - 1) - return -ENOSPC; + if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) + space_req = 2 * 20 * 8 - 1; + else + space_req = 1 * 20 * 8; break; case OSMO_TRAU8_DATA: case OSMO_TRAU8_OAM: - if (n_bits < 1 * 20 * 8) - return -ENOSPC; - break; - case OSMO_TRAU_FT_NONE: + space_req = 1 * 20 * 8; break; default: return -EINVAL; } + if (n_bits < space_req) + return -ENOSPC; switch (fr->type) { case OSMO_TRAU16_FT_FR: @@ -1338,7 +1342,6 @@ return encode8_amr_67(bits, fr); case OSMO_TRAU8_AMR_7k4: return encode8_amr_74(bits, fr); - case OSMO_TRAU_FT_NONE: default: return -EINVAL; } -- 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: newchange 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>

1 0