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

[S] Change in osmo-gsm-manuals[master]: sigtran: Document xUA Server Administrative State
by osmith 07 Oct '26

07 Oct '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43759?usp=email ) Change subject: sigtran: Document xUA Server Administrative State ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I771f05d2ef001f78cbd4d6fcd585535a841366ea Gerrit-Change-Number: 43759 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 11:37:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-gsm-manuals[master]: sigtran.adoc: Document IPSP support
by osmith 07 Oct '26

07 Oct '26

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43758?usp=email ) Change subject: sigtran.adoc: Document IPSP support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5489b0ea485943b96038da49c81e812a6da22492 Gerrit-Change-Number: 43758 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 11:36:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason
by pespin 07 Oct '26

07 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/43802?usp=email ) Change subject: sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason ...................................................................... sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason Until recently, libosmo-sigtran was incorrectly expecting low-level wire-format cause in N-DISCONNECT.req. Nowadays it supports specific reason values in the SCCP-User SAP, so use those instead. Change-Id: I05de368c1b0a6b89165f2fe6b44211f06b4d5437 Related: OS#2601 --- M TODO-RELEASE M include/osmocom/msc/sccp_ran.h M src/libmsc/ran_conn.c M src/libmsc/ran_peer.c M src/libmsc/sccp_ran.c 5 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/43802/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..b6d61b1 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 +libosmo-sigtran >2.3.0 OSMO_SCCP_REL_REASON_NSU_* diff --git a/include/osmocom/msc/sccp_ran.h b/include/osmocom/msc/sccp_ran.h index a4bd4ca..9e576d2 100644 --- a/include/osmocom/msc/sccp_ran.h +++ b/include/osmocom/msc/sccp_ran.h @@ -280,4 +280,4 @@ int sccp_ran_down_l2_co(struct sccp_ran_inst *sri, uint32_t conn_id, struct msgb *l2); int sccp_ran_down_l2_cl(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *called_addr, struct msgb *l2); -int sccp_ran_disconnect(struct sccp_ran_inst *ran, uint32_t conn_id, uint32_t cause); +int sccp_ran_disconnect(struct sccp_ran_inst *ran, uint32_t conn_id, enum osmo_sccp_release_reason_nsu reason); diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index a86b27e..b5696d8 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -148,7 +148,9 @@ if (conn->ran_peer) { /* Todo: pass a useful SCCP cause? */ - sccp_ran_disconnect(conn->ran_peer->sri, conn->sccp_conn_id, 0); + sccp_ran_disconnect(conn->ran_peer->sri, + conn->sccp_conn_id, + OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL); conn->ran_peer = NULL; } diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 1e9b4b6..0423a83 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -269,7 +269,7 @@ || sccp_ran_down_l2_co(rp->sri, conn_id, clear)) LOG_RAN_PEER(rp, LOGL_ERROR, "Cannot sent Clear command\n"); - sccp_ran_disconnect(rp->sri, conn_id, 0); + sccp_ran_disconnect(rp->sri, conn_id, OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL); } static void ran_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -344,7 +344,8 @@ OSMO_ASSERT(ctx); LOG_RAN_PEER(rp, LOGL_ERROR, "Receiving CO message on RAN peer that has not done a proper RESET yet." " Disconnecting on incoming message, sending RESET to RAN peer.\n"); - sccp_ran_disconnect(rp->sri, ctx->conn_id, 0); + sccp_ran_disconnect(rp->sri, ctx->conn_id, + OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_FAILURE); /* No valid RESET procedure has happened here yet. */ ran_peer_reset(rp); return; diff --git a/src/libmsc/sccp_ran.c b/src/libmsc/sccp_ran.c index bc3d659..46fd196 100644 --- a/src/libmsc/sccp_ran.c +++ b/src/libmsc/sccp_ran.c @@ -220,7 +220,8 @@ rc = sri->ran->sccp_ran_ops.up_l2(sri, peer_addr, true, conn_id, oph->msg); if (rc) - osmo_sccp_tx_disconn(scu, conn_id, my_addr, SCCP_RETURN_CAUSE_UNQUALIFIED); + osmo_sccp_tx_disconn(scu, conn_id, my_addr, + OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_ORIGIN); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): @@ -349,7 +350,7 @@ return osmo_sccp_user_sap_down_nofree(sri->scu, &prim->oph); } -int sccp_ran_disconnect(struct sccp_ran_inst *sri, uint32_t conn_id, uint32_t cause) +int sccp_ran_disconnect(struct sccp_ran_inst *sri, uint32_t conn_id, enum osmo_sccp_release_reason_nsu reason) { - return osmo_sccp_tx_disconn(sri->scu, conn_id, NULL, cause); + return osmo_sccp_tx_disconn(sri->scu, conn_id, NULL, reason); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43802?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: I05de368c1b0a6b89165f2fe6b44211f06b4d5437 Gerrit-Change-Number: 43802 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: podman_install: update can't install msg
by osmith 07 Oct '26

