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

[S] Change in libosmo-sigtran[master]: xua_snm: assert for unexpected condition
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42103?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_snm: assert for unexpected condition ...................................................................... xua_snm: assert for unexpected condition The rx DUNA/DAVA/DUPU paths are already guarded at m3ua.c and sua.c to only call xua_snm_rx_{duna,dava,dupu}() in ASP role. Hence, calling those functions is expected to always happen in ASP role. Change-Id: I24bb335a2a856bf1a5ca255f7afbfe103ebcd86f --- M src/xua_snm.c 1 file changed, 3 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_snm.c b/src/xua_snm.c index f7d3192..916f6c3 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -494,9 +494,7 @@ int log_ss = osmo_ss7_asp_get_log_subsys(asp); OSMO_ASSERT(ie_aff_pc); - - if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) - return; + OSMO_ASSERT(asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP); LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUNA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); @@ -529,9 +527,7 @@ int log_ss = osmo_ss7_asp_get_log_subsys(asp); OSMO_ASSERT(ie_aff_pc); - - if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) - return; + OSMO_ASSERT(asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP); LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DAVA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); @@ -564,8 +560,7 @@ uint32_t cause_user; uint16_t cause, user; - if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) - return; + OSMO_ASSERT(asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP); switch (asp->cfg.proto) { case OSMO_SS7_ASP_PROT_M3UA: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42103?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: I24bb335a2a856bf1a5ca255f7afbfe103ebcd86f Gerrit-Change-Number: 42103 Gerrit-PatchSet: 3 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

[XS] Change in libosmo-sigtran[master]: sua: Support rx SCON in role=ASP
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42091?usp=email ) Change subject: sua: Support rx SCON in role=ASP ...................................................................... sua: Support rx SCON in role=ASP Change-Id: I1e4146c2cb8fab460d5e810b602c20293272c2e4 --- M src/sua.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sua.c b/src/sua.c index eccecdd..40b6e2f 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1015,6 +1015,8 @@ xua_snm_rx_dupu(asp, as, xua); break; case SUA_SNM_SCON: + xua_snm_rx_scon(asp, as, xua); + break; case SUA_SNM_DRST: LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA SNM message type %u\n", xua->hdr.msg_type); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42091?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: I1e4146c2cb8fab460d5e810b602c20293272c2e4 Gerrit-Change-Number: 42091 Gerrit-PatchSet: 2 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

