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

[M] Change in libosmo-sigtran[master]: Allow configuring local ASP Identifier
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42115?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: Allow configuring local ASP Identifier ...................................................................... Allow configuring local ASP Identifier If configured, it will be transmitted during ASP UP and ASP UP ACK. This may be needed if facing an SG/IPSP peer who requires ASP Identifier to be set. Related: OS#6953 Change-Id: Ib94d542f940e13d5c007bc3319e7dde65cf81f12 --- M src/ss7_asp.h M src/ss7_asp_vty.c M src/xua_asp_fsm.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 5 files changed, 55 insertions(+), 29 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 0d047cb..75be6cc 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -73,12 +73,8 @@ /*! pre-formatted human readable local/remote socket name */ char *sock_name; - /* ASP Identifier for ASP-UP + NTFY, as received by the peer. - * FIXME: This should actually be stored in a AS-ASP relation, since it - * can be different per AS, see RFC4666 3.5.1 - * "The optional ASP Identifier parameter contains a unique value that - * is locally significant among the ASPs that support an AS". - */ + /* Peer's ASP Identifier, as received during ASPUP (SG/IPSP) and ASPUP ACK (IPSP), + * and transmitted during NOTIFY. */ uint32_t remote_asp_id; bool remote_asp_id_present; @@ -128,6 +124,13 @@ * "[no] shutdown" explicitly in cfg files. */ bool explicit_shutdown_state_by_vty_since_node_enter; + /* Local ASP Identifier transmitted during ASPUP (ASP/IPSP) and ASPUP ACK (IPSP), + * and received during NOTIFY. + * "The optional ASP Identifier parameter contains a unique value + * that is locally significant among the ASPs that support an AS". */ + uint32_t local_asp_id; + bool local_asp_id_present; + struct osmo_ss7_asp_peer local; struct osmo_ss7_asp_peer remote; uint8_t qos_class; diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 241863a..6b03275 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -28,6 +28,7 @@ #include <errno.h> #include <stdint.h> #include <string.h> +#include <inttypes.h> #include <netdb.h> #include <arpa/inet.h> @@ -453,6 +454,35 @@ return CMD_SUCCESS; } +DEFUN_ATTR(asp_identifier, asp_identifier_cmd, + "asp-identifier <0-4294967295>", + "Specify ASP Identifier for this ASP\n" + "ASP Identifier\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + int64_t id64 = 0; + int rc = osmo_str_to_int64(&id64, argv[0], 10, 0, UINT32_MAX); + if (rc < 0) + return CMD_WARNING; + + asp->cfg.local_asp_id_present = true; + asp->cfg.local_asp_id = (uint32_t)id64; + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_identifier, asp_no_identifier_cmd, + "no asp-identifier", + NO_STR "Specify ASP Identifier for this ASP\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + asp->cfg.local_asp_id_present = false; + asp->cfg.local_asp_id = 0; + return CMD_SUCCESS; +} + DEFUN_ATTR(asp_transport_role, asp_transport_role_cmd, "transport-role (client|server)", "Specify the transport layer role for this ASP\n" @@ -1322,6 +1352,8 @@ vty_out(vty, "%s", VTY_NEWLINE); if (asp->cfg.description) vty_out(vty, " description %s%s", asp->cfg.description, VTY_NEWLINE); + if (asp->cfg.local_asp_id_present) + vty_out(vty, " asp-identifier %" PRIu32 "%s", asp->cfg.local_asp_id, VTY_NEWLINE); for (i = 0; i < asp->cfg.local.host_cnt; i++) { if (asp->cfg.local.host[i]) vty_out(vty, " local-ip %s%s%s", asp->cfg.local.host[i], @@ -1443,6 +1475,8 @@ install_lib_element(L_CS7_NODE, &cs7_asp_trans_proto_cmd); install_lib_element(L_CS7_NODE, &no_cs7_asp_cmd); install_lib_element(L_CS7_ASP_NODE, &cfg_description_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_identifier_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_identifier_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_remote_ip_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_remote_ip_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_local_ip_cmd); diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 4204e31..cdbb0da 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -226,33 +226,16 @@ /* RFC 3868 Ch. 3.5.1 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPSM, SUA_ASPSM_UP); /* Optional: ASP ID */ -#if 0 - /* TODO: RFC 4666 3.8.1: - * 'The "ASP Identifier Required" error is sent by an SGP in - * response to an ASP Up message that does not contain an ASP - * Identifier parameter when the SGP requires one. The ASP SHOULD - * resend the ASP Up message with an ASP Identifier.' */ - if (ss7_asp_peer_requires_asp_id(asp)) { /* Maybe configure in VTY "asp" node? */ - asp_id = /* get a unique id of asp within as, eg. the index in as->asps[] */; - xua_msg_add_u32(xua, SUA_IEI_ASP_ID, asp_id); - } -#endif + if (asp->cfg.local_asp_id_present) + xua_msg_add_u32(xua, SUA_IEI_ASP_ID, asp->cfg.local_asp_id); /* Optional: Info String */ break; case XUA_ASP_E_ASPSM_ASPUP_ACK: /* RFC3868 Ch. 3.5.2 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPSM, SUA_ASPSM_UP_ACK); /* Optional: ASP ID */ -#if 0 - /* TODO: RFC 4666 3.5.2: - * "The optional ASP Identifier parameter is specifically useful for IPSP - * communication. In that case, the IPSP answering the ASP Up message - * MAY include its own ASP Identifier value." */ - if (ss7_asp_peer_requires_asp_id(asp)) { /* Maybe configure in VTY "asp" node? */ - asp_id = /* get a unique id of asp within as, eg. the index in as->asps[] */; - xua_msg_add_u32(xua, SUA_IEI_ASP_ID, asp_id); - } -#endif + if (asp->cfg.local_asp_id_present) + xua_msg_add_u32(xua, SUA_IEI_ASP_ID, asp->cfg.local_asp_id); /* Optional: Info String */ break; case XUA_ASP_E_ASPSM_ASPDN: diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 72eb0de..6e98bb4 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -279,6 +279,8 @@ OsmoSTP(config-cs7-asp)# list ... description .TEXT + asp-identifier <0-4294967295> + no asp-identifier remote-ip (A.B.C.D|X:X::X:X) [primary] no remote-ip (A.B.C.D|X:X::X:X) local-ip (A.B.C.D|X:X::X:X) [primary] @@ -308,8 +310,9 @@ OsmoSTP(config-cs7-asp)# ? ... description Save human-readable description of the object - remote-ip Specify Remote IP Address of ASP + asp-identifier Specify ASP Identifier for this ASP no Negate a command or set its defaults + remote-ip Specify Remote IP Address of ASP local-ip Specify Local IP Address from which to contact ASP qos-class Specify QoS Class of ASP role Specify the xUA role for this ASP diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 1ff4e36..ee6f9c2 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -275,6 +275,8 @@ ss7_asp_vty_test(config-cs7-asp)# list ... description .TEXT + asp-identifier <0-4294967295> + no asp-identifier remote-ip (A.B.C.D|X:X::X:X) [primary] no remote-ip (A.B.C.D|X:X::X:X) local-ip (A.B.C.D|X:X::X:X) [primary] @@ -304,8 +306,9 @@ ss7_asp_vty_test(config-cs7-asp)# ? ... description Save human-readable description of the object - remote-ip Specify Remote IP Address of ASP + asp-identifier Specify ASP Identifier for this ASP no Negate a command or set its defaults + remote-ip Specify Remote IP Address of ASP local-ip Specify Local IP Address from which to contact ASP qos-class Specify QoS Class of ASP role Specify the xUA role for this ASP -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42115?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: Ib94d542f940e13d5c007bc3319e7dde65cf81f12 Gerrit-Change-Number: 42115 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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]: xua_asp_fsm: Remove obvious comments
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42116?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_asp_fsm: Remove obvious comments ...................................................................... xua_asp_fsm: Remove obvious comments Those can already be interpretred directly by the ENSURE_* macros. No need to clog the file with more lines describing stuff. Change-Id: Idec06646c48fbce4cbe200e88f987dfb3e9d5a39 --- M src/xua_asp_fsm.c 1 file changed, 0 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index cdbb0da..34419a4 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -531,13 +531,11 @@ switch (event) { case XUA_ASP_E_M_ASP_UP_REQ: - /* only if role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* Send M3UA_MSGT_ASPSM_ASPUP and start t_ack */ peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPSM_ASPUP); break; case XUA_ASP_E_ASPSM_ASPUP_ACK: - /* only if role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* Optional ASP Identifier */ if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { @@ -549,7 +547,6 @@ send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM); break; case XUA_ASP_E_ASPSM_ASPUP: - /* only if role SG */ ENSURE_SG_OR_IPSP(fi, event); /* Optional ASP Identifier: Store for NTFY */ if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { @@ -564,7 +561,6 @@ PRIM_OP_INDICATION); break; case XUA_ASP_E_ASPSM_ASPDN: - /* only if role SG */ ENSURE_SG_OR_IPSP(fi, event); /* The SGP MUST send an ASP Down Ack message in response * to a received ASP Down message from the ASP even if @@ -634,7 +630,6 @@ send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM); break; case XUA_ASP_E_ASPTM_ASPAC_ACK: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* transition state and inform layer manager */ osmo_fsm_inst_state_chg(fi, XUA_ASP_S_ACTIVE, 0, 0); @@ -642,7 +637,6 @@ PRIM_OP_CONFIRM); break; case XUA_ASP_E_ASPSM_ASPDN_ACK: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* transition state and inform layer manager */ osmo_fsm_inst_state_chg(fi, XUA_ASP_S_DOWN, 0, 0); @@ -651,7 +645,6 @@ break; case XUA_ASP_E_ASPTM_ASPAC: xua_in = data; - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); if (xua_msg_find_tag(xua_in, M3UA_IEI_TRAF_MODE_TYP)) { traf_mode = xua_msg_get_u32(xua_in, M3UA_IEI_TRAF_MODE_TYP); @@ -702,7 +695,6 @@ PRIM_OP_INDICATION); break; case XUA_ASP_E_ASPSM_ASPDN: - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); /* send ACK */ peer_send(fi, XUA_ASP_E_ASPSM_ASPDN_ACK, NULL); @@ -712,7 +704,6 @@ PRIM_OP_INDICATION); break; case XUA_ASP_E_ASPSM_ASPUP: - /* only if role SG */ ENSURE_SG_OR_IPSP(fi, event); /* If an ASP Up message is received and internally the * remote ASP is already in the ASP-INACTIVE state, an @@ -721,7 +712,6 @@ peer_send(fi, XUA_ASP_E_ASPSM_ASPUP_ACK, NULL); break; case XUA_ASP_E_ASPTM_ASPIA: - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); peer_send(fi, XUA_ASP_E_ASPTM_ASPIA_ACK, NULL); break; @@ -759,7 +749,6 @@ send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_CONFIRM); break; case XUA_ASP_E_ASPSM_ASPDN_ACK: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); osmo_fsm_inst_state_chg(fi, XUA_ASP_S_DOWN, 0, 0); /* inform layer manager */ @@ -767,7 +756,6 @@ PRIM_OP_CONFIRM); break; case XUA_ASP_E_ASPTM_ASPIA_ACK: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0); /* inform layer manager */ @@ -775,19 +763,16 @@ PRIM_OP_CONFIRM); break; case XUA_ASP_E_M_ASP_DOWN_REQ: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* send M3UA_MSGT_ASPSM_ASPDN and star t_ack */ peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPSM_ASPDN); break; case XUA_ASP_E_M_ASP_INACTIVE_REQ: - /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); /* send M3UA_MSGT_ASPTM_ASPIA and star t_ack */ peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPTM_ASPIA); break; case XUA_ASP_E_ASPTM_ASPIA: - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); /* send ACK */ peer_send(fi, XUA_ASP_E_ASPTM_ASPIA_ACK, NULL); @@ -797,7 +782,6 @@ PRIM_OP_INDICATION); break; case XUA_ASP_E_ASPSM_ASPDN: - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); /* send ACK */ peer_send(fi, XUA_ASP_E_ASPSM_ASPDN_ACK, NULL); @@ -807,7 +791,6 @@ PRIM_OP_INDICATION); break; case XUA_ASP_E_ASPSM_ASPUP: - /* only if role SG */ ENSURE_SG_OR_IPSP(fi, event); /* an ASP Up Ack message is returned, as well as * an Error message ("Unexpected Message), and the @@ -821,7 +804,6 @@ break; case XUA_ASP_E_ASPTM_ASPAC: xua_in = data; - /* only in role SG */ ENSURE_SG_OR_IPSP(fi, event); /* send ACK */ peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, xua_in); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42116?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: Idec06646c48fbce4cbe200e88f987dfb3e9d5a39 Gerrit-Change-Number: 42116 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: xua_as_fsm: Fix mixed brace/no-brace blocks in if/else
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42118?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: cosmetic: xua_as_fsm: Fix mixed brace/no-brace blocks in if/else ...................................................................... cosmetic: xua_as_fsm: Fix mixed brace/no-brace blocks in if/else Change-Id: Ibfd818d354c09409b04b392853f544a220de3a72 --- M src/xua_as_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 422a2b4..6828989 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -135,8 +135,9 @@ if (asp->remote_asp_id_present) { npar->presence |= NOTIFY_PAR_P_ASP_ID; npar->asp_id = asp->remote_asp_id; - } else + } else { npar->presence &= ~NOTIFY_PAR_P_ASP_ID; + } fill_notify_route_ctx(asp, npar); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42118?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: Ibfd818d354c09409b04b392853f544a220de3a72 Gerrit-Change-Number: 42118 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_asp_fsm: Error on ASP UP (ACK) with non-unique ASP Identifier
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42117?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: xua_asp_fsm: Error on ASP UP (ACK) with non-unique ASP Identifier ...................................................................... xua_asp_fsm: Error on ASP UP (ACK) with non-unique ASP Identifier Following RFC4666: """ The "Invalid ASP Identifier" error is sent by an SGP in response to an ASP Up message with an invalid (i.e., non-unique) ASP Identifier """ Change-Id: I2d422acaa2f04c7d1eebd92c3185c4f5476a1789 --- M src/ss7_as.c M src/ss7_as.h M src/ss7_asp.c M src/ss7_asp.h M src/xua_asp_fsm.c 5 files changed, 60 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/ss7_as.c b/src/ss7_as.c index 1cc212f..a25e068 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -378,6 +378,29 @@ return !!ss7_as_asp_assoc_find(as, asp); } +/*! \brief Find ASP with a given announced remote ASP Id + * \param[in] as Application Server in which to look for \ref asp + * \param[in] asp_id M3UA/SUA ASP Identifier + * \param[in] excl_asp If not NULL, skip this asp from the candidates. + * \returns the asp object if found, NULL otherwise */ +struct osmo_ss7_asp *ss7_as_find_asp_by_remote_asp_id(const struct osmo_ss7_as *as, uint32_t asp_id, + const struct osmo_ss7_asp *excl_asp) +{ + struct ss7_as_asp_assoc *assoc; + + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; + if (!asp->remote_asp_id_present) + continue; + if (assoc->asp->remote_asp_id != asp_id) + continue; + if (excl_asp == assoc->asp) + continue; + return asp; + } + return NULL; +} + /* Determine which role (SG/ASP/IPSP) we operate in. * return enum osmo_ss7_asp_role on success, negative otherwise. */ int ss7_as_get_local_role(const struct osmo_ss7_as *as) diff --git a/src/ss7_as.h b/src/ss7_as.h index 2e7f484..793cb26 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -183,6 +183,8 @@ int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp); int ss7_as_del_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp); int ss7_as_get_local_role(const struct osmo_ss7_as *as); +struct osmo_ss7_asp *ss7_as_find_asp_by_remote_asp_id(const struct osmo_ss7_as *as, uint32_t asp_id, + const struct osmo_ss7_asp *excl_asp); void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as); void ss7_as_del_asp_update_llist_round_robin(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp, struct ss7_as_asp_assoc **state); diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 9b8f164..40433d0 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1623,6 +1623,17 @@ return tmode; } +bool ss7_asp_check_remote_asp_id_unique(const struct osmo_ss7_asp *asp, uint32_t remote_asp_id) +{ + const struct ss7_as_asp_assoc *assoc; + + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + if (ss7_as_find_asp_by_remote_asp_id(assoc->as, remote_asp_id, asp)) + return false; + } + return true; +} + /* process a primitive from the xUA Layer Manager (LM) */ int osmo_xlm_sap_down(struct osmo_ss7_asp *asp, struct osmo_prim_hdr *oph) { diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 75be6cc..7bce2d4 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -196,6 +196,7 @@ struct osmo_ss7_as *ss7_asp_get_first_as(const struct osmo_ss7_asp *asp); int ss7_asp_determine_traf_mode(const struct osmo_ss7_asp *asp); +bool ss7_asp_check_remote_asp_id_unique(const struct osmo_ss7_asp *asp, uint32_t remote_asp_id); #define LOGPASP(asp, subsys, level, fmt, args ...) \ _LOGSS7((asp)->inst, subsys, level, "ASP(%s) " fmt, (asp)->cfg.name, ## args) diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 34419a4..26247cb 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -468,6 +468,7 @@ dispatch_to_all_as(asp->fi, XUA_ASPAS_ASP_DOWN_IND, asp); /* Implicit clean up tasks: */ + asp->remote_asp_id_present = false; llist_for_each_entry_safe(assoc, assoc2, &asp->assoc_as_list, asp_entry) { struct osmo_ss7_as *as = assoc->as; #ifdef WITH_TCAP_LOADSHARING @@ -526,6 +527,7 @@ struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; struct xua_msg_part *asp_id_ie; + uint32_t asp_id; check_stop_t_ack(fi, event); @@ -539,7 +541,12 @@ ENSURE_ASP_OR_IPSP(fi, event); /* Optional ASP Identifier */ if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { - asp->remote_asp_id = xua_msg_part_get_u32(asp_id_ie); + asp_id = xua_msg_part_get_u32(asp_id_ie); + if (!ss7_asp_check_remote_asp_id_unique(asp, asp_id)) { + peer_send_error(fi, M3UA_ERR_INVAL_ASP_ID); + return; + } + asp->remote_asp_id = asp_id; asp->remote_asp_id_present = true; } osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0); @@ -548,9 +555,15 @@ break; case XUA_ASP_E_ASPSM_ASPUP: ENSURE_SG_OR_IPSP(fi, event); - /* Optional ASP Identifier: Store for NTFY */ + /* Optional ASP Identifier */ if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { - asp->remote_asp_id = xua_msg_part_get_u32(asp_id_ie); + asp_id = xua_msg_part_get_u32(asp_id_ie); + if (!ss7_asp_check_remote_asp_id_unique(asp, asp_id)) { + peer_send_error(fi, M3UA_ERR_INVAL_ASP_ID); + return; + } + /* Store for NTFY */ + asp->remote_asp_id = asp_id; asp->remote_asp_id_present = true; } /* send ACK */ @@ -606,6 +619,7 @@ struct xua_msg *xua_in; uint32_t traf_mode = 0; struct xua_msg_part *part; + uint32_t asp_id; int i; check_stop_t_ack(fi, event); @@ -623,7 +637,12 @@ ENSURE_IPSP(fi, event); /* Optional ASP Identifier */ if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { - asp->remote_asp_id = xua_msg_part_get_u32(asp_id_ie); + asp_id = xua_msg_part_get_u32(asp_id_ie); + if (!ss7_asp_check_remote_asp_id_unique(asp, asp_id)) { + peer_send_error(fi, M3UA_ERR_INVAL_ASP_ID); + return; + } + asp->remote_asp_id = asp_id; asp->remote_asp_id_present = true; } /* inform layer manager */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42117?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: I2d422acaa2f04c7d1eebd92c3185c4f5476a1789 Gerrit-Change-Number: 42117 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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]: ss7_as: Optimize ASP Tx selection in Override traffic mode
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42108?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: ss7_as: Optimize ASP Tx selection in Override traffic mode ...................................................................... ss7_as: Optimize ASP Tx selection in Override traffic mode Cache the last selected ASP, and expect it to still be the active ASP most of the time until it changes. Change-Id: I3d480d23591f4bd216293be60b22389b182fd8f3 --- M src/ss7_as.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/ss7_as.c b/src/ss7_as.c index 4090d4a..8a5c1a1 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -404,8 +404,16 @@ { struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { - if (osmo_ss7_asp_active(assoc->asp)) + /* Hot path: Override traffic mode has only max 1 active ASP at a time. + * Unless there's a change in state, the last ASP used to transmit is most + * probably the active one: */ + if (as->last_asp_idx_sent && osmo_ss7_asp_active(as->last_asp_idx_sent->asp)) + return as->last_asp_idx_sent->asp; + + /* Slow path: Active ASP changed, look it up: */ + for (unsigned int i = 0; i < as->num_assoc_asps; i++) { + assoc = ss7_as_asp_assoc_llist_round_robin(as, &as->last_asp_idx_sent); + if (assoc && osmo_ss7_asp_active(assoc->asp)) return assoc->asp; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42108?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: I3d480d23591f4bd216293be60b22389b182fd8f3 Gerrit-Change-Number: 42108 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: tests/vty: Introduce testTonsOfASP
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42109?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: tests/vty: Introduce testTonsOfASP ...................................................................... tests/vty: Introduce testTonsOfASP Add test to validate tons of ASPs (1000) can be configured, all serving one given AS. Related: SYS#7519 Change-Id: I9bfcfcbea3c4cec0e6284ae59d30670fcf3ccac4 --- M tests/vty/vty_test_runner.py 1 file changed, 39 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index ba1d90b..f4ef7ed 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -149,6 +149,45 @@ print("Connected to STP through SCTP (IPv6)") s.close() + def testTonsOfASP(self): + self.vty.enable() + self.assertTrue(self.vty.verify("configure terminal",[''])) + self.assertTrue(self.vty.verify("cs7 instance 0",[''])) + num_of_asp = 1000 + for i in range(num_of_asp): + asp_name = "asp-TonsofASP" + str(i) + asp_node = "asp " + asp_name + " " + str(10000+i) + " " + "2905 m3ua" + self.assertTrue(self.vty.verify(asp_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-asp') + self.assertTrue(self.vty.verify("local-ip 127.0.0.1",[''])) + self.assertTrue(self.vty.verify("local-ip ::1",[''])) + self.assertTrue(self.vty.verify("remote-ip 127.0.0.9",[''])) + self.assertTrue(self.vty.verify("remote-ip ::2",[''])) + self.assertTrue(self.vty.verify("role sg",[''])) + self.assertTrue(self.vty.verify("sctp-role server",[''])) + self.assertTrue(self.vty.verify("no shutdown",[''])) + self.assertTrue(self.vty.verify("exit",["% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered"])) + as_name = "as-TonsOfASP" + as_node = "as " + as_name + " m3ua" + self.assertTrue(self.vty.verify(as_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-as') + for i in range(num_of_asp): + asp_name = "asp-TonsofASP" + str(i) + self.assertTrue(self.vty.verify("asp " + asp_name,[''])) + self.assertTrue(self.vty.verify("exit", [''])) + + # Now remove all of them: + self.assertTrue(self.vty.verify(as_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-as') + for i in range(num_of_asp): + asp_name="asp-TonsofASP" + str(i) + self.assertTrue(self.vty.verify("no asp " + asp_name,[''])) + self.assertTrue(self.vty.verify("exit", [''])) + for i in range(num_of_asp): + asp_name="asp-TonsofASP" + str(i) + self.assertTrue(self.vty.verify("no asp " + asp_name,[''])) + self.assertTrue(self.vty.verify("no as " + as_name,[''])) + if __name__ == '__main__': import argparse import sys -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42109?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: I9bfcfcbea3c4cec0e6284ae59d30670fcf3ccac4 Gerrit-Change-Number: 42109 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: Introduce struct osmo_ss7_as_asp_assoc
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?usp=email ) Change subject: Introduce struct osmo_ss7_as_asp_assoc ...................................................................... Introduce struct osmo_ss7_as_asp_assoc This new struct allows supporting unlimited number of ASPs per AS. It can also potentially be used in the future to: * Hold M3UA "ASP Identifier" per AS<->ASP association * Speed up iterating over AS served by a given ASP. NOTE: Having >16 ASPs per AS may not be desirable, for instance under loadshare traffic mode ITU SLS is 4 bit, so despite having ext_sls extending the table to 128 entries based on OPC, it may not provide enough entropy to properly loadshare among all of them. Related: OS#7519 Change-Id: I149ab467899633ac50cba3e482b2cae02124279d --- M src/ss7_as.c M src/ss7_as.h M src/ss7_as_vty.c M src/ss7_combined_linkset.c M src/ss7_instance.c M src/ss7_internal.h M src/ss7_route.c M src/tcap_as_loadshare.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c 11 files changed, 191 insertions(+), 180 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/ss7_as.c b/src/ss7_as.c index f1c9528..4090d4a 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -51,6 +51,33 @@ #include "xua_msg.h" /*********************************************************************** + * SS7 AS<->ASP association (N<->M arity) + ***********************************************************************/ +static struct ss7_as_asp_assoc *ss7_as_asp_assoc_alloc(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp) +{ + struct ss7_as_asp_assoc *assoc; + OSMO_ASSERT(as); + OSMO_ASSERT(asp); + + assoc = talloc_zero(as->inst, struct ss7_as_asp_assoc); + if (!assoc) + return NULL; + assoc->as = as; + assoc->asp = asp; + llist_add_tail(&assoc->as_entry, &as->assoc_asp_list); + as->num_assoc_asps++; + + return assoc; +} + +static void ss7_as_asp_assoc_free(struct ss7_as_asp_assoc *assoc) +{ + llist_del(&assoc->as_entry); + assoc->as->num_assoc_asps--; + talloc_free(assoc); +} + +/*********************************************************************** * SS7 Application Server ***********************************************************************/ @@ -137,15 +164,13 @@ } rate_ctr_group_set_name(as->ctrg, name); as->inst = inst; + INIT_LLIST_HEAD(&as->assoc_asp_list); as->cfg.name = talloc_strdup(as, name); as->cfg.proto = proto; as->cfg.mode = OSMO_SS7_AS_TMOD_OVERRIDE; as->cfg.recovery_timeout_msec = 2000; as->cfg.routing_key.l_rk_id = ss7_find_free_l_rk_id(inst); - /* Pick 1st ASP upon 1st roundrobin assignment: */ - as->cfg.last_asp_idx_assigned = ARRAY_SIZE(as->cfg.asps) - 1; - #ifdef WITH_TCAP_LOADSHARING /* loadshare-tcap based id sharing */ hash_init(as->tcap.tid_ranges); @@ -176,7 +201,8 @@ * \returns 0 on success; negative in case of error */ int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; + OSMO_ASSERT(as); OSMO_ASSERT(asp); if (osmo_ss7_as_has_asp(as, asp)) @@ -184,17 +210,13 @@ LOGPAS(as, DLSS7, LOGL_INFO, "Adding ASP %s to AS\n", asp->cfg.name); - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (!as->cfg.asps[i]) { - as->cfg.asps[i] = asp; - if (asp->fi) - osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_AS_ASSIGNED, as); - return 0; - } - } + assoc = ss7_as_asp_assoc_alloc(as, asp); + OSMO_ASSERT(assoc); - LOGPAS(as, DLSS7, LOGL_ERROR, "Failed adding ASP %s to AS, ASP table is full!\n", asp->cfg.name); - return -ENOSPC; + if (asp->fi) + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_AS_ASSIGNED, as); + + return 0; } /*! \brief Add given ASP to given AS @@ -213,6 +235,36 @@ return ss7_as_add_asp(as, asp); } +static struct ss7_as_asp_assoc *ss7_as_asp_assoc_find(const struct osmo_ss7_as *as, + const struct osmo_ss7_asp *asp) +{ + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (assoc->asp == asp) + return assoc; + } + return NULL; +} + +/* Update a given llist_round_robin state pointer which may point to an asp being freed. + * Selects next in list if available, or sets pointer to null. */ +void ss7_as_del_asp_update_llist_round_robin(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp, struct ss7_as_asp_assoc **state) +{ + struct ss7_as_asp_assoc *assoc; + + OSMO_ASSERT(state); + assoc = *state; + if (!assoc) + return; + if (asp != assoc->asp) + return; + + assoc = ss7_as_asp_assoc_llist_round_robin(as, (void **)state); + /* If there's only one left, remove state: */ + if (asp == assoc->asp) + *state = NULL; +} + /*! \brief Delete given ASP from given AS * \param[in] as Application Server from which \ref asp is deleted * \param[in] asp Application Server Process to delete from \ref as @@ -221,8 +273,11 @@ * \ref as may be freed during the function call. */ int ss7_as_del_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp) { - unsigned int i; - bool found = false; + struct ss7_as_asp_assoc *assoc; + + assoc = ss7_as_asp_assoc_find(as, asp); + if (!assoc) + return -EINVAL; LOGPAS(as, DLSS7, LOGL_INFO, "Removing ASP %s from AS\n", asp->cfg.name); @@ -238,23 +293,19 @@ tcap_as_del_asp(as, asp); #endif /* WITH_TCAP_LOADSHARING */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (as->cfg.asps[i] == asp) { - as->cfg.asps[i] = NULL; - found = true; - break; - } - } + /* Update round robin state */ + ss7_as_del_asp_update_llist_round_robin(as, asp, &as->last_asp_idx_assigned); + ss7_as_del_asp_update_llist_round_robin(as, asp, &as->last_asp_idx_sent); + ss7_as_asp_assoc_free(assoc); /* RKM-dynamically allocated AS: If there are no other ASPs, destroy the AS. * RFC 4666 4.4.2: "If a Deregistration results in no more ASPs in an * Application Server, an SG MAY delete the Routing Key data." */ - if (as->rkm_dyn_allocated && osmo_ss7_as_count_asp(as) == 0) + if (as->rkm_dyn_allocated && llist_empty(&as->assoc_asp_list)) osmo_ss7_as_destroy(as); - - return found ? 0 : -EINVAL; + return 0; } /*! \brief Delete given ASP from given AS @@ -277,6 +328,7 @@ * \param[in] as Application Server to destroy */ void osmo_ss7_as_destroy(struct osmo_ss7_as *as) { + struct ss7_as_asp_assoc *assoc; OSMO_ASSERT(ss7_initialized); LOGPAS(as, DLSS7, LOGL_INFO, "Destroying AS\n"); @@ -290,6 +342,9 @@ /* find any routes pointing to this AS and remove them */ ss7_route_table_del_routes_by_as(as->inst->rtable_system, as); + while ((assoc = llist_first_entry_or_null(&as->assoc_asp_list, struct ss7_as_asp_assoc, as_entry))) + ss7_as_asp_assoc_free(assoc); + as->inst = NULL; llist_del(&as->list); rate_ctr_group_free(as->ctrg); @@ -303,48 +358,22 @@ bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, const struct osmo_ss7_asp *asp) { - unsigned int i; - OSMO_ASSERT(ss7_initialized); - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (as->cfg.asps[i] == asp) - return true; - } - return false; -} - -/*! Determine amount of ASPs associated to an AS. - * \param[in] as Application Server. - * \returns number of ASPs associated to as */ -unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as) -{ - unsigned int i; - unsigned int cnt = 0; - - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (as->cfg.asps[i]) - cnt++; - } - return cnt; + return !!ss7_as_asp_assoc_find(as, asp); } /* Determine which role (SG/ASP/IPSP) we operate in. * return enum osmo_ss7_asp_role on success, negative otherwise. */ int ss7_as_get_local_role(const struct osmo_ss7_as *as) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; /* this is a bit tricky. "osmo_ss7_as" has no configuration of a role, * only the ASPs have. As they all must be of the same role, let's simply * find the first one and return its role */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) + return assoc->asp->cfg.role; - if (!asp) - continue; - - return asp->cfg.role; - } /* No ASPs associated to this AS yet? */ return -1; } @@ -373,16 +402,13 @@ static struct osmo_ss7_asp *ss7_as_select_asp_override(struct osmo_ss7_as *as) { - struct osmo_ss7_asp *asp; - unsigned int i; + struct ss7_as_asp_assoc *assoc; - /* FIXME: proper selection of the ASP based on the SLS! */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (asp && osmo_ss7_asp_active(asp)) - break; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (osmo_ss7_asp_active(assoc->asp)) + return assoc->asp; } - return asp; + return NULL; } /* Pick an ASP serving AS in a round-robin fashion. @@ -394,41 +420,27 @@ * distribution. */ static struct osmo_ss7_asp *ss7_as_assign_asp_roundrobin(struct osmo_ss7_as *as) { - struct osmo_ss7_asp *asp; - unsigned int i; - unsigned int first_idx; + struct ss7_as_asp_assoc *assoc; - first_idx = (as->cfg.last_asp_idx_assigned + 1) % ARRAY_SIZE(as->cfg.asps); - i = first_idx; - do { - asp = as->cfg.asps[i]; - if (asp) - break; - i = (i + 1) % ARRAY_SIZE(as->cfg.asps); - } while (i != first_idx); - as->cfg.last_asp_idx_assigned = i; - - return asp; + for (unsigned int i = 0; i < as->num_assoc_asps; i++) { + assoc = ss7_as_asp_assoc_llist_round_robin(as, &as->last_asp_idx_assigned); + if (assoc) + return assoc->asp; + } + return NULL; } /* Pick an active ASP serving AS in a round-robin fashion, to send a message to. */ static struct osmo_ss7_asp *ss7_as_select_asp_roundrobin(struct osmo_ss7_as *as) { - struct osmo_ss7_asp *asp; - unsigned int i; - unsigned int first_idx; + struct ss7_as_asp_assoc *assoc; - first_idx = (as->cfg.last_asp_idx_sent + 1) % ARRAY_SIZE(as->cfg.asps); - i = first_idx; - do { - asp = as->cfg.asps[i]; - if (asp && osmo_ss7_asp_active(asp)) - break; - i = (i + 1) % ARRAY_SIZE(as->cfg.asps); - } while (i != first_idx); - as->cfg.last_asp_idx_sent = i; - - return asp; + for (unsigned int i = 0; i < as->num_assoc_asps; i++) { + assoc = ss7_as_asp_assoc_llist_round_robin(as, &as->last_asp_idx_sent); + if (assoc && osmo_ss7_asp_active(assoc->asp)) + return assoc->asp; + } + return NULL; } /* Reset loadshare bindings table. It will be filled in as needed. @@ -437,7 +449,7 @@ void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as) { memset(&as->aesls_table[0], 0, sizeof(as->aesls_table)); - as->cfg.last_asp_idx_assigned = ARRAY_SIZE(as->cfg.asps) - 1; + as->last_asp_idx_assigned = NULL; } static as_ext_sls_t osmo_ss7_instance_calc_itu_as_ext_sls(const struct osmo_ss7_as *as, uint32_t opc, uint8_t sls) @@ -550,16 +562,15 @@ /* returns NULL if multiple ASPs would need to be selected. */ static struct osmo_ss7_asp *ss7_as_select_asp_broadcast(struct osmo_ss7_as *as) { - struct osmo_ss7_asp *asp; + struct ss7_as_asp_assoc *assoc; struct osmo_ss7_asp *asp_found = NULL; - for (unsigned int i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (!asp || !osmo_ss7_asp_active(asp)) + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (!osmo_ss7_asp_active(assoc->asp)) continue; if (asp_found) /* >1 ASPs selected, early return */ return NULL; - asp_found = asp; + asp_found = assoc->asp; } return asp_found; } diff --git a/src/ss7_as.h b/src/ss7_as.h index 252e863..db219e0 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -83,6 +83,13 @@ struct osmo_ss7_asp *alt_asp; }; +struct ss7_as_asp_assoc { + /* Entry in (struct osmo_ss7_as*)->assoc_asp_list */ + struct llist_head as_entry; + struct osmo_ss7_as *as; /* backpointer */ + struct osmo_ss7_asp *asp; /* backpointer */ +}; + struct osmo_ss7_as { /*! entry in 'ref osmo_ss7_instance.as_list */ struct llist_head list; @@ -118,6 +125,13 @@ } tcap; #endif /* WITH_TCAP_LOADSHARING */ + /* used for load-sharing traffic mode (round robin implementation) */ + struct ss7_as_asp_assoc *last_asp_idx_assigned; + struct ss7_as_asp_assoc *last_asp_idx_sent; + + struct llist_head assoc_asp_list; /* list of struct ss7_as_asp_assoc */ + unsigned int num_assoc_asps; /* amount of ss7_as_asp_assoc/ss7_asp in assoc_asp_list */ + struct { char *name; char *description; @@ -138,11 +152,6 @@ enum osmo_ss7_as_patch_sccp_mode sccp_mode; } pc_override; - struct osmo_ss7_asp *asps[16]; - /* used for load-sharing traffic mode (round robin implementation) */ - uint8_t last_asp_idx_assigned; - uint8_t last_asp_idx_sent; - struct { /* How many bits from ITU SLS field (starting from least-significant-bit) * to skip for routing decisions. @@ -159,7 +168,7 @@ struct { bool enabled; unsigned int timeout_s; - uint8_t last_asp_idx_sent; + struct ss7_as_asp_assoc *last_asp_idx_sent; } tcap; #endif /* WITH_TCAP_LOADSHARING */ } loadshare; @@ -169,11 +178,14 @@ enum osmo_ss7_asp_protocol proto); struct osmo_ss7_asp *ss7_as_select_asp(struct osmo_ss7_as *as, const struct xua_msg *xua); -unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as); int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp); int ss7_as_del_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp); int ss7_as_get_local_role(const struct osmo_ss7_as *as); void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as); +void ss7_as_del_asp_update_llist_round_robin(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp, struct ss7_as_asp_assoc **state); +#define ss7_as_asp_assoc_llist_round_robin(as, state) \ + ss7_llist_round_robin(&(as)->assoc_asp_list, (void **)state, struct ss7_as_asp_assoc, as_entry) + #define LOGPAS(as, subsys, level, fmt, args ...) \ _LOGSS7((as)->inst, subsys, level, "AS(%s) " fmt, (as)->cfg.name, ## args) diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index f92b6d7..2f59c3d 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -41,6 +41,7 @@ #ifdef WITH_TCAP_LOADSHARING #include "tcap_as_loadshare.h" #endif /* WITH_TCAP_LOADSHARING */ +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" @@ -468,7 +469,7 @@ void ss7_vty_write_one_as(struct vty *vty, struct osmo_ss7_as *as, bool show_dyn_config) { struct osmo_ss7_routing_key *rkey; - unsigned int i; + struct ss7_as_asp_assoc *assoc; /* skip any dynamically allocated AS definitions */ if ((as->rkm_dyn_allocated || as->simple_client_allocated) @@ -479,8 +480,8 @@ osmo_ss7_asp_protocol_name(as->cfg.proto), VTY_NEWLINE); if (as->cfg.description) vty_out(vty, " description %s%s", as->cfg.description, VTY_NEWLINE); - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; if (!asp) continue; /* skip any dynamically created ASPs (e.g. auto-created at connect time) */ diff --git a/src/ss7_combined_linkset.c b/src/ss7_combined_linkset.c index 0b6dd3c..9f53b7b 100644 --- a/src/ss7_combined_linkset.c +++ b/src/ss7_combined_linkset.c @@ -50,20 +50,6 @@ * link set) or of an alternative link set (combined link set)." *****************************************************************************/ -static inline struct llist_head *_ss7_llist_round_robin(struct llist_head *list, void **state) -{ - struct llist_head *e = *state; - if (!e || e->next == list) - e = list; - e = e->next; - if (e == list) - e = NULL; - *state = e; - return e; -} -#define ss7_llist_round_robin(list, state, struct_type, entry_name) \ - llist_entry(_ss7_llist_round_robin(list, state), struct_type, entry_name) - /*! \brief Insert combined_link into its routing table * \param[in] clset Combined link to be inserted into its routing table * \returns 0 on success, negative on error diff --git a/src/ss7_instance.c b/src/ss7_instance.c index b51f1b9..1c5e113 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -408,11 +408,11 @@ osmo_ss7_asp_find_by_proto(struct osmo_ss7_as *as, enum osmo_ss7_asp_protocol proto) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (as->cfg.asps[i] && as->cfg.asps[i]->cfg.proto == proto) - return as->cfg.asps[i]; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (assoc->asp->cfg.proto == proto) + return assoc->asp; } return NULL; diff --git a/src/ss7_internal.h b/src/ss7_internal.h index cfa092a..b70954e 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -4,6 +4,8 @@ #include <stdbool.h> #include <stdint.h> + +#include <osmocom/core/linuxlist.h> #include <osmocom/netif/stream.h> #include <osmocom/sigtran/osmo_ss7.h> @@ -28,5 +30,19 @@ int xua_tcp_segmentation_cb(struct msgb *msg); +static inline struct llist_head *_ss7_llist_round_robin(struct llist_head *list, void **state) +{ + struct llist_head *e = *state; + if (!e || e->next == list) + e = list; + e = e->next; + if (e == list) + e = NULL; + *state = e; + return e; +} +#define ss7_llist_round_robin(list, state, struct_type, entry_name) \ + llist_entry(_ss7_llist_round_robin(list, state), struct_type, entry_name) + /* VTY */ #define XUA_VAR_STR "(sua|m3ua|ipa)" diff --git a/src/ss7_route.c b/src/ss7_route.c index 713cc6a..7d22144 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -326,14 +326,12 @@ if (rt->dest.as) { struct osmo_ss7_as *as = rt->dest.as; - int i; APPEND(" via AS %s proto=%s", as->cfg.name, osmo_ss7_asp_protocol_name(as->cfg.proto)); if (list_asps) { - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - if (!asp) - continue; + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; APPEND(" ASP"); if (asp->cfg.name) APPEND(" %s", asp->cfg.name); diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c index 5c964ce..356a982 100644 --- a/src/tcap_as_loadshare.c +++ b/src/tcap_as_loadshare.c @@ -230,21 +230,13 @@ static struct osmo_ss7_asp *find_asp_no_tcap_range(struct osmo_ss7_as *as) { - struct osmo_ss7_asp *asp; - unsigned int i; - unsigned int first_idx; + struct ss7_as_asp_assoc *assoc; - first_idx = (as->cfg.loadshare.tcap.last_asp_idx_sent + 1) % ARRAY_SIZE(as->cfg.asps); - i = first_idx; - do { - asp = as->cfg.asps[i]; - if (asp && osmo_ss7_asp_active(asp) && asp->tcap.enabled) { - as->cfg.loadshare.tcap.last_asp_idx_sent = i; - return asp; - } - i = (i + 1) % ARRAY_SIZE(as->cfg.asps); - } while (i != first_idx); - + for (unsigned int i = 0; i < as->num_assoc_asps; i++) { + assoc = ss7_as_asp_assoc_llist_round_robin(as, &as->cfg.loadshare.tcap.last_asp_idx_sent); + if (assoc && osmo_ss7_asp_active(assoc->asp) && assoc->asp->tcap.enabled) + return assoc->asp; + } return NULL; } @@ -923,6 +915,8 @@ if (!asp->tcap.enabled) return; + /* Update round robin state */ + ss7_as_del_asp_update_llist_round_robin(as, asp, &as->cfg.loadshare.tcap.last_asp_idx_sent); _tcap_range_asp_down(as, asp); if (as->tcap.contains_pc || as->tcap.contains_ssn) tcap_range_as_update_pc_ssn(as); @@ -945,6 +939,7 @@ as->cfg.loadshare.tcap.enabled = false; as->tcap.contains_pc = false; as->tcap.contains_ssn = false; + as->cfg.loadshare.tcap.last_asp_idx_sent = NULL; tcap_trans_track_garbage_collect_stop(as); tcap_trans_track_entries_free_all(as); } diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 53e2c00..bdcd0d5 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -103,8 +103,9 @@ static int as_notify_all_asp(struct osmo_ss7_as *as, struct osmo_xlm_prim_notify *npar) { struct msgb *msg; - unsigned int i, sent = 0; + unsigned int sent = 0; const char *type_name, *info_name, *info_str; + struct ss7_as_asp_assoc *assoc; /* we don't send notify to IPA peers! */ if (as->cfg.proto == OSMO_SS7_ASP_PROT_IPA) @@ -117,11 +118,8 @@ type_name, info_name, info_str); /* iterate over all non-DOWN ASPs and send them the message */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - - if (!asp) - continue; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; /* NOTIFY are only sent by SG or IPSP role */ if (asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) @@ -165,7 +163,7 @@ int xua_as_transmit_msg_broadcast(struct osmo_ss7_as *as, struct xua_msg *xua) { struct osmo_ss7_asp *asp; - unsigned int i; + struct ss7_as_asp_assoc *assoc; struct msgb *msg; struct msgb *msg_cpy; bool sent = false; @@ -173,9 +171,9 @@ msg = xua_as_encode_msg(as, xua); OSMO_ASSERT(msg); - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (!asp || !osmo_ss7_asp_active(asp)) + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + asp = assoc->asp; + if (!osmo_ss7_asp_active(asp)) continue; msg_cpy = msgb_copy(msg, "xua_bcast_cpy"); if (osmo_ss7_asp_send(asp, msg_cpy) == 0) @@ -273,13 +271,10 @@ /* is any other ASP in this AS in state != DOWN? */ static bool check_any_other_asp_not_down(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - if (!asp) - continue; - + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; if (asp_cmp == asp) continue; @@ -293,13 +288,10 @@ /* is any other ASP in this AS in state ACTIVE? */ static bool check_any_other_asp_in_active(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - if (!asp) - continue; - + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; if (asp_cmp == asp) continue; @@ -316,7 +308,7 @@ * */ static void notify_any_other_active_asp_as_inactive(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp) { - unsigned int i; + struct ss7_as_asp_assoc *assoc; struct msgb *msg; struct osmo_xlm_prim_notify npar = { .status_type = M3UA_NOTIFY_T_OTHER, @@ -326,9 +318,9 @@ if (asp_cmp->remote_asp_id_present) npar.asp_id = asp_cmp->remote_asp_id; - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - if (!asp || !osmo_ss7_asp_active(asp)) + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp = assoc->asp; + if (!osmo_ss7_asp_active(asp)) continue; if (asp_cmp == asp) diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 5ae0d0f..32986fc 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1355,14 +1355,14 @@ { for (unsigned int sls = 0; sls <= 0x0f; sls++) { bool used = false; - for (unsigned i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (!as->cfg.asps[i]) + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + struct osmo_ss7_asp *asp_it = assoc->asp; + if (asp_it == asp) continue; - if (as->cfg.asps[i] == asp) + if (!asp_it->ipa.sls_assigned) continue; - if (!as->cfg.asps[i]->ipa.sls_assigned) - continue; - if (as->cfg.asps[i]->ipa.sls == sls) { + if (asp_it->ipa.sls == sls) { used = true; break; } diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index fb9ac1e..11dd32e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -160,9 +160,9 @@ struct osmo_ss7_as *as; llist_for_each_entry(as, &asp->inst->as_list, list) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - if (as->cfg.asps[i] == asp) + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (assoc->asp == asp) return as; } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?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: I149ab467899633ac50cba3e482b2cae02124279d Gerrit-Change-Number: 42105 Gerrit-PatchSet: 5 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

[S] Change in libosmo-sigtran[master]: tests/vty: Introduce testASPservesTonsOfAS
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42110?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: tests/vty: Introduce testASPservesTonsOfAS ...................................................................... tests/vty: Introduce testASPservesTonsOfAS Change-Id: I39016a479fde7d61b7c0f39ca769cd8c958b55b6 --- M tests/vty/vty_test_runner.py 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index f4ef7ed..253380a 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -188,6 +188,43 @@ self.assertTrue(self.vty.verify("no asp " + asp_name,[''])) self.assertTrue(self.vty.verify("no as " + as_name,[''])) + # Validate one ASP can be configured to serve tons of AS: + def testASPservesTonsOfAS(self): + self.vty.enable() + self.assertTrue(self.vty.verify("configure terminal",[''])) + self.assertTrue(self.vty.verify("cs7 instance 0",[''])) + asp_name = "asp-ASPservesTonsOfAS" + asp_node = "asp " + asp_name + " " + str(10000) + " " + "2905 m3ua" + self.assertTrue(self.vty.verify(asp_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-asp') + self.assertTrue(self.vty.verify("local-ip 127.0.0.1",[''])) + self.assertTrue(self.vty.verify("local-ip ::1",[''])) + self.assertTrue(self.vty.verify("remote-ip 127.0.0.9",[''])) + self.assertTrue(self.vty.verify("remote-ip ::2",[''])) + self.assertTrue(self.vty.verify("role sg",[''])) + self.assertTrue(self.vty.verify("sctp-role server",[''])) + self.assertTrue(self.vty.verify("no shutdown",[''])) + self.assertTrue(self.vty.verify("exit",["% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered"])) + num_of_as = 1000 + for i in range(num_of_as): + as_name = "as-ASPservesTonsOfAS" + str(i) + as_node = "as " + as_name + " m3ua" + self.assertTrue(self.vty.verify(as_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-as') + self.assertTrue(self.vty.verify("asp " + asp_name,[''])) + self.assertTrue(self.vty.verify("exit", [''])) + + # Now remove all of them: + for i in range(num_of_as): + as_name = "as-ASPservesTonsOfAS" + str(i) + as_node = "as " + as_name + " m3ua" + self.assertTrue(self.vty.verify(as_node,[''])) + self.assertEqual(self.vty.node(), 'config-cs7-as') + self.assertTrue(self.vty.verify("no asp " + asp_name,[''])) + self.assertTrue(self.vty.verify("exit", [''])) + self.assertTrue(self.vty.verify("no as " + as_name,[''])) + self.assertTrue(self.vty.verify("no asp " + asp_name,[''])) + if __name__ == '__main__': import argparse import sys -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42110?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: I39016a479fde7d61b7c0f39ca769cd8c958b55b6 Gerrit-Change-Number: 42110 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: ss7_as: Optimize ss7_as_asp_assoc_find()
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42112?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ss7_as: Optimize ss7_as_asp_assoc_find() ...................................................................... ss7_as: Optimize ss7_as_asp_assoc_find() Look for counterpart on the object with the shortest list, ie. convert from O(N) to O(min(N,M)). This way eg. if we have 100 ASPs on 1 AS, lookup time becomes O(1). Same if we have eg. 1 ASP serving 100 AS. Change-Id: I139aede15af6b6a77d19e6fcf6b6abe8ed6599a6 --- M src/ss7_as.c 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/ss7_as.c b/src/ss7_as.c index e22fc6c..1cc212f 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -243,8 +243,20 @@ const struct osmo_ss7_asp *asp) { struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { - if (assoc->asp == asp) + OSMO_ASSERT(as); + OSMO_ASSERT(asp); + + /* Optimization: Look for counterpart on the object with the shortest list: */ + if (as->num_assoc_asps <= asp->num_assoc_as) { + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (assoc->asp == asp) + return assoc; + } + return NULL; + } + + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + if (assoc->as == as) return assoc; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42112?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: I139aede15af6b6a77d19e6fcf6b6abe8ed6599a6 Gerrit-Change-Number: 42112 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 libosmo-sigtran[master]: asp: Introduce asp->assoc_as_list
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42111?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asp: Introduce asp->assoc_as_list ...................................................................... asp: Introduce asp->assoc_as_list This way we can iterate easily/quickly the AS served by a given ASP. This in turn allows simplifying some code since we cache the amount of AS served by the ASP at any time, so we save some counting. Related: SYS#6953 Change-Id: I1ca90748286374109dbb4277cbc7b2337ce2072a --- M src/ipa.c M src/sccp_instance.c M src/ss7_as.c M src/ss7_as.h M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/tcap_as_loadshare.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_internal.h M src/xua_shared.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 14 files changed, 77 insertions(+), 124 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/ipa.c b/src/ipa.c index 6cf7104..29dc5c0 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -169,22 +169,6 @@ return rc; } -struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as; - - /* in the IPA case, we assume there is a 1:1 mapping between the - * ASP and the AS. An AS without ASP means there is no - * connection, and an ASP without AS means that we don't (yet?) - * know the identity of the peer */ - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (osmo_ss7_as_has_asp(as, asp)) - return as; - } - return NULL; -} - /* Patch a SCCP message and add point codes to Called/Calling Party (if missing) */ static struct msgb *patch_sccp_with_pc(const struct osmo_ss7_asp *asp, const struct msgb *sccp_msg_in, uint32_t opc, uint32_t dpc) @@ -254,7 +238,7 @@ enum ipaccess_proto ipa_proto = osmo_ipa_msgb_cb_proto(msg); struct m3ua_data_hdr data_hdr; struct xua_msg *xua = NULL; - struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); + struct osmo_ss7_as *as = ss7_asp_get_first_as(asp); uint32_t opc, dpc; if (!as) { diff --git a/src/sccp_instance.c b/src/sccp_instance.c index 6388b4b..d6937d6 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -562,18 +562,6 @@ * Convenience function for CLIENT ***********************************************************************/ - /* Returns whether AS is already associated to any AS. - * Helper function for osmo_sccp_simple_client_on_ss7_id(). */ -static bool asp_serves_some_as(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as_i; - llist_for_each_entry(as_i, &asp->inst->as_list, list) { - if (osmo_ss7_as_has_asp(as_i, asp)) - return true; - } - return false; -} - /*! \brief request an sccp client instance * \param[in] ctx talloc context * \param[in] ss7_id of the SS7/CS7 instance @@ -695,7 +683,7 @@ llist_for_each_entry(asp_i, &ss7->asp_list, list) { if (asp_i->cfg.proto != prot) continue; - if (asp_serves_some_as(asp_i)) { + if (asp_i->num_assoc_as > 0) { /* This ASP is already on another AS. * If it was on this AS, we'd have found it above. */ continue; diff --git a/src/ss7_as.c b/src/ss7_as.c index 8a5c1a1..e22fc6c 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -65,7 +65,9 @@ assoc->as = as; assoc->asp = asp; llist_add_tail(&assoc->as_entry, &as->assoc_asp_list); + llist_add_tail(&assoc->asp_entry, &asp->assoc_as_list); as->num_assoc_asps++; + asp->num_assoc_as++; return assoc; } @@ -74,6 +76,8 @@ { llist_del(&assoc->as_entry); assoc->as->num_assoc_asps--; + llist_del(&assoc->asp_entry); + assoc->asp->num_assoc_as--; talloc_free(assoc); } diff --git a/src/ss7_as.h b/src/ss7_as.h index db219e0..2e7f484 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -86,6 +86,8 @@ struct ss7_as_asp_assoc { /* Entry in (struct osmo_ss7_as*)->assoc_asp_list */ struct llist_head as_entry; + /* Entry in (struct osmo_ss7_asp*)->assoc_as_list */ + struct llist_head asp_entry; struct osmo_ss7_as *as; /* backpointer */ struct osmo_ss7_asp *asp; /* backpointer */ }; diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 5e96519..9b8f164 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -742,6 +742,7 @@ } rate_ctr_group_set_name(asp->ctrg, name); asp->inst = inst; + INIT_LLIST_HEAD(&asp->assoc_as_list); /* ASP in "no shutdown" state by default: */ asp->cfg.adm_state = OSMO_SS7_ASP_ADM_S_ENABLED; ss7_asp_peer_init(&asp->cfg.remote); @@ -769,7 +770,7 @@ void osmo_ss7_asp_destroy(struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as, *as2; + struct ss7_as_asp_assoc *assoc, *assoc2; OSMO_ASSERT(ss7_initialized); LOGPASP(asp, DLSS7, LOGL_INFO, "Destroying ASP\n"); @@ -784,8 +785,8 @@ /* Unlink from all ASs we are part of. * Some RKM-dynamically allocated ASs may be freed as a result from this: */ - llist_for_each_entry_safe(as, as2, &asp->inst->as_list, list) - ss7_as_del_asp(as, asp); + llist_for_each_entry_safe(assoc, assoc2, &asp->assoc_as_list, asp_entry) + ss7_as_del_asp(assoc->as, asp); /* unlink from ss7_instance */ asp->inst = NULL; @@ -1552,13 +1553,12 @@ const struct osmo_ss7_as *excl_as, bool network_byte_order) { unsigned int count = 0; - struct osmo_ss7_as *as; + struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(as, &asp->inst->as_list, list) { + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + struct osmo_ss7_as *as = assoc->as; if (as == excl_as) continue; - if (!osmo_ss7_as_has_asp(as, asp)) - continue; if (as->cfg.routing_key.context == 0) continue; if (count >= rctx_size) @@ -1586,6 +1586,17 @@ return _ss7_asp_get_all_rctx(asp, rctx, rctx_size, excl_as, false); } +/* Get first AS in the ASP, or NULL if no AS associated. + * This is useful for instance in IPA code, where we assume only up to 1 AS is configured per ASP. */ +struct osmo_ss7_as *ss7_asp_get_first_as(const struct osmo_ss7_asp *asp) +{ + struct ss7_as_asp_assoc *assoc; + assoc = llist_first_entry_or_null(&asp->assoc_as_list, struct ss7_as_asp_assoc, asp_entry); + if (!assoc) + return NULL; + return assoc->as; +} + /* determine the osmo_ss7_as_traffic_mode to be used by this ASP; will * iterate over all AS configured for this ASP. If they're compatible, * a single traffic mode is returned as enum osmo_ss7_as_traffic_mode. @@ -1593,12 +1604,11 @@ * configured, -1 is returned */ int ss7_asp_determine_traf_mode(const struct osmo_ss7_asp *asp) { - const struct osmo_ss7_as *as; + const struct ss7_as_asp_assoc *assoc; int tmode = -1; - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + const struct osmo_ss7_as *as = assoc->as; /* we only care about traffic modes explicitly set */ if (!as->cfg.mode_set_by_vty) continue; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 80a0a8a..0d047cb 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -55,6 +55,9 @@ struct osmo_ss7_asp { /*! entry in \ref osmo_ss7_instance.asp_list */ struct llist_head list; + struct llist_head assoc_as_list; /* list of struct ss7_as_asp_assoc */ + unsigned int num_assoc_as; /* amount of ss7_as_asp_assoc/ss7_as in as_list */ + struct osmo_ss7_instance *inst; /*! ASP FSM */ @@ -187,6 +190,7 @@ const struct osmo_ss7_as *excl_as); unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, const struct osmo_ss7_as *excl_as); +struct osmo_ss7_as *ss7_asp_get_first_as(const struct osmo_ss7_asp *asp); int ss7_asp_determine_traf_mode(const struct osmo_ss7_asp *asp); diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 6731398..241863a 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -116,6 +116,24 @@ xua_tx_snm_daud(asp, rctx, num_rctx, &aff_pc, 1, "VTY"); } +static char *as_list_for_asp(const struct osmo_ss7_asp *asp, char *buf, size_t buf_len) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + const struct ss7_as_asp_assoc *assoc; + unsigned int count = 0; + + if (asp->num_assoc_as == 0) { + OSMO_STRBUF_PRINTF(sb, "?"); + return buf; + } + + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + OSMO_STRBUF_PRINTF(sb, "%s%s", count != 0 ? "," : "", assoc->as->cfg.name); + count++; + } + return buf; +} + DEFUN_ATTR(cs7_asp_audit, cs7_asp_audit_cmd, "cs7 instance <0-15> asp NAME audit point-code POINT_CODE", CS7_STR "Instance related commands\n" "SS7 Instance Number\n" @@ -232,7 +250,6 @@ struct osmo_ss7_instance *inst = vty->index; const char *name = argv[0]; struct osmo_ss7_asp *asp; - struct osmo_ss7_as *as; asp = osmo_ss7_asp_find_by_name(inst, name); if (!asp) { @@ -240,13 +257,12 @@ return CMD_WARNING; } - llist_for_each_entry(as, &inst->as_list, list) { - if (osmo_ss7_as_has_asp(as, asp)) { - vty_out(vty, "%% ASP '%s' currently configured in AS '%s'. " - "You must first remove the ASP from the AS configuration%s", - name, as->cfg.name, VTY_NEWLINE); - return CMD_WARNING; - } + if (asp->num_assoc_as > 0) { + char as_buf[512]; + vty_out(vty, "%% ASP '%s' currently configured in %u AS: '%s'. " + "You must first remove the ASP from the AS configuration%s", + name, asp->num_assoc_as, as_list_for_asp(asp, as_buf, sizeof(as_buf)), VTY_NEWLINE); + return CMD_WARNING; } osmo_ss7_asp_destroy(asp); @@ -871,24 +887,6 @@ } } -static char *as_list_for_asp(const struct osmo_ss7_asp *asp, char *buf, size_t buf_len) -{ - struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; - const struct osmo_ss7_as *as; - unsigned int count = 0; - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - OSMO_STRBUF_PRINTF(sb, "%s%s", count != 0 ? "," : "", as->cfg.name); - count++; - break; - } - - if (count == 0) - OSMO_STRBUF_PRINTF(sb, "?"); - return buf; -} - /* Similar to osmo_sock_multiaddr_get_name_buf(), but aimed at listening sockets (only local part): */ static char *get_sockname_buf(char *buf, size_t buf_len, int fd, int proto, bool local) { diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c index 356a982..9c969d3 100644 --- a/src/tcap_as_loadshare.c +++ b/src/tcap_as_loadshare.c @@ -716,7 +716,11 @@ goto out; } - as = ipa_find_as_for_asp(asp); + /* in the IPA case, we assume there is a 1:1 mapping between the + * ASP and the AS. An AS without ASP means there is no + * connection, and an ASP without AS means that we don't (yet?) + * know the identity of the peer */ + as = ss7_asp_get_first_as(asp); if (!as) { LOGPASP(asp, DLTCAP, LOGL_ERROR, "Rx message for IPA ASP without AS?!\n"); rc = -ENOENT; diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 32986fc..4204e31 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -394,14 +394,10 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; - struct osmo_ss7_instance *inst = asp->inst; - struct osmo_ss7_as *as; + struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(as, &inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - osmo_fsm_inst_dispatch(as->fi, event, data); - } + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) + osmo_fsm_inst_dispatch(assoc->as->fi, event, data); } /* check if expected message was received + stop t_ack */ @@ -483,17 +479,14 @@ static void common_asp_fsm_down_onenter(struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as, *as2; - struct osmo_ss7_instance *inst = asp->inst; + struct ss7_as_asp_assoc *assoc, *assoc2; /* First notify all AS associated to the ASP that it went down: */ dispatch_to_all_as(asp->fi, XUA_ASPAS_ASP_DOWN_IND, asp); /* Implicit clean up tasks: */ - llist_for_each_entry_safe(as, as2, &inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - + llist_for_each_entry_safe(assoc, assoc2, &asp->assoc_as_list, asp_entry) { + struct osmo_ss7_as *as = assoc->as; #ifdef WITH_TCAP_LOADSHARING tcap_as_del_asp(as, asp); #endif @@ -702,10 +695,9 @@ if (traf_mode) { /* if the peer has specified a traffic mode at all */ enum osmo_ss7_as_traffic_mode tmode = osmo_ss7_tmode_from_xua(traf_mode); - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + as = assoc->as; if (!as->cfg.mode_set_by_peer && !as->cfg.mode_set_by_vty) { as->cfg.mode = tmode; LOGPAS(as, DLSS7, LOGL_INFO, @@ -1531,7 +1523,7 @@ { struct osmo_fsm_inst *fi; struct ipa_asp_fsm_priv *iafp; - struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); + struct osmo_ss7_as *as = ss7_asp_get_first_as(asp); const char *unit_name; bool can_start = true; diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 11dd32e..1c8df3e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -155,21 +155,6 @@ #define ENSURE_SG_OR_IPSP(fi, event) \ ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_SG || _role == OSMO_SS7_ASP_ROLE_IPSP) -static struct osmo_ss7_as *find_first_as_in_asp(struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { - if (assoc->asp == asp) - return as; - } - } - - return NULL; -} - /* handle an incoming RKM registration response */ static int handle_reg_conf(struct osmo_fsm_inst *fi, uint32_t l_rk_id, uint32_t rctx) { @@ -358,7 +343,7 @@ lm_fsm_state_chg(fi, S_RKM_REG); prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); OSMO_ASSERT(prim); - as = find_first_as_in_asp(lmp->asp); + as = ss7_asp_get_first_as(lmp->asp); if (!as) { LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); ss7_asp_disconnect_stream(lmp->asp); diff --git a/src/xua_internal.h b/src/xua_internal.h index 81c8a1b..c8ae79f 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -147,7 +147,6 @@ struct msgb *ipa_to_msg(struct xua_msg *xua); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); -struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp); int osmo_isup_party_parse(char *out_digits, const uint8_t *in, unsigned int in_num_bytes, bool odd); diff --git a/src/xua_shared.c b/src/xua_shared.c index 022b8ed..0fa94c4 100644 --- a/src/xua_shared.c +++ b/src/xua_shared.c @@ -39,23 +39,6 @@ #include "ss7_internal.h" #include "xua_internal.h" -/* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as, *as_found = NULL; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - /* check if we already had found another AS within this ASP -> not unique */ - if (as_found) - return NULL; - as_found = as; - } - - return as_found; -} - /* this is why we can use the M3UA constants below in a function shared between M3UA + SUA */ osmo_static_assert(M3UA_ERR_INVAL_ROUT_CTX == SUA_ERR_INVAL_ROUT_CTX, _err_rctx); osmo_static_assert(M3UA_ERR_NO_CONFGD_AS_FOR_ASP == SUA_ERR_NO_CONFGD_AS_FOR_ASP, _err_as_for_asp); @@ -94,13 +77,13 @@ } } else { /* no explicit routing context; this only works if there is only one AS in the ASP */ - *as = find_single_as_for_asp(asp); - if (!*as) { + if (asp->num_assoc_as != 1) { LOGPASP(asp, log_ss, LOGL_ERROR, "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " "identify the AS for this message\n", __func__); return M3UA_ERR_INVAL_ROUT_CTX; } + *as = ss7_asp_get_first_as(asp); } return 0; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 61cbd66..72eb0de 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -657,7 +657,7 @@ No ASP named 'unknown-asp' found OsmoSTP(config-cs7)# no asp my-asp -% ASP 'my-asp' currently configured in AS 'my-ass'. You must first remove the ASP from the AS configuration +% ASP 'my-asp' currently configured in 1 AS: 'my-ass'. You must first remove the ASP from the AS configuration OsmoSTP(config-cs7)# as my-ass m3ua OsmoSTP(config-cs7-as)# no asp my-asp OsmoSTP(config-cs7-as)# exit diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 0cd0c39..1ff4e36 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -502,7 +502,7 @@ No ASP named 'unknown-asp' found ss7_asp_vty_test(config-cs7)# no asp my-asp -% ASP 'my-asp' currently configured in AS 'my-ass'. You must first remove the ASP from the AS configuration +% ASP 'my-asp' currently configured in 1 AS: 'my-ass'. You must first remove the ASP from the AS configuration ss7_asp_vty_test(config-cs7)# as my-ass m3ua ss7_asp_vty_test(config-cs7-as)# no asp my-asp ss7_asp_vty_test(config-cs7-as)# exit -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42111?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: I1ca90748286374109dbb4277cbc7b2337ce2072a Gerrit-Change-Number: 42111 Gerrit-PatchSet: 5 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

2026

2025

2024

2023

2022

gerrit-log February 2026