07 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43783?usp=email ) Change subject: testenv: podman_install: update can't install msg ...................................................................... testenv: podman_install: update can't install msg Update the message to mention all three ways that we now have to install test components when running with --binary-packages and explain the differences. Example output: Running with --binary-packages (-b), but can't install trx-proxy! Fix this by either: Set the debian package name with package= in [trx-proxy] in testenv_generic.cfg: * The debian package will be installed. Set package=no in [trx-proxy] in testenv_generic.cfg: * osmo-dev will be used to build the test component from source. * Jenkins will always use current master. Edit from_source() in testenv/podman_install.py: * Dependency packages will be installed from the configured binary repository (e.g. -b osmocom:latest). * The git repository for the test component will be cloned and the version matching the binary repository will be built (-b osmocom:latest => latest tagged version, otherwise master). Change-Id: I0d722a48fb5ba125489db410b6f765360f2702a3 --- M _testenv/testenv/podman_install.py 1 file changed, 15 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 438f875..de06f0b 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -209,10 +209,21 @@ if program == "run_osmo_ns_dummy.sh": return from_source_osmo_ns_dummy() - logging.error(f"Can't install {section}! Fix this by either:") - logging.error(f"* Adding package= to [{section}] in {cfg_name}") - logging.error(" (if it can be installed from binary packages)") - logging.error("* Editing from_source() in testenv/podman_install.py") + logging.error(f"Running with --binary-packages (-b), but can't install {section}! Fix this by either:") + logging.error("") + logging.error(f"Set the debian package name with package= in [{section}] in {cfg_name}:") + logging.error("* The debian package will be installed.") + logging.error("") + logging.error(f"Set package=no in [{section}] in {cfg_name}:") + logging.error("* osmo-dev will be used to build the test component from source.") + logging.error("* Jenkins will always use current master.") + logging.error("") + logging.error("Edit from_source() in testenv/podman_install.py:") + logging.error("* Dependency packages will be installed from the configured") + logging.error(" binary repository (e.g. -b osmocom:latest).") + logging.error("* The git repository for the test component will be cloned and") + logging.error(" the version matching the binary repository will be built") + logging.error(" (-b osmocom:latest => latest tagged version, otherwise master).") sys.exit(1) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43783?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: I0d722a48fb5ba125489db410b6f765360f2702a3 Gerrit-Change-Number: 43783 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix running configs with omitted package=
by osmith 07 Oct '26

