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

[S] Change in osmo-ci[master]: jobs/ttcn3: adjust to testenv config rename
by pespin 17 Nov '25

17 Nov '25

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41443?usp=email ) Change subject: jobs/ttcn3: adjust to testenv config rename ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41443?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: I3766d76a5a6fa8a8de00137fe33e0e747337c66e Gerrit-Change-Number: 41443 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 11:46:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[NoOp] Change in osmo-ttcn3-hacks[master]: Rename testenv_osmo_{hlr|ggsn} to testenv_osmo
by pespin 17 Nov '25

17 Nov '25

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442?usp=email ) Change subject: Rename testenv_osmo_{hlr|ggsn} to testenv_osmo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442?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: I7a64c946ece8ad5bfbf4f7d613634138af6db566 Gerrit-Change-Number: 41442 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 11:46:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: allow -c osmo-hlr -> testenv_osmo_hlr.cfg
by osmith 17 Nov '25

17 Nov '25

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41439?usp=email ) Change subject: testenv: allow -c osmo-hlr -> testenv_osmo_hlr.cfg ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442 and https://gerrit.osmocom.org/c/osmo-ci/+/41443 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9e7083799d236ec30a378a08552be3d1a5a4aba Gerrit-Change-Number: 41439 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: allow -c osmo-hlr -> testenv_osmo_hlr.cfg
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41439?usp=email ) Change subject: testenv: allow -c osmo-hlr -> testenv_osmo_hlr.cfg ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > What about simply using "osmo" or "osmocom" ? good idea! https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442 and https://gerrit.osmocom.org/c/osmo-ci/+/41443 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41439?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: Ib9e7083799d236ec30a378a08552be3d1a5a4aba Gerrit-Change-Number: 41439 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 11:32:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: jobs/ttcn3: adjust to testenv config rename
by osmith 17 Nov '25

17 Nov '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41443?usp=email ) Change subject: jobs/ttcn3: adjust to testenv config rename ...................................................................... jobs/ttcn3: adjust to testenv config rename Replace "-c osmo_{hlr,ggsn}…" with "-c osmo". Depends: osmo-ttcn3-hacks I7a64c946ece8ad5bfbf4f7d613634138af6db566 Change-Id: I3766d76a5a6fa8a8de00137fe33e0e747337c66e --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/41443/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 70f457f..144377e 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -58,7 +58,7 @@ - ttcn3-hlr-test: # ~3 min testsuite: hlr - args: -b osmocom:nightly -c osmo_hlr + args: -b osmocom:nightly -c osmo timer: H 08 * * * - ttcn3-hlr-test-pyhss: # ~3 min @@ -152,23 +152,23 @@ - ttcn3-ggsn-test: # ~15 min testsuite: ggsn - args: -b osmocom:nightly -c osmo_ggsn_* + args: -b osmocom:nightly -c osmo_* timer: H 10 * * * - ttcn3-ggsn-test-kernel: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c osmo_ggsn_v*_only --debian-kernel + args: -b osmocom:nightly -c osmo_v*_only --debian-kernel timer: H 10 * * * - ttcn3-ggsn-test-kernel-net-next: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c osmo_ggsn_v*_only --custom-kernel + args: -b osmocom:nightly -c osmo_v*_only --custom-kernel kernel: net-next timer: H 10 * * * - ttcn3-ggsn-test-kernel-torvalds: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c osmo_ggsn_v*_only --custom-kernel + args: -b osmocom:nightly -c osmo_v*_only --custom-kernel kernel: torvalds timer: H 10 * * * @@ -253,7 +253,7 @@ - ttcn3-hlr-test-latest: # ~3 min testsuite: hlr - args: -b osmocom:latest -c osmo_hlr + args: -b osmocom:latest -c osmo timer: H 12 * * * - ttcn3-hlr-test-pyhss-latest: # ~3 min @@ -323,23 +323,23 @@ - ttcn3-ggsn-test-latest: # ~15 min testsuite: ggsn - args: -b osmocom:latest -c osmo_ggsn_* + args: -b osmocom:latest -c osmo_* timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c osmo_ggsn_v*_only --debian-kernel + args: -b osmocom:latest -c osmo_v*_only --debian-kernel timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest-net-next: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c osmo_ggsn_v*_only --custom-kernel + args: -b osmocom:latest -c osmo_v*_only --custom-kernel kernel: net-next timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest-torvalds: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c osmo_ggsn_v*_only --custom-kernel + args: -b osmocom:latest -c osmo_v*_only --custom-kernel kernel: torvalds timer: H 12 * * * @@ -493,7 +493,7 @@ - ttcn3-hlr-test-asan: # ~3 min testsuite: hlr - args: -b osmocom:nightly:asan -c osmo_hlr + args: -b osmocom:nightly:asan -c osmo timer: H 16 * * * - ttcn3-sip-test-asan: # ~2 min @@ -523,7 +523,7 @@ - ttcn3-ggsn-test-asan: # ~15 min testsuite: ggsn - args: -b osmocom:nightly:asan -c osmo_ggsn_* + args: -b osmocom:nightly:asan -c osmo_* timer: H 16 * * * - ttcn3-stp-test-asan: # ~10 min -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3766d76a5a6fa8a8de00137fe33e0e747337c66e Gerrit-Change-Number: 41443 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[NoOp] Change in osmo-ttcn3-hacks[master]: Rename testenv_osmo_{hlr|ggsn} to testenv_osmo
by osmith 17 Nov '25

