- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: xua_rkm: Avoid unnecesary ASP lookup by name
by fixeria 25 Nov '25

25 Nov '25

Attention is currently required from: daniel, lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41498?usp=email ) Change subject: xua_rkm: Avoid unnecesary ASP lookup by name ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/ss7_as.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41498/comment/712b5198_4688b… : PS2, Line 223: asp param name mismatch, should be `asp_name` -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41498?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: I5ca8f0180a0389d5de7b495cfe9f769985296383 Gerrit-Change-Number: 41498 Gerrit-PatchSet: 2 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 25 Nov 2025 13:20:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: ss7_xua_srv: Refactor xua_accept_cb()
by pespin 25 Nov '25

25 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41502?usp=email ) Change subject: ss7_xua_srv: Refactor xua_accept_cb() ...................................................................... ss7_xua_srv: Refactor xua_accept_cb() Move all "readonly" (no state change) checks at the start of the function. This simplifies the later code paths in the function, also allowing for more early return checks. This in turn allows simplifying different destruction code paths of asp and its osmo_stream. As a result, we can now call existing ss7_asp_disconnect_stream() API to close the stream when needed, and also make sure we set asp->xua_server=NULL and remove asp from oxs->siblings when the conn disconnects, otherwise it could create unexpected states if the config of the asp changes transport role client<->server or it gets assigned due to a different oxs due to change in config too. The new logic also fixes some corner-case scenarios, like (dis)allwoing newly created dynamic ASPs for already existing previous conn after the feature configuration has changed. Change-Id: I191f97e8545ce2f9899e3cd3cc3a7eed854daf1e --- M src/ss7_asp.c M src/ss7_xua_srv.c 2 files changed, 58 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/02/41502/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 5325de9..377d9e4 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -756,8 +756,6 @@ osmo_stream_cli_destroy(asp->client); if (asp->fi) osmo_fsm_inst_term(asp->fi, OSMO_FSM_TERM_REQUEST, NULL); - if (asp->xua_server) - llist_del(&asp->siblings); /* unlink from all ASs we are part of */ llist_for_each_entry(as, &asp->inst->as_list, list) @@ -1360,6 +1358,10 @@ xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION); asp->server = NULL; + if (asp->xua_server) { + llist_del(&asp->siblings); + asp->xua_server = NULL; + } /* if we were dynamically allocated at accept_cb() time, let's * self-destruct now. A new connection will re-create the ASP. */ diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 7e55777..85906b7 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -76,6 +76,7 @@ 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); if (!asp->cfg.is_server) { LOGPASP(asp, DLSS7, LOGL_NOTICE, "Reject incoming new connection from %s for ASP configured as 'transport-role client'\n", @@ -92,6 +93,26 @@ talloc_free(sock_name); return 0; } + /* we need to check if we already have a socket associated, and close it. Otherwise it might + * happen that both the listen-fd for this accept() and the old socket are marked 'readable' + * during the same scheduling interval, and we're processing them in the "wrong" order, i.e. + * we first see the accept of the new fd before we see the close on the old fd */ + if (asp->server) { + LOGPASP(asp, DLSS7, LOGL_FATAL, "accept of new connection from %s before old was closed " + "-> close old one\n", sock_name); + ss7_asp_disconnect_stream(asp); + /* Dynamic ASPs (transport-role=server) may be destroyed as a consequence, re-fetch the ASP: */ + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); + } + } + + if (!asp && !oxs->cfg.accept_dyn_reg) { + LOGP(DLSS7, LOGL_NOTICE, "%s: %s connection without matching " + "ASP definition and no dynamic registration enabled, terminating\n", + sock_name, proto_name); + close(fd); + talloc_free(sock_name); + return -1; } srv = osmo_stream_srv_create2(oxs, link, fd, NULL); @@ -127,71 +148,50 @@ } osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); - if (asp) { - LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", - sock_name, asp->cfg.name); - /* we need to check if we already have a socket associated, and close it. Otherwise it might - * happen that both the listen-fd for this accept() and the old socket are marked 'readable' - * during the same scheduling interval, and we're processing them in the "wrong" order, i.e. - * we first see the accept of the new fd before we see the close on the old fd */ - if (asp->server) { - LOGPASP(asp, DLSS7, LOGL_FATAL, "accept of new connection from %s before old was closed " - "-> close old one\n", sock_name); - osmo_stream_srv_set_data(asp->server, NULL); - osmo_stream_srv_destroy(asp->server); - asp->server = NULL; - } - } else { - if (!oxs->cfg.accept_dyn_reg) { - LOGP(DLSS7, LOGL_NOTICE, "%s: %s connection without matching " - "ASP definition and no dynamic registration enabled, terminating\n", - sock_name, proto_name); - } else { - char namebuf[32]; - static uint32_t dyn_asp_num = 0; - snprintf(namebuf, sizeof(namebuf), "asp-dyn-%u", dyn_asp_num++); - asp = osmo_ss7_asp_find_or_create2(oxs->inst, namebuf, 0, 0, - oxs->cfg.trans_proto, - oxs->cfg.proto); - if (asp) { - char hostbuf[INET6_ADDRSTRLEN]; - const char *hostbuf_ptr = &hostbuf[0]; - char portbuf[16]; - - 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); - asp->cfg.is_server = true; - asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; - asp->cfg.local.port = oxs->cfg.local.port; - asp->cfg.remote.port = atoi(portbuf); - asp->dyn_allocated = true; - asp->server = srv; - ss7_asp_peer_set_hosts(&asp->cfg.local, asp, - (const char * const*)oxs->cfg.local.host, - oxs->cfg.local.host_cnt); - ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, - &hostbuf_ptr, 1); - if ((rc = xua_asp_fsm_start(asp, asp->cfg.role, LOGL_DEBUG)) < 0) { - talloc_free(sock_name); - osmo_ss7_asp_destroy(asp); - return rc; - } - OSMO_ASSERT(asp->fi); - } - } + if (!asp) { + /* Dynamic registration: */ + char namebuf[32]; + char hostbuf[INET6_ADDRSTRLEN]; + const char *hostbuf_ptr = &hostbuf[0]; + char portbuf[16]; + static uint32_t dyn_asp_num = 0; + snprintf(namebuf, sizeof(namebuf), "asp-dyn-%u", dyn_asp_num++); + asp = osmo_ss7_asp_find_or_create2(oxs->inst, namebuf, 0, 0, + oxs->cfg.trans_proto, + oxs->cfg.proto); if (!asp) { osmo_stream_srv_destroy(srv); talloc_free(sock_name); return -1; } - llist_add_tail(&asp->siblings, &oxs->asp_list); + + 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); + asp->cfg.is_server = true; + asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; + asp->cfg.local.port = oxs->cfg.local.port; + asp->cfg.remote.port = atoi(portbuf); + asp->dyn_allocated = true; + asp->server = srv; + ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + (const char * const*)oxs->cfg.local.host, + oxs->cfg.local.host_cnt); + ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, + &hostbuf_ptr, 1); + if ((rc = xua_asp_fsm_start(asp, asp->cfg.role, LOGL_DEBUG)) < 0) { + talloc_free(sock_name); + osmo_ss7_asp_destroy(asp); + return rc; + } + OSMO_ASSERT(asp->fi); } + OSMO_ASSERT(asp); /* update the ASP reference back to the server over which the * connection came in */ asp->server = srv; asp->xua_server = oxs; + llist_add_tail(&asp->siblings, &oxs->asp_list); /* update the ASP socket name */ talloc_free(asp->sock_name); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I191f97e8545ce2f9899e3cd3cc3a7eed854daf1e Gerrit-Change-Number: 41502 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-dev[master]: all.desp: libosmo-sigtran depends on libosmo-asn1-tcap
by pespin 25 Nov '25

25 Nov '25

Attention is currently required from: daniel, fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-dev/+/41496?usp=email ) Change subject: all.desp: libosmo-sigtran depends on libosmo-asn1-tcap ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-dev/+/41496/comment/6e04cff9_d4916dd7?usp… : PS1, Line 9: --enable-tcap-loadsharing > Maybe add an `*.opts` file for this? For example, see `hnbgw_with_nftables.opts`. Is that going to be picked up by osmo-ttcn3-hacks.git just fine then? -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41496?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: Ibc51a818b859d40ab8a34d9299d0f955cf6d966e Gerrit-Change-Number: 41496 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Nov 2025 13:16:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: Build libosmo-sigtran with --enable-tcap-loadsharing
by fixeria 25 Nov '25

