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

[XS] Change in libosmo-sigtran[master]: xua_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING
by pespin 31 Mar '26

31 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42558?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_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING ...................................................................... xua_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING Queueing of messags during T(r) (state PENDING) is already implemented, see xua_as_fsm_pending() further below in the same file. Change-Id: Ie572367493066039f7022250d94b815a4da5bd16 --- M src/xua_as_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 6828989..568834e 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -585,8 +585,6 @@ osmo_fsm_inst_state_chg(fi, XUA_AS_S_PENDING, 0, 0); /* Start T(r) */ osmo_timer_schedule(&xafp->recovery.t_r, MSEC_TO_S_US(recovery_msec)); - /* FIXME: Queue all signalling messages until - * recovery or T(r) expiry */ } break; case XUA_ASPAS_ASP_INACTIVE_IND: @@ -596,8 +594,6 @@ osmo_fsm_inst_state_chg(fi, XUA_AS_S_PENDING, 0, 0); /* Start T(r) */ osmo_timer_schedule(&xafp->recovery.t_r, MSEC_TO_S_US(recovery_msec)); - /* FIXME: Queue all signalling messages until - * recovery or T(r) expiry */ } else if (inact_ind_pars->asp_requires_notify) { fill_notify_statchg_pars(fi, &npar); tx_notify(inact_ind_pars->asp, &npar); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42558?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: Ie572367493066039f7022250d94b815a4da5bd16 Gerrit-Change-Number: 42558 Gerrit-PatchSet: 2 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>

1 0

[S] Change in libosmo-sigtran[master]: xua_asp_fsm: Include Routing Context IE in Err msg cuase Invalid Rout...
by pespin 31 Mar '26

31 Mar '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42537?usp=email ) Change subject: xua_asp_fsm: Include Routing Context IE in Err msg cuase Invalid Routing Context ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42537?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: Ia8bff16248967209d73cd6d5b54ac30fda283247 Gerrit-Change-Number: 42537 Gerrit-PatchSet: 3 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> Gerrit-Comment-Date: Tue, 31 Mar 2026 13:47:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: m3ua: m3ua_gen_error_msg(): include Routing Context IE in cause Inval...
by pespin 31 Mar '26

31 Mar '26

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42536?usp=email ) Change subject: m3ua: m3ua_gen_error_msg(): include Routing Context IE in cause Invalid Routing Context ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42536?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: If821109701e315d17f5334c680670ea6c7bce3bd Gerrit-Change-Number: 42536 Gerrit-PatchSet: 3 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 31 Mar 2026 13:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: xua_lm: Fix ending up from active to idle forever
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42565?usp=email ) Change subject: xua_lm: Fix ending up from active to idle forever ...................................................................... xua_lm: Fix ending up from active to idle forever Previous transition to S_IDLE was wrong, since there's no way to recover from that state unless the SCTP connection is closed. Instead, try harder waiting for some new notifications to try re-activating the ASP and see if the AS becomes active, or end up timing out and reconnecting to re-attempt complete set of steps. Change-Id: I5c97c0ede9c27c63f9259b43b7267a3d5d71681d --- M src/xua_default_lm_fsm.c 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/65/42565/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index a7e8d9c..6f25e17 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -310,11 +310,15 @@ break; case LM_E_NOTIFY_IND: oxp = data; + ENSURE_ASP_OR_IPSP(fi, event); OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_NOTIFY); OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); if (oxp->u.notify.status_type == M3UA_NOTIFY_T_STATCHG && - oxp->u.notify.status_info != M3UA_NOTIFY_I_AS_ACT) - lm_fsm_state_chg(fi, S_IDLE); + oxp->u.notify.status_info != M3UA_NOTIFY_I_AS_ACT) { + /* There not much we can do here, Go back to S_WAIT_NOTIFY to either wait for + * some notification to re-attempt, or end up timing out and reconnecting.*/ + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + } break; } } @@ -404,7 +408,8 @@ .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), + .out_state_mask = S(S_IDLE) | + S(S_WAIT_NOTIFY), .name = "ACTIVE", .action = lm_active, }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5c97c0ede9c27c63f9259b43b7267a3d5d71681d Gerrit-Change-Number: 42565 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: xua_lm: Use XLM SAP to send M-SCTP_RELEASE.req
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42563?usp=email ) Change subject: xua_lm: Use XLM SAP to send M-SCTP_RELEASE.req ...................................................................... xua_lm: Use XLM SAP to send M-SCTP_RELEASE.req Change-Id: I582855acaced48fb838700a3013f94bee7db75ad --- M src/xua_default_lm_fsm.c M src/xua_lm_sap.c 2 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/63/42563/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 3e36daf..a7e8d9c 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -278,12 +278,12 @@ oxp = data; if (oxp->u.rk_reg.status != M3UA_RKM_REG_SUCCESS) { LOGPFSML(fi, LOGL_NOTICE, "Received RKM_REG_RSP with negative result\n"); - ss7_asp_disconnect_stream(lmp->asp); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); } else { unsigned long timeout_sec; rc = handle_reg_conf(fi, oxp->u.rk_reg.key.l_rk_id, oxp->u.rk_reg.key.context); if (rc < 0) - ss7_asp_disconnect_stream(lmp->asp); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); /* RKM registration was successful, we can transition to WAIT_NOTIFY * state and assume that an NOTIFY/AS-INACTIVE arrives within * T_WAIT_NOTIFY_RKM seconds */ @@ -337,7 +337,7 @@ /* we have been waiting for the ASP to come up, but it * failed to do so */ LOGPFSML(fi, LOGL_NOTICE, "Peer didn't send any ASP_UP in time! Restarting ASP\n"); - ss7_asp_disconnect_stream(lmp->asp); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); break; case SS7_ASP_LM_T_WAIT_NOTIFY: if (lmp->asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_NO_NOTIFY) { @@ -356,11 +356,11 @@ case SS7_ASP_LM_T_WAIT_NOTIY_RKM: /* No AS has reported via NOTIFY even after dynamic RKM * configuration */ - ss7_asp_disconnect_stream(lmp->asp); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); break; case SS7_ASP_LM_T_WAIT_RK_REG_RESP: /* timeout of registration of routing key */ - ss7_asp_disconnect_stream(lmp->asp); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); break; } return 0; diff --git a/src/xua_lm_sap.c b/src/xua_lm_sap.c index 50f142f..05ed9d0 100644 --- a/src/xua_lm_sap.c +++ b/src/xua_lm_sap.c @@ -143,6 +143,10 @@ osmo_xlm_prim_name(&prim->oph)); switch (OSMO_PRIM_HDR(&prim->oph)) { + case OSMO_PRIM(OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST): + /* Layer Manager asks us to release an SCTP association with the peer */ + ss7_asp_disconnect_stream(asp); + break; case OSMO_PRIM(OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_REQUEST): /* Layer Manager asks us to send an ASPUP REQ */ osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I582855acaced48fb838700a3013f94bee7db75ad Gerrit-Change-Number: 42563 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: sigtran_sap.h: Fix comment stating RK(DE)_REG prims are not implemented
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42564?usp=email ) Change subject: sigtran_sap.h: Fix comment stating RK(DE)_REG prims are not implemented ...................................................................... sigtran_sap.h: Fix comment stating RK(DE)_REG prims are not implemented Change-Id: I81a4df1a826fed2f24a4c7ca410b514b1251b44d --- M include/osmocom/sigtran/sigtran_sap.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/64/42564/1 diff --git a/include/osmocom/sigtran/sigtran_sap.h b/include/osmocom/sigtran/sigtran_sap.h index f0e623d..161d0e1 100644 --- a/include/osmocom/sigtran/sigtran_sap.h +++ b/include/osmocom/sigtran/sigtran_sap.h @@ -27,7 +27,7 @@ OSMO_XLM_PRIM_M_AS_ACTIVE, OSMO_XLM_PRIM_M_AS_INACTIVE, OSMO_XLM_PRIM_M_AS_DOWN, - /* optional as per spec, not implemented yet */ + /* optional as per spec: */ OSMO_XLM_PRIM_M_RK_REG, OSMO_XLM_PRIM_M_RK_DEREG, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42564?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I81a4df1a826fed2f24a4c7ca410b514b1251b44d Gerrit-Change-Number: 42564 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_lm: Handle M-Error.ind
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42566?usp=email ) Change subject: xua_lm: Handle M-Error.ind ...................................................................... xua_lm: Handle M-Error.ind Change-Id: I5bdba1ab09084b3eafcb8b4aaa9c9762b15e8583 --- M src/xua_default_lm_fsm.c 1 file changed, 45 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/66/42566/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 6f25e17..dbca526 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -64,6 +64,7 @@ LM_E_ASP_ACT_IND, LM_E_ASP_INACT_IND, LM_E_NOTIFY_IND, + LM_E_ERROR_IND, LM_E_AS_INACTIVE_IND, LM_E_AS_ACTIVE_IND, LM_E_AS_STATUS_IND, @@ -78,6 +79,7 @@ { LM_E_ASP_ACT_IND, "ASP-ACT.ind" }, { LM_E_ASP_INACT_IND, "ASP-INACT.ind" }, { LM_E_NOTIFY_IND, "NOTIFY.ind" }, + { LM_E_ERROR_IND, "ERROR.ind" }, { LM_E_AS_INACTIVE_IND, "AS-INACTIVE.ind" }, { LM_E_AS_ACTIVE_IND, "AS-ACTIVE.ind" }, { LM_E_AS_STATUS_IND, "AS-STATUS.ind" }, @@ -205,6 +207,8 @@ static void lm_wait_asp_up(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + const struct osmo_xlm_prim *oxp = data; + switch (event) { case LM_E_ASP_UP_CONF: ENSURE_ASP_OR_IPSP(fi, event); @@ -219,6 +223,16 @@ */ lm_fsm_state_chg(fi, S_WAIT_NOTIFY); break; + case LM_E_ERROR_IND: + ENSURE_ASP_OR_IPSP(fi, event); + OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_ERROR); + OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); + /* Our ASPUP was most probably rejected by peer with an M3UA ERR. + * Log the issue and let the SS7_ASP_LM_T_WAIT_ASP_UP timer timeout in a while and + * then attempt again */ + LOGPFSML(fi, LOGL_NOTICE, "Received M-ERROR.ind with error code %u (%s)\n", + oxp->u.error.code, get_value_string(m3ua_err_names, oxp->u.error.code)); + break; } } @@ -270,12 +284,11 @@ static void lm_rkm_reg(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_layer_manager_default_priv *lmp = fi->priv; - struct osmo_xlm_prim *oxp; + struct osmo_xlm_prim *oxp = data; int rc; switch (event) { case LM_E_RKM_REG_CONF: - oxp = data; if (oxp->u.rk_reg.status != M3UA_RKM_REG_SUCCESS) { LOGPFSML(fi, LOGL_NOTICE, "Received RKM_REG_RSP with negative result\n"); xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_REQUEST); @@ -291,13 +304,24 @@ osmo_fsm_inst_state_chg(fi, S_WAIT_NOTIFY, timeout_sec, SS7_ASP_LM_T_WAIT_NOTIY_RKM); } break; + case LM_E_ERROR_IND: + ENSURE_ASP_OR_IPSP(fi, event); + OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_ERROR); + OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); + /* Our RKM_REQ REQ was most probably rejected by peer with an M3UA ERR. + * Go back to Wait Notify to either wait for some notificaiton to re-attempt, + * or end up timing out and reconnecting. */ + LOGPFSML(fi, LOGL_NOTICE, "Received M-ERROR.ind with error code %u (%s)\n", + oxp->u.error.code, get_value_string(m3ua_err_names, oxp->u.error.code)); + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + break; } } static void lm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_layer_manager_default_priv *lmp = fi->priv; - struct osmo_xlm_prim *oxp; + struct osmo_xlm_prim *oxp = data; switch (event) { case LM_E_ASP_ACT_IND: @@ -309,7 +333,6 @@ xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); break; case LM_E_NOTIFY_IND: - oxp = data; ENSURE_ASP_OR_IPSP(fi, event); OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_NOTIFY); OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); @@ -320,6 +343,17 @@ lm_fsm_state_chg(fi, S_WAIT_NOTIFY); } break; + case LM_E_ERROR_IND: + ENSURE_ASP_OR_IPSP(fi, event); + OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_ERROR); + OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); + /* Our ASPAC was most probably rejected by peer with an M3UA ERR. + * Go back to Wait Notify to either wait for some notificaiton to re-attempt, + * or end up timing out and reconnecting. */ + LOGPFSML(fi, LOGL_NOTICE, "Received M-ERROR.ind with error code %u (%s)\n", + oxp->u.error.code, get_value_string(m3ua_err_names, oxp->u.error.code)); + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + break; } } @@ -380,7 +414,8 @@ }, [S_WAIT_ASP_UP] = { .in_event_mask = S(LM_E_ASP_UP_CONF) | - S(LM_E_ASP_UP_IND), + S(LM_E_ASP_UP_IND) | + S(LM_E_ERROR_IND), .out_state_mask = S(S_IDLE) | S(S_WAIT_NOTIFY), .name = "WAIT_ASP_UP", @@ -398,7 +433,8 @@ .action = lm_wait_notify, }, [S_RKM_REG] = { - .in_event_mask = S(LM_E_RKM_REG_CONF), + .in_event_mask = S(LM_E_RKM_REG_CONF) | + S(LM_E_ERROR_IND), .out_state_mask = S(S_IDLE) | S(S_WAIT_NOTIFY), .name = "RKM_REG", @@ -407,7 +443,8 @@ [S_ACTIVE] = { .in_event_mask = S(LM_E_ASP_ACT_IND) | S(LM_E_AS_INACTIVE_IND) | - S(LM_E_NOTIFY_IND), + S(LM_E_NOTIFY_IND) | + S(LM_E_ERROR_IND), .out_state_mask = S(S_IDLE) | S(S_WAIT_NOTIFY), .name = "ACTIVE", @@ -425,6 +462,7 @@ { 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_ERROR, PRIM_OP_INDICATION, LM_E_ERROR_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_INACTIVE, PRIM_OP_INDICATION, LM_E_AS_INACTIVE_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_ACTIVE, PRIM_OP_INDICATION, LM_E_AS_ACTIVE_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_CONFIRM, LM_E_RKM_REG_CONF }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5bdba1ab09084b3eafcb8b4aaa9c9762b15e8583 Gerrit-Change-Number: 42566 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: xua_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING
by pespin 31 Mar '26

31 Mar '26

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42558?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: xua_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING ...................................................................... xua_as_fsm: Remove FIXME regarding queueing of msgs during state PENDING Queueing of messags during T(r) (state PENDING) is already implemented, see xua_as_fsm_pending() further below in the same file. Change-Id: Ie572367493066039f7022250d94b815a4da5bd16 --- M src/xua_as_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/58/42558/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42558?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie572367493066039f7022250d94b815a4da5bd16 Gerrit-Change-Number: 42558 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: m3ua: m3ua_gen_error_msg(): include Routing Context IE in cause Inval...
by pespin 31 Mar '26

31 Mar '26

Attention is currently required from: laforge, osmith. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42536?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: m3ua: m3ua_gen_error_msg(): include Routing Context IE in cause Invalid Routing Context ...................................................................... m3ua: m3ua_gen_error_msg(): include Routing Context IE in cause Invalid Routing Context As per RFC4666 3.8.1: """ The "Invalid Routing Context" error is sent if a message is received from a peer with an invalid (unconfigured) Routing Context value. For this error, the invalid Routing Context(s) MUST be included in the Error message." """ Hence add the originating Routing Context IE so the error message can be further identified. For the same reason, also add the Diagnostic Information for the specific cases in the switch statement, and make them more robust about possible null pointer dereference. Change-Id: If821109701e315d17f5334c680670ea6c7bce3bd --- M src/m3ua.c 1 file changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/36/42536/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42536?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If821109701e315d17f5334c680670ea6c7bce3bd Gerrit-Change-Number: 42536 Gerrit-PatchSet: 3 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in libosmo-sigtran[master]: xua_lm: Use XLM SAP to send M-ASP_{UP, ACTIVE}.req
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42562?usp=email ) Change subject: xua_lm: Use XLM SAP to send M-ASP_{UP, ACTIVE}.req ...................................................................... xua_lm: Use XLM SAP to send M-ASP_{UP, ACTIVE}.req Change-Id: I5850d9ec9092ff3d099627856697a4184b0d5853 --- M src/xua_default_lm_fsm.c M src/xua_lm_sap.c M src/xua_lm_sap.h 3 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/62/42562/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 9a3cb69..3e36daf 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -196,7 +196,7 @@ 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); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_REQUEST); } /* role SG: Unimplemented, do nothing, stay in this state forever. */ break; @@ -249,7 +249,7 @@ break; lm_fsm_state_chg(fi, S_ACTIVE); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); break; case LM_E_ASP_ACT_IND: ENSURE_SG_OR_IPSP(fi, event); @@ -262,7 +262,7 @@ * hopefully will bring the AS to active, too) */ lm_fsm_state_chg(fi, S_ACTIVE); 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); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); break; } }; @@ -306,7 +306,7 @@ 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); + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); break; case LM_E_NOTIFY_IND: oxp = data; diff --git a/src/xua_lm_sap.c b/src/xua_lm_sap.c index 9eb1c60..50f142f 100644 --- a/src/xua_lm_sap.c +++ b/src/xua_lm_sap.c @@ -35,6 +35,7 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sigtran_sap.h> +#include "xua_asp_fsm.h" #include "xua_internal.h" #include "ss7_asp.h" @@ -142,6 +143,14 @@ osmo_xlm_prim_name(&prim->oph)); switch (OSMO_PRIM_HDR(&prim->oph)) { + case OSMO_PRIM(OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_REQUEST): + /* Layer Manager asks us to send an ASPUP REQ */ + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); + break; + case OSMO_PRIM(OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST): + /* Layer Manager asks us to send an ASPAC REQ */ + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + break; case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST): /* Layer Manager asks us to send a Routing Key Reg Request */ xua_rkm_send_reg_req(asp, &prim->u.rk_reg.key, prim->u.rk_reg.traf_mode); @@ -159,3 +168,13 @@ msgb_free(prim->oph.msg); return 0; } + +/* wrapper around osmo_xlm_sap_down for primitives without data */ +int xlm_sap_down_simple(struct osmo_ss7_asp *asp, + enum osmo_xlm_prim_type prim_type, + enum osmo_prim_operation op) +{ + struct osmo_xlm_prim *prim = xua_xlm_prim_alloc(prim_type, op); + OSMO_ASSERT(prim); + return osmo_xlm_sap_down(asp, &prim->oph); +} diff --git a/src/xua_lm_sap.h b/src/xua_lm_sap.h index 3609eb2..01fe6fc 100644 --- a/src/xua_lm_sap.h +++ b/src/xua_lm_sap.h @@ -22,3 +22,7 @@ void xua_asp_send_xlm_prim_simple(struct osmo_ss7_asp *asp, enum osmo_xlm_prim_type prim_type, enum osmo_prim_operation op); + +int xlm_sap_down_simple(struct osmo_ss7_asp *asp, + enum osmo_xlm_prim_type prim_type, + enum osmo_prim_operation op); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5850d9ec9092ff3d099627856697a4184b0d5853 Gerrit-Change-Number: 42562 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026