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

[S] Change in libosmo-sigtran[master]: cosmetic: xua_asp_fsm: Fix wrong indentation
by pespin 01 Apr '26

01 Apr '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42572?usp=email ) Change subject: cosmetic: xua_asp_fsm: Fix wrong indentation ...................................................................... cosmetic: xua_asp_fsm: Fix wrong indentation Change-Id: I21c13ff7bc67c060e739eae38088ac00700680de --- M src/xua_asp_fsm.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/72/42572/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index bb163a0..39d121f 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -918,12 +918,12 @@ } if (asp->cfg.role == OSMO_SS7_ASP_ROLE_SG) { /* RFC4666 4.3.4.4: Transmit unsolicited ASPIA ACK no tnotify peer. - * "If the ASP receives an ASP Inactive Ack without having sent an - * ASP Inactive message, the ASP should now consider itself to be - * in the ASP-INACTIVE state. If the ASP was previously in the - * ASP-ACTIVE state, the ASP should then initiate procedures to - * return itself to its previous state." - */ + * "If the ASP receives an ASP Inactive Ack without having sent an + * ASP Inactive message, the ASP should now consider itself to be + * in the ASP-INACTIVE state. If the ASP was previously in the + * ASP-ACTIVE state, the ASP should then initiate procedures to + * return itself to its previous state." + */ xua_asp_tx_unsolicited_aspia_ack(asp); /* transition state and inform layer manager */ osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42572?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: I21c13ff7bc67c060e739eae38088ac00700680de Gerrit-Change-Number: 42572 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: Support administrative block in role ASP
by pespin 01 Apr '26

01 Apr '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42573?usp=email ) Change subject: Support administrative block in role ASP ...................................................................... Support administrative block in role ASP Change-Id: If32902575e874d2acc9a5fc12509af42ed151739 --- M src/ss7_asp_vty.c M src/xua_default_lm_fsm.c 2 files changed, 17 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/73/42573/1 diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index e3c82fe..89fb949 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -714,11 +714,6 @@ return CMD_WARNING; } - if (asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) { - vty_out(vty, "%% 'block' not yet implemented in 'role asp'%s", VTY_NEWLINE); - return CMD_WARNING; - } - ss7_asp_set_blocked(asp, true); return CMD_SUCCESS; } diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index f9f5cd4..773d6f2 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -199,6 +199,10 @@ static bool asp_act_needed(const struct osmo_ss7_asp *asp) { + /* Avoid activating if ASP is adminsitratively blocked locally: */ + if (asp->cfg.adm_state.blocked) + return false; + /* Don't change active ASP if there's already one active in the AS. */ if (ss7_asp_determine_traf_mode(asp) == OSMO_SS7_AS_TMOD_OVERRIDE) { struct ss7_as_asp_assoc *assoc; @@ -210,6 +214,13 @@ return true; } +static void submit_m_asp_active_req_if_needed(struct osmo_ss7_asp *asp) +{ + if (!asp_act_needed(asp)) + return; + xlm_sap_down_simple(asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); +} + static void lm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { @@ -342,10 +353,8 @@ struct xua_layer_manager_default_priv *lmp = fi->priv; if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP || - lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) { - if (asp_act_needed(lmp->asp)) - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); - } + lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) + submit_m_asp_active_req_if_needed(lmp->asp); } static void lm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -366,16 +375,14 @@ break; case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state if needed */ - if (asp_act_needed(lmp->asp)) - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + submit_m_asp_active_req_if_needed(lmp->asp); 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); /* request the ASP to go into active state if needed */ - if (asp_act_needed(lmp->asp)) - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + submit_m_asp_active_req_if_needed(lmp->asp); break; case LM_E_ERROR_IND: ENSURE_ASP_OR_IPSP(fi, event); @@ -409,7 +416,7 @@ * peer's ASP became administratively blocked. * Try to re-activate, if peer's ASP is indeed blocked we'll probably receive an * ERR msg and continue from there in the case LM_E_ERROR_IND below. */ - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + submit_m_asp_active_req_if_needed(lmp->asp); break; case LM_E_ASP_INACT_IND: ENSURE_SG_OR_IPSP(fi, event); @@ -417,7 +424,7 @@ break; case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state */ - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + submit_m_asp_active_req_if_needed(lmp->asp); break; case LM_E_NOTIFY_IND: ENSURE_ASP_OR_IPSP(fi, event); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42573?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: If32902575e874d2acc9a5fc12509af42ed151739 Gerrit-Change-Number: 42573 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 01 Apr '26