25 Nov '25

Attention is currently required from: daniel, laforge, lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41497?usp=email ) Change subject: testenv: Build libosmo-sigtran with --enable-tcap-loadsharing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41497?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: I7b29d00befa94412bef56a4b8e4d788674028b12 Gerrit-Change-Number: 41497 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 25 Nov 2025 13:13:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: all.desp: libosmo-sigtran depends on libosmo-asn1-tcap
by fixeria 25 Nov '25

25 Nov '25

Attention is currently required from: daniel, laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-dev/+/41496?usp=email ) Change subject: all.desp: libosmo-sigtran depends on libosmo-asn1-tcap ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-dev/+/41496/comment/cfb9fa32_41de4b9a?usp… : PS1, Line 9: --enable-tcap-loadsharing Maybe add an `*.opts` file for this? For example, see `hnbgw_with_nftables.opts`. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41496?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: Ibc51a818b859d40ab8a34d9299d0f955cf6d966e Gerrit-Change-Number: 41496 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Nov 2025 13:12:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: ss7_xua_srv: Make sure we don't accept conns for ASPs configured as t...
by osmith 25 Nov '25

25 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?usp=email ) Change subject: ss7_xua_srv: Make sure we don't accept conns for ASPs configured as transport-role client ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?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: I955aed3c6cdaa0a7eaa14150eeb7458ee9b41d9d Gerrit-Change-Number: 41501 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: Tue, 25 Nov 2025 12:43:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: ss7_xua_server_destroy(): Disconnect streams properly
by osmith 25 Nov '25