07 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43795?usp=email ) Change subject: testenv: fix running configs with omitted package= ...................................................................... testenv: fix running configs with omitted package= The ns and sccp testsuites have test components in their testenv.cfg without a package= line (osmo-ns-dummy and sccp_demo_user). These are built from source against the -dev packages of the currently used binary repository with testenv.podman_install.from_source(). Fix regressions from recent patches that broke this in two places: 1. testenv.daemons.start() always tried to access "packages" without checking if it exists in the section first. 2. testenv.osmo_dev.get_targets() was treating a missing packages= line the same as packages=no (which means building with osmo-dev instead of testenv.podman_install.from_source()). Add the logic to not add the make target to ret if there is no package= line. While at it, rewrite the long if conditions to make the function easier to understand. Fixes: cf009ae7 ("testenv: run osmo-dev logic for --binary-repo too") Fixes: 6cbec87b ("testenv: build package=no components with osmo-dev") Change-Id: Id5920aacba832a1f43d87d09a9e133d95384e635 --- M _testenv/testenv/daemons.py M _testenv/testenv/osmo_dev.py 2 files changed, 18 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/daemons.py b/_testenv/testenv/daemons.py index 0c402e9..e6085b6 100644 --- a/_testenv/testenv/daemons.py +++ b/_testenv/testenv/daemons.py @@ -60,7 +60,7 @@ env["LIBOSMO_IO_BACKEND"] = "IO_URING" envtype = "osmo_dev" - if testenv.args.binary_repo and section_data["package"] != "no": + if testenv.args.binary_repo and section_data.get("package") != "no": envtype = "binary_repo" if testenv.args.podman: diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index edbe1b2..d2f9229 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -58,10 +58,24 @@ # Gets built with testenv.testsuite.build() continue - if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in ret: - if testenv.args.binary_repo and section_data.get("package", "no") != "no": + if "make" not in section_data or section_data["make"] == "no": + # No osmo-dev make target listed in testenv.cfg + continue + + if section_data["make"] in ret: + # Already decided that this target will be built while parsing a + # previous section + continue + + if testenv.args.binary_repo: + if "package" not in section_data: + # Gets built with testenv.podman_install.from_source() continue - ret += [section_data["make"]] + if section_data["package"] != "no": + # Gets installed from a debian package + continue + + ret += [section_data["make"]] return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43795?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: Id5920aacba832a1f43d87d09a9e133d95384e635 Gerrit-Change-Number: 43795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix running configs with omitted package=
by fixeria 07 Oct '26

07 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43795?usp=email ) Change subject: testenv: fix running configs with omitted package= ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43795?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: Id5920aacba832a1f43d87d09a9e133d95384e635 Gerrit-Change-Number: 43795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 11:32:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-gsm-manuals[master]: sigtran.adoc: Rename 'SCTP role' to 'Transport layer role'
by osmith 07 Oct '26

07 Oct '26

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43756?usp=email ) Change subject: sigtran.adoc: Rename 'SCTP role' to 'Transport layer role' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43756?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I961552d00fde06154489b091d7d742b5ee86d206 Gerrit-Change-Number: 43756 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 11:31:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in libosmo-sigtran[master]: sccp: Introduce N-DISCONNECT.req/ind Release/Refusal reason
by osmith 07 Oct '26