[S] Change in libosmo-sigtran[master]: xua: Improve logging around unexpected snm messages
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42102?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: Improve logging around unexpected snm messages ...................................................................... xua: Improve logging around unexpected snm messages Log rx of unexpected message type according to configured role. Decrease verbosity of DAUD logging to match the new logging. For SUA we can use M3UA's m3ua_snm_msgt_names because the value/strings are the same and they are actually used through m3ua_msg_class_snm in xua_dialect_sua. Change-Id: I697e52dfd733cb9ee260bba133204a7462c4e8ee --- M src/m3ua.c M src/sua.c M src/xua_internal.h 3 files changed, 22 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index a2da98e..93659c7 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -181,7 +181,7 @@ static const uint16_t drst_mand_ies[] = { M3UA_IEI_AFFECTED_PC, 0 }; -static const struct value_string m3ua_snm_msgt_names[] = { +const struct value_string m3ua_snm_msgt_names[] = { { M3UA_SNM_DUNA, "DUNA" }, { M3UA_SNM_DAVA, "DAVA" }, { M3UA_SNM_DAUD, "DAUD" }, @@ -1060,15 +1060,17 @@ /* RFC states only permitted in ASP->SG direction, not reverse. But some * equipment still sends it to us as ASP ?!? */ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) { - LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD " + LOGPASP(asp, DLM3UA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD " "despite being in ASP role\n"); xua_snm_rx_daud(asp, xua); } else { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "DAUD not permitted in ASP role\n"); + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "DAUD not permitted in ASP role\n"); rc = M3UA_ERR_UNSUPP_MSG_TYPE; } break; default: + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in ASP role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); rc = M3UA_ERR_UNSUPP_MSG_TYPE; } @@ -1101,6 +1103,8 @@ xua_snm_rx_daud(asp, xua); break; default: + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in SG role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); return M3UA_ERR_UNSUPP_MSG_TYPE; } @@ -1131,16 +1135,18 @@ /* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some * equipment still sends it to us as IPSP ?!? */ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) { - LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD " + LOGPASP(asp, DLM3UA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD " "despite being in IPSP role\n"); xua_snm_rx_daud(asp, xua); } else { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "DAUD not permitted in IPSP role\n"); + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "DAUD not permitted in IPSP role\n"); rc = M3UA_ERR_UNSUPP_MSG_TYPE; } break; default: /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */ + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in IPSP role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); rc = M3UA_ERR_UNSUPP_MSG_TYPE; } diff --git a/src/sua.c b/src/sua.c index f836a9a..9ebe4c6 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1026,15 +1026,17 @@ /* RFC states only permitted in ASP->SG direction, not reverse. But some * equipment still sends it to us as ASP ?!? */ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) { - LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD " + LOGPASP(asp, DLSUA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD " "despite being in ASP role\n"); xua_snm_rx_daud(asp, xua); } else { - LOGPASP(asp, DLSUA, LOGL_ERROR, "DAUD not permitted in ASP role\n"); + LOGPASP(asp, DLSUA, LOGL_NOTICE, "DAUD not permitted in ASP role\n"); return SUA_ERR_UNSUPP_MSG_TYPE; } break; default: + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in ASP role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); return SUA_ERR_UNSUPP_MSG_TYPE; } @@ -1062,6 +1064,8 @@ xua_snm_rx_daud(asp, xua); break; default: + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in SG role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); return SUA_ERR_UNSUPP_MSG_TYPE; } @@ -1089,15 +1093,17 @@ /* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some * equipment still sends it to us as IPSP ?!? */ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) { - LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD " + LOGPASP(asp, DLSUA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD " "despite being in IPSP role\n"); xua_snm_rx_daud(asp, xua); } else { - LOGPASP(asp, DLSUA, LOGL_ERROR, "DAUD not permitted in IPSP role\n"); + LOGPASP(asp, DLSUA, LOGL_NOTICE, "DAUD not permitted in IPSP role\n"); rc = SUA_ERR_UNSUPP_MSG_TYPE; } break; default: + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in IPSP role\n", + get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type)); rc = M3UA_ERR_UNSUPP_MSG_TYPE; } diff --git a/src/xua_internal.h b/src/xua_internal.h index ebd1442..81c8a1b 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -91,6 +91,7 @@ extern const struct xua_msg_class m3ua_msg_class_aspsm; extern const struct xua_msg_class m3ua_msg_class_asptm; +extern const struct value_string m3ua_snm_msgt_names[]; extern const struct value_string m3ua_err_names[]; extern const struct value_string m3ua_ntfy_type_names[]; extern const struct value_string m3ua_ntfy_stchg_names[]; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42102?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: I697e52dfd733cb9ee260bba133204a7462c4e8ee Gerrit-Change-Number: 42102 Gerrit-PatchSet: 2 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