25 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?usp=email ) Change subject: ss7_xua_server_destroy(): Disconnect streams properly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?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: I1309015053d2bd22d8fdf6298f8918a47527340e Gerrit-Change-Number: 41500 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: Tue, 25 Nov 2025 12:42:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: ss7_asp: Do AS-eSLS table cleanup during osmo_ss7_asp_destroy()
by osmith 25 Nov '25

25 Nov '25

Attention is currently required from: daniel, fixeria, laforge, lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41499?usp=email ) Change subject: ss7_asp: Do AS-eSLS table cleanup during osmo_ss7_asp_destroy() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41499?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: I2c1b25d3e76703b88111b9935685a58d039b8e23 Gerrit-Change-Number: 41499 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 25 Nov 2025 12:42:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: ss7_xua_srv: Make sure we don't accept conns for ASPs configured as t...
by pespin 25 Nov '25

25 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?usp=email ) Change subject: ss7_xua_srv: Make sure we don't accept conns for ASPs configured as transport-role client ...................................................................... ss7_xua_srv: Make sure we don't accept conns for ASPs configured as transport-role client Change-Id: I955aed3c6cdaa0a7eaa14150eeb7458ee9b41d9d --- M src/ss7_xua_srv.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/01/41501/1 diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index a97b07f..7e55777 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -75,13 +75,23 @@ LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); - if (asp && asp->cfg.adm_state == OSMO_SS7_ASP_ADM_S_SHUTDOWN) { - LOGPASP(asp, DLSS7, LOGL_NOTICE, - "Reject incoming new connection from %s for ASP in adm state %s\n", - sock_name, get_value_string(osmo_ss7_asp_admin_state_names, asp->cfg.adm_state)); - close(fd); - talloc_free(sock_name); - return 0; + if (asp) { + if (!asp->cfg.is_server) { + LOGPASP(asp, DLSS7, LOGL_NOTICE, + "Reject incoming new connection from %s for ASP configured as 'transport-role client'\n", + sock_name); + close(fd); + talloc_free(sock_name); + return 0; + } + if (asp->cfg.adm_state == OSMO_SS7_ASP_ADM_S_SHUTDOWN) { + LOGPASP(asp, DLSS7, LOGL_NOTICE, + "Reject incoming new connection from %s for ASP in adm state %s\n", + sock_name, get_value_string(osmo_ss7_asp_admin_state_names, asp->cfg.adm_state)); + close(fd); + talloc_free(sock_name); + return 0; + } } srv = osmo_stream_srv_create2(oxs, link, fd, NULL); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41501?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I955aed3c6cdaa0a7eaa14150eeb7458ee9b41d9d Gerrit-Change-Number: 41501 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: ss7_xua_server_destroy(): Disconnect streams properly
by pespin 25 Nov '25

25 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?usp=email ) Change subject: ss7_xua_server_destroy(): Disconnect streams properly ...................................................................... ss7_xua_server_destroy(): Disconnect streams properly destroying ASPs is wrong, since that'd also destroy non-dynamic ASPs, hence erasing the configuration. Instead, close oly the stream, and dynamic ASPs get destroyed as a consequence. Change-Id: I1309015053d2bd22d8fdf6298f8918a47527340e --- M src/ss7_xua_srv.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/00/41500/1 diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 077eea0..a97b07f 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -397,11 +397,13 @@ if (xs->server) { osmo_stream_srv_link_close(xs->server); osmo_stream_srv_link_destroy(xs->server); + xs->server = NULL; } - /* iterate and close all connections established in relation - * with this server */ + + /* iterate and close all connections established in relation with this server. + * Dynamic ASPs in SCTP=server are destroyed when connection is closed. */ llist_for_each_entry_safe(asp, asp2, &xs->asp_list, siblings) - osmo_ss7_asp_destroy(asp); + ss7_asp_disconnect_stream(asp); llist_del(&xs->list); talloc_free(xs); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41500?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I1309015053d2bd22d8fdf6298f8918a47527340e Gerrit-Change-Number: 41500 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log