17 Nov '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442?usp=email ) Change subject: Rename testenv_osmo_{hlr|ggsn} to testenv_osmo ...................................................................... Rename testenv_osmo_{hlr|ggsn} to testenv_osmo The "osmo_hlr" part of testenv_osmo_hlr.cfg looks weird (as it is usually written as osmo-hlr or OsmoHLR), especially when used as "-c osmo_hlr" to select the config. Use the shorter "osmo" instead. Suggested-by: Pau Espin Pedrol <pespin(a)sysmocom.de> Change-Id: I7a64c946ece8ad5bfbf4f7d613634138af6db566 --- R ggsn_tests/testenv_osmo_all.cfg R ggsn_tests/testenv_osmo_v4_only.cfg R ggsn_tests/testenv_osmo_v4v6_only.cfg R ggsn_tests/testenv_osmo_v6_only.cfg R hlr/testenv_osmo.cfg 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/41442/1 diff --git a/ggsn_tests/testenv_osmo_ggsn_all.cfg b/ggsn_tests/testenv_osmo_all.cfg similarity index 100% rename from ggsn_tests/testenv_osmo_ggsn_all.cfg rename to ggsn_tests/testenv_osmo_all.cfg diff --git a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg b/ggsn_tests/testenv_osmo_v4_only.cfg similarity index 100% rename from ggsn_tests/testenv_osmo_ggsn_v4_only.cfg rename to ggsn_tests/testenv_osmo_v4_only.cfg diff --git a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg b/ggsn_tests/testenv_osmo_v4v6_only.cfg similarity index 100% rename from ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg rename to ggsn_tests/testenv_osmo_v4v6_only.cfg diff --git a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg b/ggsn_tests/testenv_osmo_v6_only.cfg similarity index 100% rename from ggsn_tests/testenv_osmo_ggsn_v6_only.cfg rename to ggsn_tests/testenv_osmo_v6_only.cfg diff --git a/hlr/testenv_osmo_hlr.cfg b/hlr/testenv_osmo.cfg similarity index 100% rename from hlr/testenv_osmo_hlr.cfg rename to hlr/testenv_osmo.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41442?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: I7a64c946ece8ad5bfbf4f7d613634138af6db566 Gerrit-Change-Number: 41442 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: Move iuh fields in iuh substruct
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email ) Change subject: Move iuh fields in iuh substruct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If6954929def24d48661bc132070440513b01289e Gerrit-Change-Number: 41441 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 11:20:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-hnbgw[master]: iuh: Allow setting tx-queue-max-length for all HNBs
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email ) Change subject: iuh: Allow setting tx-queue-max-length for all HNBs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8bc9e8bae7a4815dc2f2bc9e15401e01948d1748 Gerrit-Change-Number: 41436 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 11:19:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: mtp: Introduce osmo_ss7_user_find_by_si() public API
by pespin 17 Nov '25

