August 2026 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: sgsn: Fail in obvious way when unexpected ServiceAccept is received
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43261?usp=email ) Change subject: sgsn: Fail in obvious way when unexpected ServiceAccept is received ...................................................................... sgsn: Fail in obvious way when unexpected ServiceAccept is received since osmo-ttcn3-haks.git 2ff5b2633a43cecaed75b30b85537d6de3a52c97, the code doesn't expect to receive a ServiceAccept after SecurityCommand, ie. osmo-sgsn is wrong. As a result, tests such as TC_attach_pdp_act_user end up failing with a tGuard timeout waiting for a RAB ASs Req. The result is confusing since osmo-sgsn actually sends the RAB Ass Req, but since the unexpected ServiceAccept is first in the queue, the ttcn3 code doesn't process the RAB Ass Req. Make the test explicitly fail if something else from RAB Ass Req is in the queue preventing reading from it. Change-Id: Ifbb7da1d02c8bde3406a9dd445c03ed140b8c0a3 --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/43261/1 diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index eac01d5..696aa83 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -1053,6 +1053,7 @@ function f_pdp_ctx_act(inout PdpActPars apars, boolean send_recovery := false, integer ran_index := 0, float Tval := 5.0) runs on BSSGP_ConnHdlr { timer T := Tval; + var RANAP_PDU rx_ranap; f_pdp_tx_ctx_act(apars, ran_index); as_ggsn_gtp_ctx_act_req(apars, send_recovery := send_recovery); @@ -1065,6 +1066,14 @@ send_recovery := send_recovery, ran_index := ran_index); } + [] RAN_CONN.receive(RANAP_PDU:?) -> value rx_ranap { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx unexpected RANAP msg ", rx_ranap, " while waiting for RAB ASS REQ")); + } + [] RAN_CONN.receive { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx unexpected msg while waiting for RAB ASS REQ"); + } [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RANAP RAB AssReq"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43261?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: Ifbb7da1d02c8bde3406a9dd445c03ed140b8c0a3 Gerrit-Change-Number: 43261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: OBS: switch PyHSS source to upstream
by osmith 17 Aug '26

17 Aug '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43255?usp=email ) Change subject: OBS: switch PyHSS source to upstream ...................................................................... OBS: switch PyHSS source to upstream I have upstreamed all Osmocom specific changes to PyHSS proper and they are now in the 2.0.0 release: https://github.com/nickvsnetworking/pyhss/releases/tag/2.0.0 The pyhss_download_deps.sh has been reworked and now lives upstream too: https://github.com/nickvsnetworking/pyhss/blob/master/debian/pyhss_download… Change-Id: I1a536988dc4da162b978b7f34c668e3fb3085eaa --- D scripts/obs/data/pyhss_download_deps.sh M scripts/obs/lib/config.py M scripts/obs/lib/srcpkg.py 3 files changed, 2 insertions(+), 102 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/data/pyhss_download_deps.sh b/scripts/obs/data/pyhss_download_deps.sh deleted file mode 100644 index b8b2b64..0000000 --- a/scripts/obs/data/pyhss_download_deps.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -e -# Copyright 2025 sysmocom - s.f.m.c. GmbH -# SPDX-License-Identifier: GPL-3.0-or-later -# This script downloads all dependencies of PyHSS from the python package -# index, either as binary package for all python versions and CPU architectures -# we care about, or as source package depending on what is available. - -check_cwd() { - if ! [ -e services/hssService.py ]; then - echo "ERROR: run this script from the PyHSS directory" - exit 1 - fi - if [ -d debian/deps ]; then - echo "ERROR: debian/deps exists already!" - exit 1 - fi -} - -download_deps() { - local srcpkgs=_temp/requirements-source.txt - local binpkgs=_temp/requirements-binary.txt - local py_ver - local python_versions=" - 3.11 - 3.12 - 3.13 - 3.14 - " - # See e.g. https://pypi.org/project/SQLAlchemy/#files - local platform - local platforms=" - manylinux_2_17_aarch64 - manylinux_2_17_x86_64 - " - - rm -rf _temp - mkdir _temp - - while IFS= read -r line; do - case "$line" in - # These packages are only available as sources - mongo*|pymongo*|mysqlclient*|pysctp*|pycryptodome=*) - echo "$line" >>"$srcpkgs" - ;; - # The rest is available as binary packages. This is - # preferred as dependencies for building some of these - # are not always available in the target distributions - # (e.g. pydantic-core is written in rust and tooling - # for building python + rust is not in debian 12). - *) - echo "$line" >>"$binpkgs" - ;; - esac - done < "requirements.txt" - - # Build system dependencies must also be installed as we will build - # offline with --no-index and pip won't use system libraries: - # https://github.com/pypa/pip/issues/5696 - echo "setuptools" >>"$binpkgs" - echo "wheel" >>"$binpkgs" - echo "hatchling" >>"$binpkgs" - - echo ":: Downloading source packages" - pip download \ - --dest debian/deps \ - --no-binary=:all: \ - -r "$srcpkgs" - - for py_ver in $python_versions; do - for platform in $platforms; do - echo ":: Downloading binary packages (python $py_ver, platform $platform)" - local binpkgs_extra="" - - # Redis depends on async-timeout, which has been upstreamed - # into Python 3.11+. This means "pip download" may not download - # it if it runs with a more recent python version, but older - # distros (debian 12) will need it. - if [ "$py_ver" = "3.11" ]; then - binpkgs_extra="async-timeout" - fi - - pip download \ - --dest debian/deps \ - --python-version "$py_ver" \ - --platform "$platform" \ - --only-binary=:all: \ - -r "$binpkgs" \ - $binpkgs_extra - done - done - - rm -r _temp -} - -check_cwd -download_deps - -echo ":: Success" diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index b1384fd..5b37adb 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -112,13 +112,12 @@ "rtl-sdr": "https://gitea.osmocom.org/sdr/rtl-sdr", "strongswan-epdg": "https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg", "libosmo-sccp-legacy": "https://gitea.osmocom.org/osmocom/libosmo-sccp-legacy", - "pyhss": "https://gitea.osmocom.org/osmocom/pyhss", + "pyhss": "https://github.com/nickvsnetworking/pyhss", } git_branch_default = "master" git_branch_other = { "open5gs": "main", - "pyhss": "osmocom/master", } def tag_pattern(prefix: str = '', @@ -133,7 +132,6 @@ "gapk": tag_pattern('v', c=r'(\.\d+)?'), "open5gs": tag_pattern('v'), "osmo-fl2k": tag_pattern('v'), - "pyhss": tag_pattern(suffix='-osmocom\\d+'), "rtl-sdr": tag_pattern('v'), "strongswan-epdg": tag_pattern('osmo-epdg-', c=r'\.[0-9a-z]+'), "wireshark": tag_pattern('v', c=r'\.[0-9a-z]+'), diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 8ed50df..40c1883 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -149,7 +149,7 @@ def prepare_project_pyhss(): repo_path = lib.git.get_repo_path("pyhss") - script = os.path.join(lib.ci_obs_dir, "data/pyhss_download_deps.sh") + script = "debian/pyhss_download_deps.sh" lib.run_cmd(["sh", "-e", script], cwd=repo_path) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43255?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: I1a536988dc4da162b978b7f34c668e3fb3085eaa Gerrit-Change-Number: 43255 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: OBS: switch PyHSS source to upstream
by fixeria 17 Aug '26

17 Aug '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43255?usp=email ) Change subject: OBS: switch PyHSS source to upstream ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43255?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: I1a536988dc4da162b978b7f34c668e3fb3085eaa Gerrit-Change-Number: 43255 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Aug 2026 11:20:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: ts_102_221: support EF.ARR record decoding for DF, not just EF
by dexter 17 Aug '26

17 Aug '26

Attention is currently required from: Hoernchen, laforge. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/43254?usp=email ) Change subject: ts_102_221: support EF.ARR record decoding for DF, not just EF ...................................................................... Patch Set 1: Code-Review+1 (4 comments) Patchset: PS1: I have tried it out. It works fine. Except that I now also get a non working --decode-for-df flag on the regular read_record(s)_decoded commands. File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/43254/comment/ace3729f_b226bf3e?usp=em… : PS1, Line 755: arr_seq = self.__get_do_sequence(kwargs.get('encode_for_df', False)) I assume this is to maintain API consistency and possibly a future "update_arr_record" command. https://gerrit.osmocom.org/c/pysim/+/43254/comment/421c5714_6bea3f9f?usp=em… : PS1, Line 760: read_arr_argparser = copy.copy(LinFixedEF.ShellCommands.read_rec_dec_parser) When I try this out and do a "read_record_decoded --help", I also get the --decode-for-df parameter in the helpscreen. I think you have to use copy.deepcopy here. (This patch only adds the encode/decode variants to the read_arr_record(s) commands. Maye the feature would also be useful with the regular read_record_decoded commands as well?) https://gerrit.osmocom.org/c/pysim/+/43254/comment/ae06672f_57beaa6b?usp=em… : PS1, Line 761: read_arr_argparser.add_argument('--decode-for-df', action='store_true') Maybe adding a help text like: help='decode EF.ARR record for DF' ? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43254?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: I05e629e8b7dc705730d7039d2d0170ee24f8f844 Gerrit-Change-Number: 43254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 17 Aug 2026 11:07:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-sgsn[master]: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?usp=email ) Change subject: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr ...................................................................... ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr If an IPv6 address was passed by libgtp in pdp->lib->gsnru, sgsn_pdp_ctx_iu_rab_activate() would write 16 bytes to an uint32_t variable, overflowing it and writing further on the stack. Fix it by simply using the new osmo-iuh API ranap_new_msg_rab_assign_data2() which expects an osmo_sockaddr instead of a uint32_t (which then supports IPv6 too). Using the new APIs to convert the GSNA to an osmo_sockaddr and passing it to osmo-iuh new API then we make sure there's no buffer overflow anymore. Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Related: OS#7060 Reported-By: Adam Bedard <adam.bedard(a)gmail.com> Change-Id: I3beb8afcabad8d74b12a6aad845b455ed95761d4 --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/gtp.h M src/sgsn/gprs_ranap.c M src/sgsn/pdpctx.c 4 files changed, 29 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/60/43260/1 diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index b959b57..9185b39 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -3,6 +3,7 @@ #include "config.h" #include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> #ifdef BUILD_IU #include <osmocom/ranap/ranap_ies_defs.h> @@ -26,7 +27,9 @@ 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); + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei); 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 sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi); diff --git a/include/osmocom/sgsn/gtp.h b/include/osmocom/sgsn/gtp.h index 0f77a18..aba4f0a 100644 --- a/include/osmocom/sgsn/gtp.h +++ b/include/osmocom/sgsn/gtp.h @@ -3,9 +3,12 @@ #include <stddef.h> #include <stdint.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gprs/gprs_bssgp_rim.h> +#include <osmocom/gtp/pdp.h> + struct gprs_ra_id; struct sgsn_instance; struct sgsn_ggsn_ctx; @@ -27,3 +30,8 @@ struct msgb *msg, uint32_t npdu_len, uint8_t *npdu); int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx); int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx); + +static inline int gsna_to_osa(struct osmo_sockaddr *dst, const struct ul16_t *in) +{ + return osmo_sockaddr_from_octets(dst, &in->v[0], in->l); +} diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 1cdb72b..4445235 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -252,16 +252,19 @@ } 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) + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei) { struct msgb *msg; bool use_x213_nsap = (ue_ctx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); + char ip_str[INET6_ADDRSTRLEN]; LOGP(DRANAP, LOGL_DEBUG, - "Assigning RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x, use_x213_nsap=%d\n", - rab_id, gtp_ip, gtp_tei, use_x213_nsap); + "Assigning RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x, use_x213_nsap=%d\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr->u.sa, ip_str), gtp_tei, use_x213_nsap); - msg = ranap_new_msg_rab_assign_data(rab_id, gtp_ip, gtp_tei, use_x213_nsap); + msg = ranap_new_msg_rab_assign_data2(rab_id, gtp_addr, gtp_tei, use_x213_nsap); return sgsn_scu_iups_tx_data_req(ue_ctx->rnc->scu_iups, ue_ctx->conn_id, msg); } diff --git a/src/sgsn/pdpctx.c b/src/sgsn/pdpctx.c index 1fbddab..da825e6 100644 --- a/src/sgsn/pdpctx.c +++ b/src/sgsn/pdpctx.c @@ -173,19 +173,23 @@ { struct sgsn_mm_ctx *mm = pdp->mm; struct ranap_ue_conn_ctx *ue_ctx; - uint32_t ggsn_ip; + struct osmo_sockaddr gtp_addr; + char ip_str[INET6_ADDRSTRLEN]; OSMO_ASSERT(mm->ran_type == MM_CTX_T_UTRAN_Iu); ue_ctx = mm->iu.ue_ctx; /* Get the IP address for ggsn user plane */ - memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); - ggsn_ip = htonl(ggsn_ip); + if (gsna_to_osa(&gtp_addr, &pdp->lib->gsnru) < 0) { + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, teid_gn=%x: Invalid GTP1U address! len=%u\n", + rab_id, pdp->lib->teid_gn, pdp->lib->gsnru.l); + return -EINVAL; + } - LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x\n", - rab_id, ggsn_ip, pdp->lib->teid_gn); + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr.u.sa, ip_str), pdp->lib->teid_gn); - return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, ggsn_ip, pdp->lib->teid_gn); + return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, &gtp_addr, pdp->lib->teid_gn); } int sgsn_pdp_ctx_iu_rab_deactivate(struct sgsn_pdp_ctx *pdp, uint8_t rab_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?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: I3beb8afcabad8d74b12a6aad845b455ed95761d4 Gerrit-Change-Number: 43260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email ) Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... iu: Fix encoding of IPv6 RTP address in RAB Ass Req Use the newly added ranap_new_msg_rab_assign_voice2() API from osmo-iuh, which allows passing a struct osmo_sockaddr hence supporting IPv6. This way we get rid of the use of deprecated inet_addr() API. Also make sure to avoid crashing if the function fails (return NULL). Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f --- M TODO-RELEASE M src/libmsc/ran_msg_iu.c 2 files changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/43259/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c8858d8..9734dd0 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmovty >=1.12.1 working optional-multi-choice libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() +osmo-iuh >1.8.0 ranap_new_msg_rab_assign_voice2() diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 37cdf10..823c91b 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -348,7 +348,7 @@ { struct msgb *msg; bool use_x213_nsap; - uint32_t cn_rtp_ip; + struct osmo_sockaddr cn_rtp_addr = {}; static uint8_t next_rab_id = 1; uint8_t rab_id = next_rab_id; @@ -356,22 +356,29 @@ if (!next_rab_id) next_rab_id = 1; - cn_rtp_ip = osmo_htonl(inet_addr(ac->cn_rtp->ip)); - - if (cn_rtp_ip == INADDR_NONE) { - LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); - return NULL; - } + OSMO_ASSERT(ac->cn_rtp); if (ac->cn_rtp->port == 0) { LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP port\n"); return NULL; } + if (osmo_sockaddr_str_to_osa(ac->cn_rtp, &cn_rtp_addr) < 0) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); + return NULL; + } + use_x213_nsap = (ac->rab_assign_addr_enc == NSAP_ADDR_ENC_X213); LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "RAB Assignment: rab_id=%d, rtp=" OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); - msg = ranap_new_msg_rab_assign_voice(rab_id, cn_rtp_ip, ac->cn_rtp->port, use_x213_nsap); + msg = ranap_new_msg_rab_assign_voice2(rab_id, &cn_rtp_addr, use_x213_nsap); + if (!msg) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, + "Error during RAB Assignment: Encoding failed rab_id=%d, rtp=" + OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", + rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); + return NULL; + } msg->l2h = msg->data; return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-iuh[master]: ranap_msg_factory: Fix API documentation regarding ip param endianness
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email ) Change subject: ranap_msg_factory: Fix API documentation regarding ip param endianness ...................................................................... ranap_msg_factory: Fix API documentation regarding ip param endianness The param is clearly being expected as host-byte order because it converts it when storing it into the sockaddr, which contains a net-byte order. Both users of these APIs, ie. osmo-sgsn and osmo-msc, actually end up passing a host-byte order addr despite wrongly using htonl() instead of ntohl(), but taking advantage of the fact that both functions do the same: * osmo-sgsn: sgsn_pdp_ctx_iu_rab_activate() does "htonl(pdp->lib->gsnru.v)", where "v" is stored as network-byte order. * osmo-msc: ran_iu_make_rab_assignment() does "osmo_htonl(inet_addr(ac->cn_rtp->ip))", where clearly inet_addr returns anetwork-byte order. Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/57/43257/1 diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 1005594..aecd7df 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -791,7 +791,7 @@ /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). * See 3GPP TS 25.413 8.2. * RAB ID: 3GPP TS 25.413 9.2.1.2. - * \param rtp_ip MGW's RTP IPv4 address in *network* byte order. + * \param rtp_ip MGW's RTP IPv4 address in *host* byte order. */ struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port, @@ -865,7 +865,7 @@ } /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) - * \param gtp_ip SGSN's GTP IPv4 address in *network* byte order. */ + * \param gtp_ip SGSN's GTP IPv4 address in *host* byte order. */ struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei, bool use_x213_nsap) { -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0a909019875714d35c27aa38dd5520a82d46e8f2 Gerrit-Change-Number: 43257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-iuh[master]: iu_helpers: Constify osmo_sockaddr input param
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43256?usp=email ) Change subject: iu_helpers: Constify osmo_sockaddr input param ...................................................................... iu_helpers: Constify osmo_sockaddr input param Change-Id: I86040373c075bbd84c2a21abc61a880e307fd4f8 --- M include/osmocom/ranap/iu_helpers.h M src/iu_helpers.c 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/43256/1 diff --git a/include/osmocom/ranap/iu_helpers.h b/include/osmocom/ranap/iu_helpers.h index 3a06c4b..f6140a0 100644 --- a/include/osmocom/ranap/iu_helpers.h +++ b/include/osmocom/ranap/iu_helpers.h @@ -17,7 +17,7 @@ const RANAP_TransportLayerAddress_t *trasp_layer_addr); int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_nsap, const RANAP_TransportLayerAddress_t *trasp_layer_addr); -RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap); -RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, +RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(const struct osmo_sockaddr *addr, bool use_x213_nsap); +RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(const struct osmo_sockaddr *addr, uint32_t tei, bool use_x213_nsap); -int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap); +int ranap_new_transp_layer_addr(BIT_STRING_t *out, const struct osmo_sockaddr *addr, bool use_x213_nsap); diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 705af31..07b6085 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -194,12 +194,12 @@ return 0; } -int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap) +int ranap_new_transp_layer_addr(BIT_STRING_t *out, const struct osmo_sockaddr *addr, bool use_x213_nsap) { uint8_t *buf; unsigned int len; size_t ip_len; - uint8_t *ip_addr; + const uint8_t *ip_addr; uint16_t icp; switch (addr->u.sa.sa_family) { @@ -244,7 +244,7 @@ return 0; } -RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap) +RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(const struct osmo_sockaddr *addr, bool use_x213_nsap) { RANAP_TransportLayerInformation_t *tli; uint8_t binding_id[4] = { 0 }; @@ -275,7 +275,7 @@ return tli; } -RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, +RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(const struct osmo_sockaddr *addr, uint32_t tei, bool use_x213_nsap) { RANAP_TransportLayerInformation_t *tli = CALLOC(1, sizeof(*tli)); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I86040373c075bbd84c2a21abc61a880e307fd4f8 Gerrit-Change-Number: 43256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-iuh[master]: ranap: Introduce new APIs to encode rab_ass for gtp and rtp
by pespin 17 Aug '26

17 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email ) Change subject: ranap: Introduce new APIs to encode rab_ass for gtp and rtp ...................................................................... ranap: Introduce new APIs to encode rab_ass for gtp and rtp This allows passing IPv6 addresses, which are already supported in internal functions being called. While at it, also check that sockaddr encoding succeeds and otherwise return an error. Related: OS#7066 Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af --- M TODO-RELEASE M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c M tests/test-ranap.c 4 files changed, 81 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/43258/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..dad7e1f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +add ranap ranap_new_msg_rab_assign_voice2(), ranap_new_msg_rab_assign_data2() diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index b1175b0..2aa0bca 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -2,6 +2,9 @@ #include <stdint.h> #include <stdbool.h> + +#include <osmocom/core/socket.h> + #include <osmocom/ranap/RANAP_Cause.h> #include <osmocom/ranap/RANAP_CN-DomainIndicator.h> #include <osmocom/ranap/RANAP_GlobalRNC-ID.h> @@ -39,11 +42,19 @@ /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice) */ struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port, - bool use_x213_nsap); + bool use_x213_nsap) +OSMO_DEPRECATED("Use ranap_new_msg_rab_assign_voice2 instead"); +struct msgb *ranap_new_msg_rab_assign_voice2(uint8_t rab_id, const struct osmo_sockaddr *rtp_addr, + bool use_x213_nsap); + /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) */ struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, - uint32_t gtp_tei, bool use_x213_nsap); + uint32_t gtp_tei, bool use_x213_nsap) +OSMO_DEPRECATED("Use ranap_new_msg_rab_assign_data2 instead"); +struct msgb *ranap_new_msg_rab_assign_data2(uint8_t rab_id, const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei, + bool use_x213_nsap); /*! \brief generate RANAP RESET message */ struct msgb *ranap_new_msg_reset(RANAP_CN_DomainIndicator_t domain, diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index aecd7df..0e4b009 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -791,18 +791,15 @@ /*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). * See 3GPP TS 25.413 8.2. * RAB ID: 3GPP TS 25.413 9.2.1.2. - * \param rtp_ip MGW's RTP IPv4 address in *host* byte order. */ -struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, - uint16_t rtp_port, - bool use_x213_nsap) +struct msgb *ranap_new_msg_rab_assign_voice2(uint8_t rab_id, const struct osmo_sockaddr *rtp_addr, + bool use_x213_nsap) { RANAP_ProtocolIE_FieldPair_t *pair; RANAP_RAB_AssignmentRequestIEs_t ies; RANAP_RAB_AssignmentRequest_t out; struct msgb *msg; int rc; - struct osmo_sockaddr rtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -818,10 +815,11 @@ first.rAB_Parameters = new_rab_par_voice(6700, 12200); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_support_mode_for_predefined_SDU_sizes, 1); /* 2? */ - rtp_addr.u.sin.sin_family = AF_INET; - rtp_addr.u.sin.sin_port = htons(rtp_port); - rtp_addr.u.sin.sin_addr.s_addr = htonl(rtp_ip); - first.transportLayerInformation = ranap_new_transp_info_rtp(&rtp_addr, use_x213_nsap); + first.transportLayerInformation = ranap_new_transp_info_rtp(rtp_addr, use_x213_nsap); + if (!first.transportLayerInformation) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return NULL; + } /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; @@ -864,10 +862,30 @@ return msg; } -/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) - * \param gtp_ip SGSN's GTP IPv4 address in *host* byte order. */ -struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, - uint32_t gtp_tei, bool use_x213_nsap) +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice). + * See 3GPP TS 25.413 8.2. + * RAB ID: 3GPP TS 25.413 9.2.1.2. + * \param rtp_ip MGW's RTP IPv4 address in *host* byte order. + */ +struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, + uint16_t rtp_port, + bool use_x213_nsap) +{ + struct osmo_sockaddr rtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(rtp_port), + .sin_addr.s_addr = htonl(rtp_ip), + } + }; + return ranap_new_msg_rab_assign_voice2(rab_id, &rtp_addr, use_x213_nsap); +} + +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) */ +struct msgb *ranap_new_msg_rab_assign_data2(uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei, + bool use_x213_nsap) { RANAP_ProtocolIE_FieldPair_t *pair; RANAP_RAB_AssignmentRequestIEs_t ies; @@ -875,7 +893,6 @@ RANAP_DataVolumeReportingIndication_t *dat_vol_ind; struct msgb *msg; int rc; - struct osmo_sockaddr gtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -891,10 +908,11 @@ first.rAB_Parameters = new_rab_par_data(1600000, 800000); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_transparent_mode, 1); - - gtp_addr.u.sin.sin_family = AF_INET; - gtp_addr.u.sin.sin_addr.s_addr = htonl(gtp_ip); - first.transportLayerInformation = ranap_new_transp_info_gtp(&gtp_addr, gtp_tei, use_x213_nsap); + first.transportLayerInformation = ranap_new_transp_info_gtp(gtp_addr, gtp_tei, use_x213_nsap); + if (!first.transportLayerInformation) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return NULL; + } /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; @@ -946,6 +964,21 @@ return msg; } +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) + * \param gtp_ip SGSN's GTP IPv4 address in *host* byte order. */ +struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, + uint32_t gtp_tei, bool use_x213_nsap) +{ + struct osmo_sockaddr gtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(2152), + .sin_addr.s_addr = htonl(gtp_ip), + } + }; + return ranap_new_msg_rab_assign_data2(rab_id, &gtp_addr, gtp_tei, use_x213_nsap); +} + /*! \brief generate RANAP IU RELEASE REQUEST message */ struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause) { diff --git a/tests/test-ranap.c b/tests/test-ranap.c index e593bd9..7213c1e 100644 --- a/tests/test-ranap.c +++ b/tests/test-ranap.c @@ -83,9 +83,20 @@ struct msgb *msg; const char *imsi = "901700123456789"; uint32_t tmsi = 0x01234567; - uint32_t rtp_ip = 0x0a0b0c0d; - uint16_t rtp_port = 2342; - uint32_t gtp_ip = 0x1a1b1c1d; + struct osmo_sockaddr rtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(2342), + .sin_addr.s_addr = htonl(0x0a0b0c0d), + } + }; + struct osmo_sockaddr gtp_addr = { + .u.sin = { + .sin_family = AF_INET, + .sin_port = htons(2152), + .sin_addr.s_addr = htonl(0x1a1b1c1d), + } + }; uint32_t gtp_tei = 0x11223344; uint8_t ik[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; uint8_t ck[16] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }; @@ -125,13 +136,13 @@ msgb_free(msg); printf("\n==> RAB ASSIGNMENT COMMAND (VOICE)\n"); - msg = ranap_new_msg_rab_assign_voice(1, rtp_ip, rtp_port, 1); + msg = ranap_new_msg_rab_assign_voice2(1, &rtp_addr, 1); if (msg) printf("%s\n", msgb_hexdump(msg)); msgb_free(msg); printf("\n==> RAB ASSIGNMENT COMMAND (DATA)\n"); - msg = ranap_new_msg_rab_assign_data(2, gtp_ip, gtp_tei, 1); + msg = ranap_new_msg_rab_assign_data2(2, &gtp_addr, gtp_tei, 1); if (msg) printf("%s\n", msgb_hexdump(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3a8800afd03b94349c8acec778ab7003819e80af Gerrit-Change-Number: 43258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: OBS: switch PyHSS source to upstream
by laforge 17 Aug '26

17 Aug '26

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43255?usp=email ) Change subject: OBS: switch PyHSS source to upstream ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43255?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: I1a536988dc4da162b978b7f34c668e3fb3085eaa Gerrit-Change-Number: 43255 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Aug 2026 09:58:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026