07 Oct '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43763?usp=email ) Change subject: sccp: Introduce N-DISCONNECT.req/ind Release/Refusal reason ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I158463c2e9b34abe06554371d628e4fa7ea8c5c1 Gerrit-Change-Number: 43763 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 11:30:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: xua_srv: Introduce log macro LOGPOXS()
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43754?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: xua_srv: Introduce log macro LOGPOXS() ...................................................................... xua_srv: Introduce log macro LOGPOXS() Use the macro in multiple places, improve logging around it. Change-Id: Ibd24de79048161450c868dc28987307f25365704 --- M src/ss7_xua_srv.c M src/ss7_xua_srv.h 2 files changed, 20 insertions(+), 13 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 4fd1067..17ca1b5 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -74,11 +74,11 @@ const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); int rc = 0; - LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); + LOGPOXS(oxs, DLSS7, LOGL_INFO, "New %s connection accepted: %s\n", proto_name, sock_name); asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { - LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", sock_name, asp->cfg.name); + LOGPOXS(oxs, DLSS7, LOGL_INFO, "Matched %s connection %s to ASP %s\n", proto_name, sock_name, asp->cfg.name); if (!asp->cfg.is_server) { LOGPASP(asp, DLSS7, LOGL_NOTICE, "Reject incoming new connection from %s for ASP configured as 'transport-role client'\n", @@ -114,9 +114,9 @@ } if (!asp && !oxs->cfg.accept_dyn_reg) { - LOGP(DLSS7, LOGL_NOTICE, "%s: %s connection without matching " + LOGPOXS(oxs, DLSS7, LOGL_NOTICE, "%s connection %s without matching " "ASP definition and no dynamic registration enabled, terminating\n", - sock_name, proto_name); + proto_name, sock_name); close(fd); talloc_free(sock_name); return -1; @@ -124,8 +124,8 @@ srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { - LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " - "for connection\n", sock_name); + LOGPOXS(oxs, DLSS7, LOGL_ERROR, "Unable to create stream server " + "for %s connection %s\n", proto_name, sock_name); close(fd); talloc_free(sock_name); return -1; @@ -173,7 +173,8 @@ } osmo_sock_get_ip_and_port(fd, hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), false); - LOGP(DLSS7, LOGL_INFO, "%s: created dynamic ASP %s\n", sock_name, asp->cfg.name); + LOGPOXS(oxs, DLSS7, LOGL_INFO, "Created dynamic ASP %s from %s connection %s\n", + asp->cfg.name, proto_name, sock_name); asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; asp->cfg.local.port = oxs->cfg.local.port; @@ -254,7 +255,7 @@ return NULL; LOGP(DLSS7, LOGL_INFO, "Creating %s Server %s:%u\n", - get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host, local_port); + get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host ? : "NULL", local_port); INIT_LLIST_HEAD(&oxs->asp_list); @@ -274,7 +275,7 @@ ss7_xua_server_set_local_host(oxs, local_host); LOGP(DLSS7, LOGL_INFO, "Created %s server on %s:%" PRIu16 "\n", - get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host, local_port); + get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host ? : "NULL", local_port); oxs->inst = inst; llist_add_tail(&oxs->list, &inst->xua_servers); @@ -339,16 +340,16 @@ rc = ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local); if (rc < 0) { - LOGP(DLSS7, LOGL_INFO, "Failed parsing %s Server osmo_ss7_asp_peer\n", proto); + LOGPOXS(xs, DLSS7, LOGL_INFO, "Failed parsing %s Server osmo_ss7_asp_peer\n", proto); } else { - LOGP(DLSS7, LOGL_INFO, "(Re)binding %s Server to %s\n", - proto, buf); + LOGPOXS(xs, DLSS7, LOGL_INFO, "(Re)binding %s Server to %s\n", + proto, buf); } /* Applying xUA Server config which may have changed through VTY on the srv_link before opening it: */ if (xs->cfg.trans_proto == IPPROTO_SCTP) { if ((rc = ss7_xua_srv_apply_sctp_init_pars(xs)) < 0) - LOGP(DLSS7, LOGL_NOTICE, "Failed applying %s Server SCTP INIT parameters\n", proto); + LOGPOXS(xs, DLSS7, LOGL_NOTICE, "Failed applying %s Server SCTP INIT parameters\n", proto); } return osmo_stream_srv_link_open(xs->server); diff --git a/src/ss7_xua_srv.h b/src/ss7_xua_srv.h index 7e93b4e..58ff1e8 100644 --- a/src/ss7_xua_srv.h +++ b/src/ss7_xua_srv.h @@ -76,3 +76,9 @@ void ss7_xua_server_destroy(struct osmo_xua_server *xs); bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); + +#define LOGPOXS(oxs, subsys, level, fmt, args ...) \ + _LOGSS7((oxs)->inst, subsys, level, "XUA_SRV(%s,%s) " fmt, \ + osmo_stream_srv_link_get_name(oxs->server), \ + osmo_stream_srv_link_get_sockname(oxs->server) ? : "NULL", \ + ## args) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43754?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: Ibd24de79048161450c868dc28987307f25365704 Gerrit-Change-Number: 43754 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(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>

1 0

[XS] Change in libosmo-sigtran[master]: xua_msg: Drop __thread attribute on static buf
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43761?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: xua_msg: Drop __thread attribute on static buf ...................................................................... xua_msg: Drop __thread attribute on static buf libosmo-sigtran is not thread safe, and hence makes no sense to have only this static buffer (out of dozens declared) as TLS. Related: OS#7061 Change-Id: Ia023b8df32494bc705326106753f17e7eeaf89cf --- M src/xua_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_msg.c b/src/xua_msg.c index 61281c4..122f6bc 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -357,7 +357,7 @@ const char *xua_msg_part_get_str(const struct xua_msg_part *part) { - static char __thread buf[256]; + static char buf[256]; if (part->len == 0) return ""; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43761?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: Ia023b8df32494bc705326106753f17e7eeaf89cf Gerrit-Change-Number: 43761 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026