[S] Change in libosmo-sigtran[master]: sua: Support rx SCON in role=IPSP
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42093?usp=email ) Change subject: sua: Support rx SCON in role=IPSP ...................................................................... sua: Support rx SCON in role=IPSP Change-Id: I3f46b634084c1d71643812828d4f114ab45dffde --- M src/sua.c M src/xua_snm.c 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/sua.c b/src/sua.c index ceb5d7a..2eb93e3 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1068,6 +1068,30 @@ return rc; } +/* received SNM message on IPSP side */ +static int sua_rx_snm_ipsp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie; + int rc = 0; + + switch (xua->hdr.msg_type) { + case M3UA_SNM_SCON: + /* RFC3868 1.5.6: "The SUA layer at an ASP or IPSP MAY indicate local congestion to + * an SUA peer with an SCON message." */ + rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + xua_snm_rx_scon(asp, as, xua); + break; + default: + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return rc; +} + static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) { /* SNM only permitted in ACTIVE state */ @@ -1087,6 +1111,8 @@ return sua_rx_snm_sg(asp, xua); case OSMO_SS7_ASP_ROLE_ASP: return sua_rx_snm_asp(asp, xua); + case OSMO_SS7_ASP_ROLE_IPSP: + return sua_rx_snm_ipsp(asp, xua); default: return SUA_ERR_UNSUPP_MSG_CLASS; } diff --git a/src/xua_snm.c b/src/xua_snm.c index e983293..f7d3192 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -587,7 +587,7 @@ xua_snm_upu(as, aff_pc, user, cause, info_str); } -/* an incoming SUA/M3UA SCON was received from a remote SG */ +/* an incoming SUA/M3UA SCON was received from a remote ASP/SG/IPSP */ void xua_snm_rx_scon(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) { struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42093?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: I3f46b634084c1d71643812828d4f114ab45dffde Gerrit-Change-Number: 42093 Gerrit-PatchSet: 2 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

[S] Change in libosmo-sigtran[master]: sua: Support rx SCON in role=SG
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42092?usp=email ) Change subject: sua: Support rx SCON in role=SG ...................................................................... sua: Support rx SCON in role=SG Change-Id: Ide2b4f876ddbdb1bb0bfed11fad6fc13aaf1afda --- M src/sua.c 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/sua.c b/src/sua.c index 40b6e2f..ceb5d7a 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1044,7 +1044,20 @@ /* received SNM message on SG side */ static int sua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie; + int rc = 0; + switch (xua->hdr.msg_type) { + case M3UA_SNM_SCON: + /* RFC3868 1.5.6: "The SUA layer at an ASP or IPSP MAY indicate local congestion to + * an SUA peer with an SCON message." */ + rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + xua_snm_rx_scon(asp, as, xua); + break; case SUA_SNM_DAUD: /* Audit: ASP inquires about availability of Point Codes */ xua_snm_rx_daud(asp, xua); break; @@ -1052,7 +1065,7 @@ return SUA_ERR_UNSUPP_MSG_TYPE; } - return 0; + return rc; } static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42092?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: Ide2b4f876ddbdb1bb0bfed11fad6fc13aaf1afda Gerrit-Change-Number: 42092 Gerrit-PatchSet: 2 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