01 Apr '26

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, but someone else must approve 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 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5bdba1ab09084b3eafcb8b4aaa9c9762b15e8583 Gerrit-Change-Number: 42566 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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_asp_fsm: Stop T(ack) when receiving an Error msg as response
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42568?usp=email ) Change subject: xua_asp_fsm: Stop T(ack) when receiving an Error msg as response ...................................................................... xua_asp_fsm: Stop T(ack) when receiving an Error msg as response There's no need to keep retrying retransmission if the peer already told us something is wrong with the message. Change-Id: Icaeb472fe67911eb15755442cf11010d3c593f1d --- M src/m3ua.c M src/xua_asp_fsm.c M src/xua_asp_fsm.h 3 files changed, 26 insertions(+), 8 deletions(-) Approvals: fixeria: 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/m3ua.c b/src/m3ua.c index 2dd8dfb..a22a64a 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -694,15 +694,13 @@ static int m3ua_rx_mgmt_err(struct osmo_ss7_asp *asp, struct xua_msg *xua) { uint32_t err_code = xua_msg_get_u32(xua, M3UA_IEI_ERR_CODE); - struct osmo_xlm_prim *prim; LOGPASP(asp, DLM3UA, LOGL_ERROR, "Received MGMT_ERR '%s': %s\n", get_value_string(m3ua_err_names, err_code), xua_msg_dump(xua, &xua_dialect_m3ua)); - /* report this to layer manager */ - prim = xua_xlm_prim_alloc_m_error_ind(err_code); - xua_asp_send_xlm_prim(asp, prim); + /* deliver that event to the ASP FSM */ + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_MGMT_ERROR, xua); /* NEVER return != 0 here, as we cannot respont to an ERR * message with another ERR! */ diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 946418c..bb163a0 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -74,6 +74,8 @@ { XUA_ASP_E_ASPSM_BEAT, "ASPSM_BEAT" }, { XUA_ASP_E_ASPSM_BEAT_ACK, "ASPSM_BEAT_ACK" }, + { XUA_ASP_E_MGMT_ERROR, "XUA_ASP_E_MGMT_ERROR" }, + { XUA_ASP_E_AS_ASSIGNED, "AS_ASSIGNED" }, { XUA_ASP_E_ADM_BLOCKED, "ADM_BLOCKED" }, @@ -374,6 +376,12 @@ } /* check if expected message was received + stop t_ack */ +static void stop_t_ack(struct osmo_fsm_inst *fi) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + LOGPFSML(fi, LOGL_DEBUG, "T(ack) stopped\n"); + osmo_timer_del(&xafp->t_ack.timer); +} static void check_stop_t_ack(struct osmo_fsm_inst *fi, uint32_t event) { struct xua_asp_fsm_priv *xafp = fi->priv; @@ -383,10 +391,8 @@ return; exp_ack = evt_ack_map[xafp->t_ack.out_event]; - if (exp_ack && event == exp_ack) { - LOGPFSML(fi, LOGL_DEBUG, "T(ack) stopped\n"); - osmo_timer_del(&xafp->t_ack.timer); - } + if (exp_ack && event == exp_ack) + stop_t_ack(fi); } static void xua_t_beat_stop(struct osmo_fsm_inst *fi) @@ -875,6 +881,7 @@ struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; struct xua_msg *xua; + struct osmo_xlm_prim *oxp; switch (event) { case XUA_ASP_E_SCTP_COMM_DOWN_IND: @@ -892,6 +899,15 @@ LOGPFSML(fi, LOGL_DEBUG, "Rx HEARTBEAT ACK\n"); xafp->t_beat.unacked_beats = 0; break; + case XUA_ASP_E_MGMT_ERROR: + xua = data; + OSMO_ASSERT(xua); + /* Mark ongoing request as rejected, no need to retransmit: */ + stop_t_ack(fi); + /* report this to layer manager */ + oxp = xua_xlm_prim_alloc_m_error_ind(xua_msg_get_u32(xua, M3UA_IEI_ERR_CODE)); + xua_asp_send_xlm_prim(asp, oxp); + break; case XUA_ASP_E_AS_ASSIGNED: /* Ignore, only used in IPA asps so far. */ break; @@ -1000,6 +1016,7 @@ S(XUA_ASP_E_SCTP_RESTART_IND) | S(XUA_ASP_E_ASPSM_BEAT) | S(XUA_ASP_E_ASPSM_BEAT_ACK) | + S(XUA_ASP_E_MGMT_ERROR) | S(XUA_ASP_E_AS_ASSIGNED) | S(XUA_ASP_E_ADM_BLOCKED), .allstate_action = xua_asp_allstate, diff --git a/src/xua_asp_fsm.h b/src/xua_asp_fsm.h index 52d5f4b..456aec6 100644 --- a/src/xua_asp_fsm.h +++ b/src/xua_asp_fsm.h @@ -28,6 +28,9 @@ XUA_ASP_E_ASPSM_BEAT, XUA_ASP_E_ASPSM_BEAT_ACK, + /* Rx M3UA MGMT Error message from peer */ + XUA_ASP_E_MGMT_ERROR, + /* The ASP was added to an AS. data: (struct osmo_ss7_as *) */ XUA_ASP_E_AS_ASSIGNED, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42568?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: Icaeb472fe67911eb15755442cf11010d3c593f1d Gerrit-Change-Number: 42568 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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_lm: Handle rx of unsolicited ASPIA ACK
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42569?usp=email ) Change subject: xua_lm: Handle rx of unsolicited ASPIA ACK ...................................................................... xua_lm: Handle rx of unsolicited ASPIA ACK Related: OS#6752 Change-Id: Ica4fbaefd08cdb5c4ca2e2a608606ddbec85297c --- M src/xua_default_lm_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index dbca526..dbe88e1 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -62,6 +62,7 @@ LM_E_ASP_UP_CONF, LM_E_ASP_UP_IND, LM_E_ASP_ACT_IND, + LM_E_ASP_INACT_CONF, LM_E_ASP_INACT_IND, LM_E_NOTIFY_IND, LM_E_ERROR_IND, @@ -77,6 +78,7 @@ { 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_CONF, "ASP-INACT.conf" }, { LM_E_ASP_INACT_IND, "ASP-INACT.ind" }, { LM_E_NOTIFY_IND, "NOTIFY.ind" }, { LM_E_ERROR_IND, "ERROR.ind" }, @@ -328,6 +330,14 @@ /* This may come in IPSP if we received ASPAC from peer before it answered our ASPAC: */ ENSURE_IPSP(fi, event); break; + case LM_E_ASP_INACT_CONF: + ENSURE_ASP_OR_IPSP(fi, event); + /* RFC 4666 RFC4666 4.3.4.4: Rx unsolicited ASPIA ACK, usually triggered because + * peer's ASP became administratively blocked. + * Try to re-activate, if peer's ASP is indeed blocked we'll probably receive an + * ERR msg and continue from there in the case LM_E_ERROR_IND below. */ + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + break; case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state */ xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); @@ -442,6 +452,7 @@ }, [S_ACTIVE] = { .in_event_mask = S(LM_E_ASP_ACT_IND) | + S(LM_E_ASP_INACT_CONF) | S(LM_E_AS_INACTIVE_IND) | S(LM_E_NOTIFY_IND) | S(LM_E_ERROR_IND), @@ -459,6 +470,7 @@ { 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_CONFIRM, LM_E_ASP_INACT_CONF }, { 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 }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42569?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: Ica4fbaefd08cdb5c4ca2e2a608606ddbec85297c Gerrit-Change-Number: 42569 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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_rkm: send_reg_req: Avoid adding Routing Context with value 0
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42567?usp=email ) Change subject: xua_rkm: send_reg_req: Avoid adding Routing Context with value 0 ...................................................................... xua_rkm: send_reg_req: Avoid adding Routing Context with value 0 We use routing context 0 internally as "no routing context". Since the Routing Context in the Routing KEy IE in RKM REG REQ is optional, if local rctx is 0 (because we expect to get one allocated by the STP and receive it through RKM REG RESP), avoid sending it with the value 0. Change-Id: Iaa584fea3020af06951aea16e638ac6e6a84ae21 --- M src/xua_rkm.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 2e7c227..16b494b 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -120,13 +120,18 @@ { struct msgb *msg = m3ua_msgb_alloc(__func__); int tmod = osmo_ss7_tmode_to_xua(traf_mode); + uint16_t outter_len; /* One individual Registration Request according to Chapter 3.6.1 */ msgb_put_u16(msg, M3UA_IEI_ROUT_KEY); /* outer IEI */ - msgb_put_u16(msg, 32 + 4); /* outer length */ + outter_len = 24 + 4; + if (rkey->context > 0) + outter_len += 8; + msgb_put_u16(msg, outter_len); /* outer length */ /* nested IEIs */ msgb_t16l16vp_put_u32(msg, M3UA_IEI_LOC_RKEY_ID, rkey->l_rk_id); - msgb_t16l16vp_put_u32(msg, M3UA_IEI_ROUTE_CTX, rkey->context); + if (rkey->context > 0) + msgb_t16l16vp_put_u32(msg, M3UA_IEI_ROUTE_CTX, rkey->context); msgb_t16l16vp_put_u32(msg, M3UA_IEI_TRAF_MODE_TYP, tmod); msgb_t16l16vp_put_u32(msg, M3UA_IEI_DEST_PC, rkey->pc); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42567?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: Iaa584fea3020af06951aea16e638ac6e6a84ae21 Gerrit-Change-Number: 42567 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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]: Use osmo_ss7_asp_active() in several places
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42570?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: Use osmo_ss7_asp_active() in several places ...................................................................... Use osmo_ss7_asp_active() in several places Change-Id: I172e691cb61ac68e2410b44e124737f7a4dd2775 --- M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_rkm.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index a22a64a..243f5b9 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -1166,7 +1166,7 @@ int rc; /* SNM only permitted in ACTIVE state */ - if (asp->fi->state != XUA_ASP_S_ACTIVE) { + if (!osmo_ss7_asp_active(asp)) { if (asp->fi->state == XUA_ASP_S_INACTIVE && asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_SNM_INACTIVE) { LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk snm_inactive active: " diff --git a/src/sua.c b/src/sua.c index 9ebe4c6..b169d50 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1113,7 +1113,7 @@ static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) { /* SNM only permitted in ACTIVE state */ - if (asp->fi->state != XUA_ASP_S_ACTIVE) { + if (!osmo_ss7_asp_active(asp)) { if (asp->fi->state == XUA_ASP_S_INACTIVE && asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_SNM_INACTIVE) { LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk snm_inactive active: " "Accepting SSNM in state %s\n", osmo_fsm_inst_state_name(asp->fi)); diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 568834e..0ba1b2a 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -296,7 +296,7 @@ if (asp_cmp == asp) continue; - if (asp->fi && asp->fi->state == XUA_ASP_S_ACTIVE) + if (osmo_ss7_asp_active(asp)) return true; } diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 16b494b..92fbdac 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -420,7 +420,7 @@ } /* Reject if ASP is still active */ - if (asp->fi->state == XUA_ASP_S_ACTIVE) { + if (osmo_ss7_asp_active(asp)) { msgb_append_dereg_res(resp, M3UA_RKM_DEREG_ERR_ASP_ACTIVE, 0); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42570?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: I172e691cb61ac68e2410b44e124737f7a4dd2775 Gerrit-Change-Number: 42570 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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 asp block: SG: turn asp inactive when administratively blocked
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42559?usp=email ) Change subject: xua asp block: SG: turn asp inactive when administratively blocked ...................................................................... xua asp block: SG: turn asp inactive when administratively blocked This commit intentionally leaves aside implementing active->inactive transition for asps with role ASP/(active) IPSP. Change-Id: If8e34cfb05b8b63173b8bb01a520c058daf1fe39 --- M src/ss7_asp.c M src/xua_asp_fsm.c M src/xua_asp_fsm.h 3 files changed, 48 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 96e8759..23a9b66 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1540,6 +1540,9 @@ asp->cfg.adm_state.blocked ? "" : "no ", blocked ? "" : "no "); asp->cfg.adm_state.blocked = blocked; + + if (asp->cfg.adm_state.blocked) + osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_ADM_BLOCKED, NULL); } /* Apply sane configs for unconfigured options and restart the ASP. */ diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 7ee3fd1..8ac31f6 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -74,6 +74,7 @@ { XUA_ASP_E_ASPSM_BEAT_ACK, "ASPSM_BEAT_ACK" }, { XUA_ASP_E_AS_ASSIGNED, "AS_ASSIGNED" }, + { XUA_ASP_E_ADM_BLOCKED, "ADM_BLOCKED" }, { IPA_ASP_E_ID_RESP, "IPA_CCM_ID_RESP" }, { IPA_ASP_E_ID_GET, "IPA_CCM_ID_GET" }, @@ -212,6 +213,24 @@ return cnt; } +static int xua_asp_tx_unsolicited_aspia_ack(struct osmo_ss7_asp *asp) +{ + struct msgb *msg; + struct xua_msg *xua = xua_msg_alloc(); + + OSMO_ASSERT(xua); + + xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_INACTIVE_ACK); + xua_msg_add_asp_rctx(xua, asp); + + msg = xua_to_msg(SUA_VERSION, xua); + xua_msg_free(xua); + if (!msg) + return -1; + + return osmo_ss7_asp_send(asp, msg); +} + /* ask the xUA implementation to transmit a specific message */ static int peer_send(struct osmo_fsm_inst *fi, int out_event, struct xua_msg *in) { @@ -893,6 +912,7 @@ static void xua_asp_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; struct xua_msg *xua; switch (event) { @@ -914,6 +934,26 @@ case XUA_ASP_E_AS_ASSIGNED: /* Ignore, only used in IPA asps so far. */ break; + case XUA_ASP_E_ADM_BLOCKED: + if (fi->state != XUA_ASP_S_ACTIVE) { + /* nothing to be done, ASPAC will be rejected when received. */ + return; + } + if (asp->cfg.role == OSMO_SS7_ASP_ROLE_SG) { + /* RFC4666 4.3.4.4: Transmit unsolicited ASPIA ACK no tnotify peer. + * "If the ASP receives an ASP Inactive Ack without having sent an + * ASP Inactive message, the ASP should now consider itself to be + * in the ASP-INACTIVE state. If the ASP was previously in the + * ASP-ACTIVE state, the ASP should then initiate procedures to + * return itself to its previous state." + */ + xua_asp_tx_unsolicited_aspia_ack(asp); + /* transition state and inform layer manager */ + osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0); + send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_INACTIVE, PRIM_OP_INDICATION); + } + /* TODO: implement ASP and IPSP roles. */ + break; default: break; } @@ -999,7 +1039,8 @@ S(XUA_ASP_E_SCTP_RESTART_IND) | S(XUA_ASP_E_ASPSM_BEAT) | S(XUA_ASP_E_ASPSM_BEAT_ACK) | - S(XUA_ASP_E_AS_ASSIGNED), + S(XUA_ASP_E_AS_ASSIGNED) | + S(XUA_ASP_E_ADM_BLOCKED), .allstate_action = xua_asp_allstate, .cleanup = xua_asp_fsm_cleanup, }; diff --git a/src/xua_asp_fsm.h b/src/xua_asp_fsm.h index 61a43a1..52d5f4b 100644 --- a/src/xua_asp_fsm.h +++ b/src/xua_asp_fsm.h @@ -31,6 +31,9 @@ /* The ASP was added to an AS. data: (struct osmo_ss7_as *) */ XUA_ASP_E_AS_ASSIGNED, + /* The ASP became administratively blocked */ + XUA_ASP_E_ADM_BLOCKED, + /* IPA specific */ IPA_ASP_E_ID_RESP, IPA_ASP_E_ID_ACK, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42559?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: If8e34cfb05b8b63173b8bb01a520c058daf1fe39 Gerrit-Change-Number: 42559 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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_lm: Use XLM SAP to send M-ASP_{UP, ACTIVE}.req
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve 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 6d870d6..8e89afb 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5850d9ec9092ff3d099627856697a4184b0d5853 Gerrit-Change-Number: 42562 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: Move xUA<->LM SAP logic to its own file
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42561?usp=email ) Change subject: Move xUA<->LM SAP logic to its own file ...................................................................... Move xUA<->LM SAP logic to its own file Right now it's difficult to grasp what's implemented of the SAP since it was scattered around several places. Put all the SAP forwarding logic into its own file so it's easy to follow and extend (eg. adding new helper functions, etc.) Change-Id: I93d74dd7f6ea8f2e60a8bc41be15362e433e8962 --- M src/Makefile.am M src/m3ua.c M src/ss7_asp.c M src/ss7_xua_srv.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_internal.h A src/xua_lm_sap.c A src/xua_lm_sap.h M src/xua_rkm.c 10 files changed, 206 insertions(+), 98 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index 2ef226f..d8b42f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,6 +30,7 @@ tcap_trans_tracking.h \ xua_asp_fsm.h \ xua_as_fsm.h \ + xua_lm_sap.h \ xua_internal.h \ xua_msg.h \ xua_types.h \ @@ -92,6 +93,7 @@ xua_asp_fsm.c \ xua_as_fsm.c \ xua_default_lm_fsm.c \ + xua_lm_sap.c \ xua_msg.c \ xua_rkm.c \ xua_shared.c \ diff --git a/src/m3ua.c b/src/m3ua.c index d982eeb..2dd8dfb 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -49,6 +49,7 @@ #include "ss7_asp.h" #include "ss7_internal.h" #include "xua_msg.h" +#include "xua_lm_sap.h" #define M3UA_MSGB_SIZE 1500 @@ -700,8 +701,7 @@ xua_msg_dump(xua, &xua_dialect_m3ua)); /* report this to layer manager */ - prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_ERROR, PRIM_OP_INDICATION); - prim->u.error.code = err_code; + prim = xua_xlm_prim_alloc_m_error_ind(err_code); xua_asp_send_xlm_prim(asp, prim); /* NEVER return != 0 here, as we cannot respont to an ERR @@ -724,9 +724,8 @@ ntfy.info_string ? ntfy.info_string : ""); /* report this to layer manager */ - prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_NOTIFY, PRIM_OP_INDICATION); - prim->u.notify = ntfy; - xua_asp_send_xlm_prim(asp,prim); + prim = xua_xlm_prim_alloc_m_notify_ind(&ntfy); + xua_asp_send_xlm_prim(asp, prim); if (ntfy.info_string) talloc_free(ntfy.info_string); diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 23a9b66..b33187c 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -59,6 +59,7 @@ #include "ss7_xua_srv.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" +#include "xua_lm_sap.h" static int _setsockopt_peer_primary_addr(int fd, const struct osmo_sockaddr *saddr) { @@ -1655,30 +1656,3 @@ } 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) -{ - struct osmo_xlm_prim *prim = (struct osmo_xlm_prim *) oph; - - LOGPASP(asp, DLSS7, LOGL_DEBUG, "Received XUA Layer Manager Primitive: %s)\n", - osmo_xlm_prim_name(&prim->oph)); - - switch (OSMO_PRIM_HDR(&prim->oph)) { - 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); - break; - case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_REQUEST): - /* Layer Manager asks us to send a Routing Key De-Reg Request */ - xua_rkm_send_dereg_req(asp, prim->u.rk_dereg.route_ctx); - break; - default: - LOGPASP(asp, DLSS7, LOGL_ERROR, "Unknown XUA Layer Manager Primitive: %s\n", - osmo_xlm_prim_name(&prim->oph)); - break; - } - - msgb_free(prim->oph.msg); - return 0; -} diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 11e0d0b..0d095ee 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -55,6 +55,7 @@ #include "ss7_internal.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" +#include "xua_lm_sap.h" #include "ss7_xua_srv.h" /*********************************************************************** diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 8ac31f6..946418c 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -36,6 +36,7 @@ #include "sccp_internal.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" +#include "xua_lm_sap.h" #include "xua_internal.h" #ifdef WITH_TCAP_LOADSHARING @@ -103,46 +104,6 @@ } t_beat; }; -struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, - enum osmo_prim_operation op) -{ - struct osmo_xlm_prim *prim; - struct msgb *msg = msgb_alloc_headroom(2048+128, 128, "xua_asp-xlm msgb"); - if (!msg) - return NULL; - - prim = (struct osmo_xlm_prim *) msgb_put(msg, sizeof(*prim)); - osmo_prim_init(&prim->oph, XUA_SAP_LM, prim_type, op, msg); - - return prim; -} - -/* Send a XUA LM Primitive to the XUA Layer Manager (LM) */ -void xua_asp_send_xlm_prim(struct osmo_ss7_asp *asp, struct osmo_xlm_prim *prim) -{ - const struct osmo_xua_layer_manager *lm = asp->lm; - - if (lm && lm->prim_cb) - lm->prim_cb(&prim->oph, asp); - else { - LOGPFSML(asp->fi, LOGL_DEBUG, "No Layer Manager, dropping %s\n", - osmo_xlm_prim_name(&prim->oph)); - } - - msgb_free(prim->oph.msg); -} - -/* wrapper around send_xlm_prim for primitives without data */ -void xua_asp_send_xlm_prim_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); - if (!prim) - return; - xua_asp_send_xlm_prim(asp, prim); -} - static void send_xlm_prim_simple(struct osmo_fsm_inst *fi, enum osmo_xlm_prim_type prim_type, enum osmo_prim_operation op) diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index d526f74..9a3cb69 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -37,6 +37,7 @@ #include "xua_internal.h" #include "xua_asp_fsm.h" +#include "xua_lm_sap.h" #include "ss7_as.h" #include "ss7_asp.h" #include "ss7_xua_srv.h" @@ -178,12 +179,9 @@ { struct ss7_as_asp_assoc *assoc; llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { - struct osmo_ss7_as *as = assoc->as; struct osmo_xlm_prim *prim; - prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); - OSMO_ASSERT(prim); - prim->u.rk_reg.key = as->cfg.routing_key; - prim->u.rk_reg.traf_mode = as->cfg.mode; + prim = xua_xlm_prim_alloc_m_rk_reg_req(&assoc->as->cfg.routing_key, + assoc->as->cfg.mode); osmo_xlm_sap_down(asp, &prim->oph); } } diff --git a/src/xua_internal.h b/src/xua_internal.h index c8ae79f..3857a72 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -103,14 +103,6 @@ const struct xua_msg *xua); int m3ua_rx_rkm(struct osmo_ss7_asp *asp, struct xua_msg *xua); -struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, - enum osmo_prim_operation op); - -void xua_asp_send_xlm_prim(struct osmo_ss7_asp *asp, struct osmo_xlm_prim *prim); -void xua_asp_send_xlm_prim_simple(struct osmo_ss7_asp *asp, - enum osmo_xlm_prim_type prim_type, - enum osmo_prim_operation op); - void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available); diff --git a/src/xua_lm_sap.c b/src/xua_lm_sap.c new file mode 100644 index 0000000..6d870d6 --- /dev/null +++ b/src/xua_lm_sap.c @@ -0,0 +1,161 @@ +/* M3UA/SUA <-> XUA Layer Manager SAP, RFC466 1.6.3 & RFC3868 1.6.3 */ +/* (C) 2017-2021 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* The idea of this default Layer Manager is as follows: + * - we wait until a SCTP connection is established + * - we issue the ASP-UP request and wait for the ASP being in UP state + * - we wait if we receive a M-NOTIFY indication about any AS in this ASP + * - if that's not received, we use RKM to register a routing context + * for our locally configured ASP and expect a positive registration + * result as well as a NOTIFY indication about AS-ACTIVE afterwards. + */ + +#include <errno.h> + +#include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/prim.h> +#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/sigtran_sap.h> + +#include "xua_internal.h" +#include "ss7_asp.h" + + +struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, + enum osmo_prim_operation op) +{ + struct osmo_xlm_prim *prim; + struct msgb *msg = msgb_alloc_headroom(2048+128, 128, "xua_asp-xlm msgb"); + if (!msg) + return NULL; + + prim = (struct osmo_xlm_prim *) msgb_put(msg, sizeof(*prim)); + osmo_prim_init(&prim->oph, XUA_SAP_LM, prim_type, op, msg); + + return prim; +} + +/* M-RK_REG request */ +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_reg_req(const struct osmo_ss7_routing_key *rkey, + enum osmo_ss7_as_traffic_mode mode) +{ + struct osmo_xlm_prim *prim; + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); + OSMO_ASSERT(prim); + prim->u.rk_reg.key = *rkey; + prim->u.rk_reg.traf_mode = mode; + return prim; +} + +/* M-RK_REG confirm */ +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_reg_cfm(const struct osmo_ss7_routing_key *rkey, uint32_t status) +{ + struct osmo_xlm_prim *prim; + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_CONFIRM); + OSMO_ASSERT(prim); + prim->u.rk_reg.key = *rkey; + prim->u.rk_reg.status = status; + return prim; +} + +/* M-RK_DEREG confirm */ +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_dereg_cfm(uint32_t route_ctx, uint32_t status) +{ + struct osmo_xlm_prim *prim; + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_CONFIRM); + OSMO_ASSERT(prim); + prim->u.rk_dereg.route_ctx = route_ctx; + prim->u.rk_dereg.status = status; + return prim; +} + +/* M-ERROR indication */ +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_error_ind(uint32_t err_code) +{ + struct osmo_xlm_prim *prim; + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_ERROR, PRIM_OP_INDICATION); + OSMO_ASSERT(prim); + prim->u.error.code = err_code; + return prim; +} + +/* M-NOTIFY indication */ +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_notify_ind(const struct osmo_xlm_prim_notify *ntfy) +{ + struct osmo_xlm_prim *prim; + prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_NOTIFY, PRIM_OP_INDICATION); + OSMO_ASSERT(prim); + prim->u.notify = *ntfy; + return prim; +} + +/* Send a XUA LM Primitive from M3UA/SUA to the XUA Layer Manager (LM) */ +void xua_asp_send_xlm_prim(struct osmo_ss7_asp *asp, struct osmo_xlm_prim *prim) +{ + const struct osmo_xua_layer_manager *lm = asp->lm; + + if (lm && lm->prim_cb) + lm->prim_cb(&prim->oph, asp); + else { + LOGPFSML(asp->fi, LOGL_DEBUG, "No Layer Manager, dropping %s\n", + osmo_xlm_prim_name(&prim->oph)); + } + + msgb_free(prim->oph.msg); +} + +/* wrapper around send_xlm_prim for primitives without data */ +void xua_asp_send_xlm_prim_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); + if (!prim) + return; + xua_asp_send_xlm_prim(asp, prim); +} + +/* process a primitive from the xUA Layer Manager (LM) to M3UA/SUA */ +int osmo_xlm_sap_down(struct osmo_ss7_asp *asp, struct osmo_prim_hdr *oph) +{ + struct osmo_xlm_prim *prim = (struct osmo_xlm_prim *) oph; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Received XUA Layer Manager Primitive: %s)\n", + osmo_xlm_prim_name(&prim->oph)); + + switch (OSMO_PRIM_HDR(&prim->oph)) { + 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); + break; + case OSMO_PRIM(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_REQUEST): + /* Layer Manager asks us to send a Routing Key De-Reg Request */ + xua_rkm_send_dereg_req(asp, prim->u.rk_dereg.route_ctx); + break; + default: + LOGPASP(asp, DLSS7, LOGL_ERROR, "Unknown XUA Layer Manager Primitive: %s\n", + osmo_xlm_prim_name(&prim->oph)); + break; + } + + msgb_free(prim->oph.msg); + return 0; +} diff --git a/src/xua_lm_sap.h b/src/xua_lm_sap.h new file mode 100644 index 0000000..3609eb2 --- /dev/null +++ b/src/xua_lm_sap.h @@ -0,0 +1,24 @@ +/* M3UA/SUA <-> XUA Layer Manager SAP, RFC466 1.6.3 & RFC3868 1.6.3 */ +#pragma once + +#include <unistd.h> +#include <stdint.h> + +#include <osmocom/core/tdef.h> +#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/sigtran_sap.h> + +struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, + enum osmo_prim_operation op); +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_reg_req(const struct osmo_ss7_routing_key *rkey, + enum osmo_ss7_as_traffic_mode mode); +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_reg_cfm(const struct osmo_ss7_routing_key *rkey, + uint32_t status); +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_rk_dereg_cfm(uint32_t route_ctx, uint32_t status); +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_error_ind(uint32_t err_code); +struct osmo_xlm_prim *xua_xlm_prim_alloc_m_notify_ind(const struct osmo_xlm_prim_notify *ntfy); + +void xua_asp_send_xlm_prim(struct osmo_ss7_asp *asp, struct osmo_xlm_prim *prim); +void xua_asp_send_xlm_prim_simple(struct osmo_ss7_asp *asp, + enum osmo_xlm_prim_type prim_type, + enum osmo_prim_operation op); diff --git a/src/xua_rkm.c b/src/xua_rkm.c index f3136e4..2e7c227 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -36,6 +36,7 @@ #include "xua_internal.h" #include "xua_as_fsm.h" #include "xua_asp_fsm.h" +#include "xua_lm_sap.h" const struct value_string m3ua_rkm_reg_status_vals[] = { { M3UA_RKM_REG_SUCCESS, "SUCCESS" }, @@ -465,6 +466,7 @@ static int handle_rkey_reg_resp(struct osmo_ss7_asp *asp, struct xua_msg *inner) { struct osmo_xlm_prim *oxp; + struct osmo_ss7_routing_key rkey; if (!xua_msg_find_tag(inner, M3UA_IEI_LOC_RKEY_ID) || !xua_msg_find_tag(inner, M3UA_IEI_REG_STATUS) || @@ -474,13 +476,11 @@ return -1; } - oxp = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_CONFIRM); - if (!oxp) - return -1; - - oxp->u.rk_reg.key.l_rk_id = xua_msg_get_u32(inner, M3UA_IEI_LOC_RKEY_ID); - oxp->u.rk_reg.key.context = xua_msg_get_u32(inner, M3UA_IEI_ROUTE_CTX); - oxp->u.rk_reg.status = xua_msg_get_u32(inner, M3UA_IEI_REG_STATUS); + rkey = (struct osmo_ss7_routing_key){ + .l_rk_id = xua_msg_get_u32(inner, M3UA_IEI_LOC_RKEY_ID), + .context = xua_msg_get_u32(inner, M3UA_IEI_ROUTE_CTX), + }; + oxp = xua_xlm_prim_alloc_m_rk_reg_cfm(&rkey, xua_msg_get_u32(inner, M3UA_IEI_REG_STATUS)); LOGPASP(asp, DLSS7, LOGL_INFO, "Received RKM REG RES rctx=%u status=%s\n", oxp->u.rk_reg.key.context, @@ -528,12 +528,8 @@ return -1; } - oxp = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_DEREG, PRIM_OP_CONFIRM); - if (!oxp) - return -1; - - oxp->u.rk_dereg.route_ctx = xua_msg_get_u32(inner, M3UA_IEI_ROUTE_CTX); - oxp->u.rk_dereg.status = xua_msg_get_u32(inner, M3UA_IEI_DEREG_STATUS); + oxp = xua_xlm_prim_alloc_m_rk_dereg_cfm(xua_msg_get_u32(inner, M3UA_IEI_ROUTE_CTX), + xua_msg_get_u32(inner, M3UA_IEI_DEREG_STATUS)); LOGPASP(asp, DLSS7, LOGL_INFO, "Received RKM DEREG RES rctx=%u status=%s\n", oxp->u.rk_reg.key.context, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42561?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: I93d74dd7f6ea8f2e60a8bc41be15362e433e8962 Gerrit-Change-Number: 42561 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log April 2026