17 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41429?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mtp: Introduce osmo_ss7_user_find_by_si() public API ...................................................................... mtp: Introduce osmo_ss7_user_find_by_si() public API This is needed by mtp_sap/ss7_user API users to figure out whether there's a user set up already for a given Service Indicator. Change-Id: I7db659dc443148f3aab70d2c6229c2271346cf38 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/ss7_hmrt.c M src/ss7_user.c M src/ss7_user.h M src/xua_snm.c 6 files changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 28aed5b..8a42b9c 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -12,3 +12,4 @@ libosmo-sigtran add osmo_ss7_instance_get_network_indicator() libosmo-sigtran add osmo_ss7_user_mtp_sap_prim_down() libosmo-sigtran add osmo_mtp_prim_xfer_req_prepend() +libosmo-sigtran add osmo_ss7_user_find_by_si() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index b560caf..9ea929f 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -95,6 +95,7 @@ int osmo_ss7_user_register(struct osmo_ss7_user *user, uint8_t service_ind); int osmo_ss7_user_unregister(struct osmo_ss7_user *user, uint8_t service_ind); +struct osmo_ss7_user *osmo_ss7_user_find_by_si(const struct osmo_ss7_instance *inst, uint8_t service_indicator); /* MTP User wants to submit a primitive down to MTP SAP */ int osmo_ss7_user_mtp_sap_prim_down(struct osmo_ss7_user *user, diff --git a/src/ss7_hmrt.c b/src/ss7_hmrt.c index 81a56a8..72b26d8 100644 --- a/src/ss7_hmrt.c +++ b/src/ss7_hmrt.c @@ -123,7 +123,7 @@ } /* "User Part Available?" */ - osu = ss7_user_find(inst, service_ind); + osu = osmo_ss7_user_find_by_si(inst, service_ind); if (!osu) { /* "Discard Message" */ LOGSS7(inst, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind); diff --git a/src/ss7_user.c b/src/ss7_user.c index 0ec42ff..7137b7a 100644 --- a/src/ss7_user.c +++ b/src/ss7_user.c @@ -54,7 +54,7 @@ talloc_free(user); } -struct osmo_ss7_user *ss7_user_find(struct osmo_ss7_instance *inst, uint8_t service_indicator) +struct osmo_ss7_user *osmo_ss7_user_find_by_si(const struct osmo_ss7_instance *inst, uint8_t service_indicator) { if (service_indicator >= ARRAY_SIZE(inst->user)) return NULL; diff --git a/src/ss7_user.h b/src/ss7_user.h index bec6c22..25259e8 100644 --- a/src/ss7_user.h +++ b/src/ss7_user.h @@ -23,7 +23,6 @@ void *priv; }; -struct osmo_ss7_user *ss7_user_find(struct osmo_ss7_instance *inst, uint8_t service_indicator); void ss7_user_unregister_all(struct osmo_ss7_user *user); int ss7_user_mtp_sap_prim_up(const struct osmo_ss7_user *osu, struct osmo_mtp_prim *omp); diff --git a/src/xua_snm.c b/src/xua_snm.c index 4890f79..efa7e91 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -309,7 +309,7 @@ unsigned int num_rctx; /* Translate to MTP-STATUS.ind towards MTP-User (SCCP will create N-PCSTATE.ind to SCU) */ - osu = ss7_user_find(s7i, user); + osu = osmo_ss7_user_find_by_si(s7i, user); if (osu) { struct osmo_mtp_prim *omp = mtp_prim_status_ind_alloc(dpc, cause, false, 0); ss7_user_mtp_sap_prim_up(osu, omp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41429?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I7db659dc443148f3aab70d2c6229c2271346cf38 Gerrit-Change-Number: 41429 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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

[S] Change in libosmo-sigtran[master]: ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb()
by pespin 17 Nov '25

17 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41432?usp=email ) Change subject: ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb() ...................................................................... ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb() We migrated to using osmo_io+osmo_stream with osmo_ipa_segmentation_cb(), which takes care of pulling the multiple IPA headers and stores them in osmo_ipa_msgb_cb_proto(_ext)(). When doing the change, we forgot to update the rx path in ipa.c to account for those changes. Do it now to simplify the code and clarify that l1h was actually pulled from ->data. Change-Id: I4e26bf471de9a258dc2f862488253f31aa95a013 --- M src/ipa.c 1 file changed, 7 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ipa.c b/src/ipa.c index c748f22..4c197ff 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -246,9 +246,6 @@ OSMO_ASSERT(sls <= 0xf); rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_SLS_0 + sls); - /* pull the IPA header */ - msgb_pull_to_l2(msg); - /* We have received an IPA-encapsulated SCCP message, without * any MTP routing label. Furthermore, the SCCP Called/Calling * Party are SSN-only, with no GT or PC. This means we have no @@ -311,10 +308,10 @@ LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n"); return -1; } - xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg_patched), msgb_l2len(msg_patched)); + xua = m3ua_xfer_from_data(&data_hdr, msgb_data(msg_patched), msgb_length(msg_patched)); msgb_free(msg_patched); } else { - xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); + xua = m3ua_xfer_from_data(&data_hdr, msgb_data(msg), msgb_length(msg)); } /* Update xua->mtp with values from data_hdr */ @@ -333,16 +330,15 @@ * \returns 0 on success; negative on error */ int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) { - struct ipaccess_head *hh; int rc; OSMO_ASSERT(asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA); - /* osmo_ipa_process_msg() will already have verified length - * consistency and set up l2h pointer */ - hh = (struct ipaccess_head *) msg->l1h; + /* Here IPA headers have already been validated and were stored in + * osmo_ipa_msgb_cb_proto(_ext)(), and msgb_data() and msgb_l2() both + * point to IPA payload. */ - switch (hh->proto) { + switch (osmo_ipa_msgb_cb_proto(msg)) { case IPAC_PROTO_IPACCESS: rc = ipa_rx_msg_ccm(asp, msg); break; @@ -350,7 +346,7 @@ rc = ipa_rx_msg_sccp(asp, msg, sls); break; default: - rc = ss7_asp_rx_unknown(asp, hh->proto, msg); + rc = ss7_asp_rx_unknown(asp, osmo_ipa_msgb_cb_proto(msg), msg); } return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41432?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4e26bf471de9a258dc2f862488253f31aa95a013 Gerrit-Change-Number: 41432 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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

2025

2024

2023

2022

gerrit-log November 2025