[XS] Change in libosmo-sigtran[master]: xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_A...
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?usp=email ) Change subject: xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_ACTIVE_REQ ...................................................................... xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_ACTIVE_REQ Sending that kind of event is up to the layer manager. Right now, all ASPs (except ipa_aspm_fsm, which doesn't need that event because there's no ACTIVATE in IPA) have an associated layer manager FSM, so that workaround is not needed. Change-Id: If6c2c5b6ffc4080320aadc550d823abc5d613d6f --- M src/xua_asp_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index d3a7410..5ae0d0f 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -571,10 +571,6 @@ osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0); /* inform layer manager */ send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM); - /* This hack should be in layer manager, but let's try - * to be smart in case there is no layer manager */ - if (!asp->lm) - osmo_fsm_inst_dispatch(fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; case XUA_ASP_E_ASPSM_ASPUP: /* only if role SG */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?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: If6c2c5b6ffc4080320aadc550d823abc5d613d6f Gerrit-Change-Number: 42090 Gerrit-PatchSet: 2 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_default_fsm: Support IPSP role
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email ) Change subject: xua_default_fsm: Support IPSP role ...................................................................... xua_default_fsm: Support IPSP role Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 --- M src/xua_default_lm_fsm.c 1 file changed, 66 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 3e364c1..fb9ac1e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -59,6 +59,9 @@ enum lm_event { LM_E_SCTP_EST_IND, LM_E_ASP_UP_CONF, + LM_E_ASP_UP_IND, + LM_E_ASP_ACT_IND, + LM_E_ASP_INACT_IND, LM_E_NOTIFY_IND, LM_E_AS_INACTIVE_IND, LM_E_AS_ACTIVE_IND, @@ -70,6 +73,9 @@ static const struct value_string lm_event_names[] = { { LM_E_SCTP_EST_IND, "SCTP-ESTABLISH.ind" }, { LM_E_ASP_UP_CONF, "ASP-UP.conf" }, + { LM_E_ASP_UP_IND, "ASP-UP.ind" }, + { LM_E_ASP_ACT_IND, "ASP-ACT.ind" }, + { LM_E_ASP_INACT_IND, "ASP-INACT.ind" }, { LM_E_NOTIFY_IND, "NOTIFY.ind" }, { LM_E_AS_INACTIVE_IND, "AS-INACTIVE.ind" }, { LM_E_AS_ACTIVE_IND, "AS-ACTIVE.ind" }, @@ -127,6 +133,28 @@ ((struct xua_layer_manager_default_priv *)(fi->priv))->asp->cfg.T_defs_lm, \ -1) +#define ENSURE_ROLE_COND(fi, event, cond) \ + do { \ + struct xua_layer_manager_default_priv *_lmp = fi->priv; \ + enum osmo_ss7_asp_role _role = _lmp->asp->cfg.role; \ + if (!(cond)) { \ + LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \ + "in role %s\n", \ + osmo_fsm_event_name(fi->fsm, event), \ + get_value_string(osmo_ss7_asp_role_names, _role));\ + return; \ + } \ + } while (0) + +#define ENSURE_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_IPSP) + +#define ENSURE_ASP_OR_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_ASP || _role == OSMO_SS7_ASP_ROLE_IPSP) + +#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; @@ -167,11 +195,13 @@ switch (event) { case LM_E_SCTP_EST_IND: - if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) { + if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP || + lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) { /* Try to transition to ASP-UP, wait to receive message for a few seconds */ lm_fsm_state_chg(fi, S_WAIT_ASP_UP); osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); } + /* role SG: Unimplemented, do nothing, stay in this state forever. */ break; } } @@ -180,10 +210,18 @@ { switch (event) { case LM_E_ASP_UP_CONF: + ENSURE_ASP_OR_IPSP(fi, event); /* ASP is up, wait for some time if any NOTIFY * indications about AS in this ASP are received */ lm_fsm_state_chg(fi, S_WAIT_NOTIFY); break; + case LM_E_ASP_UP_IND: + ENSURE_SG_OR_IPSP(fi, event); + /* ASP is up, wait for some time if any NOTIFY + * indications about AS in this ASP are received. + */ + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + break; } } @@ -193,7 +231,14 @@ struct osmo_xlm_prim *oxp = data; switch (event) { + case LM_E_ASP_UP_CONF: + ENSURE_ASP_OR_IPSP(fi, event); + /* in IPSP, we may receive a ASP-UP ACK for the ASP-UP we sent, + * _after_ we received the ASP-UP from the peer in state + * WAIT_ASP_UP. Ignore it. */ + break; case LM_E_NOTIFY_IND: + ENSURE_ASP_OR_IPSP(fi, event); OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_NOTIFY); OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); @@ -209,13 +254,18 @@ lm_fsm_state_chg(fi, S_ACTIVE); osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; + case LM_E_ASP_ACT_IND: + ENSURE_SG_OR_IPSP(fi, event); + lm_fsm_state_chg(fi, S_ACTIVE); + break; case LM_E_AS_INACTIVE_IND: /* we now know that an AS is associated with this ASP at * the SG, and that this AS is currently inactive */ /* request the ASP to go into active state (which * hopefully will bring the AS to active, too) */ lm_fsm_state_chg(fi, S_ACTIVE); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + if (lmp->asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; } }; @@ -253,6 +303,10 @@ struct osmo_xlm_prim *oxp; switch (event) { + case LM_E_ASP_ACT_IND: + /* This may come in IPSP if we received ASPAC from peer before it answered our ASPAC: */ + ENSURE_IPSP(fi, event); + break; case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state */ osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); @@ -337,7 +391,8 @@ .action = lm_idle, }, [S_WAIT_ASP_UP] = { - .in_event_mask = S(LM_E_ASP_UP_CONF), + .in_event_mask = S(LM_E_ASP_UP_CONF) | + S(LM_E_ASP_UP_IND), .out_state_mask = S(S_IDLE) | S(S_WAIT_NOTIFY), .name = "WAIT_ASP_UP", @@ -345,7 +400,9 @@ }, [S_WAIT_NOTIFY] = { .in_event_mask = S(LM_E_AS_INACTIVE_IND) | - S(LM_E_NOTIFY_IND), + S(LM_E_ASP_ACT_IND) | + S(LM_E_NOTIFY_IND) | + S(LM_E_ASP_UP_CONF), .out_state_mask = S(S_IDLE) | S(S_RKM_REG) | S(S_ACTIVE), @@ -360,7 +417,8 @@ .action = lm_rkm_reg, }, [S_ACTIVE] = { - .in_event_mask = S(LM_E_AS_INACTIVE_IND) | + .in_event_mask = S(LM_E_ASP_ACT_IND) | + S(LM_E_AS_INACTIVE_IND) | S(LM_E_NOTIFY_IND), .out_state_mask = S(S_IDLE), .name = "ACTIVE", @@ -373,6 +431,9 @@ { XUA_SAP_LM, OSMO_XLM_PRIM_M_SCTP_ESTABLISH, PRIM_OP_INDICATION, LM_E_SCTP_EST_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION, LM_E_SCTP_DISC_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM, LM_E_ASP_UP_CONF }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_INDICATION, LM_E_ASP_UP_IND }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_INDICATION, LM_E_ASP_ACT_IND }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_INACTIVE, PRIM_OP_INDICATION, LM_E_ASP_INACT_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_STATUS, PRIM_OP_INDICATION, LM_E_AS_STATUS_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_NOTIFY, PRIM_OP_INDICATION, LM_E_NOTIFY_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_INACTIVE, PRIM_OP_INDICATION, LM_E_AS_INACTIVE_IND }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?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: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 Gerrit-Change-Number: 42074 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: xua_as_fsm: Trigger PC (un)availability to upper layers in IPSP
by pespin 11 Feb '26

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42089?usp=email ) Change subject: xua_as_fsm: Trigger PC (un)availability to upper layers in IPSP ...................................................................... xua_as_fsm: Trigger PC (un)availability to upper layers in IPSP Same as done in ASP. This is specially important in IPSP in order to trigger availability/unavailability of PCs defined in the SCCP addressbook. Change-Id: I0e6015f04ad0647cc151d3c772355a18cb55547a --- M src/xua_as_fsm.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 092db55..53e2c00 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -523,6 +523,7 @@ switch (role) { case OSMO_SS7_ASP_ROLE_ASP: + case OSMO_SS7_ASP_ROLE_IPSP: if (s7i->sccp) { if (became_available) as_snm_pc_available(as); @@ -539,9 +540,6 @@ xua_snm_pc_available(as, &aff_pc, 1, NULL, became_available); } break; - case OSMO_SS7_ASP_ROLE_IPSP: - /* TODO */ - break; } }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42089?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: I0e6015f04ad0647cc151d3c772355a18cb55547a Gerrit-Change-Number: 42089 Gerrit-PatchSet: 1 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

[XS] Change in libosmo-sigtran[master]: cosmetic: ss7_asp.h: Drop comment no longer valid
by pespin 11 Feb '26

11 Feb '26

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?usp=email ) Change subject: cosmetic: ss7_asp.h: Drop comment no longer valid ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?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: I2253b1cb9e24270b9d6b3400d3fa20827c66ad23 Gerrit-Change-Number: 42104 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: sua: Support rx SCON in role=IPSP
by pespin 11 Feb '26

11 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42093?usp=email ) Change subject: sua: Support rx SCON in role=IPSP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42093?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: I3f46b634084c1d71643812828d4f114ab45dffde Gerrit-Change-Number: 42093 Gerrit-PatchSet: 2 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> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:59:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log February 2026