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

[S] Change in libosmo-sigtran[master]: xua_lm: Handle rx of unsolicited ASPIA ACK
by pespin 01 Apr '26

01 Apr '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42569?usp=email ) Change subject: xua_lm: Handle rx of unsolicited ASPIA ACK ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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 posted comments on this change by pespin. ( 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 ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

01 Apr '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42566?usp=email ) Change subject: xua_lm: Handle M-Error.ind ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:43 +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 01 Apr '26

01 Apr '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42565?usp=email ) Change subject: xua_lm: Fix ending up from active to idle forever ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5c97c0ede9c27c63f9259b43b7267a3d5d71681d Gerrit-Change-Number: 42565 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

01 Apr '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42563?usp=email ) Change subject: xua_lm: Use XLM SAP to send M-SCTP_RELEASE.req ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I582855acaced48fb838700a3013f94bee7db75ad Gerrit-Change-Number: 42563 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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 posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42562?usp=email ) Change subject: xua_lm: Use XLM SAP to send M-ASP_{UP, ACTIVE}.req ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment 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> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42561?usp=email ) Change subject: Move xUA<->LM SAP logic to its own file ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/42561/comment/f2ca3f3a_df32f… : PS2, Line 9: gasp > grasp Done -- 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: comment 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:47:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

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

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42561?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/61/42561/3 -- 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: newpatchset 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_lm: Add S_INACTIVE state and improve state transitions
by pespin 01 Apr '26

01 Apr '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42571?usp=email ) Change subject: xua_lm: Add S_INACTIVE state and improve state transitions ...................................................................... xua_lm: Add S_INACTIVE state and improve state transitions The S_INACTIVE state will be needed once we support administrative state block in role ASP/(active)IPSP. It is also useful now since sometimes we just want to leave an asp in that state without any timer running (eg. asps in override which are not active until the active one goes inactive). Adding the S_INACTIVE state also allows transitioning states in role SG, since we now have somewhere to go instead of leaving it alwas as S_IDLE. The S_INACTIVE state also allows staying in that state until the ASP ACT ACK is received, moment at which the ASP is considered ACTIVE according to specs. Change-Id: I7e6127c150e479d0c436875b41824b3061e4fa48 --- M src/xua_default_lm_fsm.c 1 file changed, 140 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/42571/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index dbe88e1..f9f5cd4 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -53,6 +53,8 @@ S_WAIT_NOTIFY, /* we've sent a RK REG REQ and wait for the result */ S_RKM_REG, + /* Inactive, waiting to be activated based on policy */ + S_INACTIVE, /* all systems up, we're communicating */ S_ACTIVE, }; @@ -61,6 +63,8 @@ LM_E_SCTP_EST_IND, LM_E_ASP_UP_CONF, LM_E_ASP_UP_IND, + LM_E_ASP_DOWN_IND, + LM_E_ASP_ACT_CONF, LM_E_ASP_ACT_IND, LM_E_ASP_INACT_CONF, LM_E_ASP_INACT_IND, @@ -77,6 +81,8 @@ { 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_DOWN_IND, "ASP-DOWN.ind" }, + { LM_E_ASP_ACT_CONF, "ASP-ACT.conf" }, { LM_E_ASP_ACT_IND, "ASP-ACT.ind" }, { LM_E_ASP_INACT_CONF, "ASP-INACT.conf" }, { LM_E_ASP_INACT_IND, "ASP-INACT.ind" }, @@ -124,6 +130,7 @@ [S_WAIT_ASP_UP] = { .T = SS7_ASP_LM_T_WAIT_ASP_UP }, [S_WAIT_NOTIFY] = { .T = SS7_ASP_LM_T_WAIT_NOTIFY }, /* SS7_ASP_LM_T_WAIT_NOTIY_RKM if coming from S_RKM_REG */ [S_RKM_REG] = { .T = SS7_ASP_LM_T_WAIT_RK_REG_RESP }, + [S_INACTIVE] = { }, [S_ACTIVE] = { }, }; @@ -190,25 +197,42 @@ } } +static bool asp_act_needed(const struct osmo_ss7_asp *asp) +{ + /* 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; + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + if (osmo_ss7_as_active(assoc->as)) + return false; + } + } + return true; +} + static void lm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + switch (event) { + case LM_E_SCTP_EST_IND: + /* Try to transition to ASP-UP, wait to receive message for a few seconds */ + lm_fsm_state_chg(fi, S_WAIT_ASP_UP); + break; + } +} + +static void lm_wait_asp_up_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ struct xua_layer_manager_default_priv *lmp = fi->priv; - switch (event) { - case LM_E_SCTP_EST_IND: - 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); - 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; + if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP || + lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) { + xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_REQUEST); } } static void lm_wait_asp_up(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct xua_layer_manager_default_priv *lmp = fi->priv; const struct osmo_xlm_prim *oxp = data; switch (event) { @@ -220,10 +244,14 @@ 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); + /* ASP is up */ + if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) { + /* wait for some time if any NOTIFY indications about AS in this ASP + * are received */ + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + } else { + lm_fsm_state_chg(fi, S_INACTIVE); + } break; case LM_E_ERROR_IND: ENSURE_ASP_OR_IPSP(fi, event); @@ -240,7 +268,6 @@ static void lm_wait_notify(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct xua_layer_manager_default_priv *lmp = fi->priv; struct osmo_xlm_prim *oxp = data; switch (event) { @@ -254,18 +281,10 @@ ENSURE_ASP_OR_IPSP(fi, event); OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_NOTIFY); OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); - /* Not handling/interested in other status changes for now. */ if (oxp->u.notify.status_type != M3UA_NOTIFY_T_STATCHG) break; - - /* Don't change active ASP if there's already one active. */ - if (ss7_asp_determine_traf_mode(lmp->asp) == OSMO_SS7_AS_TMOD_OVERRIDE && - oxp->u.notify.status_info == M3UA_NOTIFY_I_AS_ACT) - break; - - lm_fsm_state_chg(fi, S_ACTIVE); - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + lm_fsm_state_chg(fi, S_INACTIVE); break; case LM_E_ASP_ACT_IND: ENSURE_SG_OR_IPSP(fi, event); @@ -274,11 +293,8 @@ 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); - if (lmp->asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) - xlm_sap_down_simple(lmp->asp, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_REQUEST); + /* Transition to S_INACTIVE, which will trigger acitvation if needed. */ + lm_fsm_state_chg(fi, S_INACTIVE); break; } }; @@ -291,6 +307,7 @@ switch (event) { case LM_E_RKM_REG_CONF: + ENSURE_ASP_OR_IPSP(fi, event); 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); @@ -320,6 +337,62 @@ } } +static void lm_inactive_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + 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); + } +} + +static void lm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct xua_layer_manager_default_priv *lmp = fi->priv; + struct osmo_xlm_prim *oxp = data; + + switch (event) { + case LM_E_ASP_ACT_CONF: + ENSURE_ASP_OR_IPSP(fi, event); + /* RFC4666 4.3.4.3: "[...] the ASP does not consider itself in the ASP-ACTIVE state + * until receipt of the ASP Active Ack message". */ + lm_fsm_state_chg(fi, S_ACTIVE); + 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: + /* 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); + 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); + 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)); + if (asp_act_needed(lmp->asp)) + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + /* else: stay in inactive */ + break; + } +} + static void lm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_layer_manager_default_priv *lmp = fi->priv; @@ -338,6 +411,10 @@ * 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_ASP_INACT_IND: + ENSURE_SG_OR_IPSP(fi, event); + lm_fsm_state_chg(fi, S_INACTIVE); + 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); @@ -370,6 +447,9 @@ static void lm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { + case LM_E_ASP_DOWN_IND: + lm_fsm_state_chg(fi, S_WAIT_ASP_UP); + break; case LM_E_SCTP_DISC_IND: lm_fsm_state_chg(fi, S_IDLE); break; @@ -427,9 +507,12 @@ S(LM_E_ASP_UP_IND) | S(LM_E_ERROR_IND), .out_state_mask = S(S_IDLE) | - S(S_WAIT_NOTIFY), + S(S_WAIT_ASP_UP) | + S(S_WAIT_NOTIFY) | + S(S_INACTIVE), .name = "WAIT_ASP_UP", .action = lm_wait_asp_up, + .onenter = lm_wait_asp_up_on_enter, }, [S_WAIT_NOTIFY] = { .in_event_mask = S(LM_E_AS_INACTIVE_IND) | @@ -437,7 +520,9 @@ S(LM_E_NOTIFY_IND) | S(LM_E_ASP_UP_CONF), .out_state_mask = S(S_IDLE) | + S(S_WAIT_ASP_UP) | S(S_RKM_REG) | + S(S_INACTIVE) | S(S_ACTIVE), .name = "WAIT_NOTIFY", .action = lm_wait_notify, @@ -450,14 +535,32 @@ .name = "RKM_REG", .action = lm_rkm_reg, }, - [S_ACTIVE] = { - .in_event_mask = S(LM_E_ASP_ACT_IND) | + [S_INACTIVE] = { + .in_event_mask = S(LM_E_ASP_ACT_CONF) | + 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), .out_state_mask = S(S_IDLE) | - S(S_WAIT_NOTIFY), + S(S_WAIT_ASP_UP) | + S(S_WAIT_NOTIFY) | + S(S_ACTIVE), + .name = "INACTIVE", + .action = lm_inactive, + .onenter = lm_inactive_on_enter, + }, + [S_ACTIVE] = { + .in_event_mask = S(LM_E_ASP_ACT_IND) | + S(LM_E_ASP_INACT_CONF) | + S(LM_E_ASP_INACT_IND) | + S(LM_E_AS_INACTIVE_IND) | + S(LM_E_NOTIFY_IND) | + S(LM_E_ERROR_IND), + .out_state_mask = S(S_IDLE) | + S(S_WAIT_ASP_UP) | + S(S_WAIT_NOTIFY) | + S(S_INACTIVE), .name = "ACTIVE", .action = lm_active, }, @@ -469,7 +572,9 @@ { 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_DOWN, PRIM_OP_INDICATION, LM_E_ASP_DOWN_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_ACTIVE, PRIM_OP_CONFIRM, LM_E_ASP_ACT_CONF }, { 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 }, @@ -488,7 +593,8 @@ .num_states = ARRAY_SIZE(lm_states), .timer_cb = lm_timer_cb, .event_names = lm_event_names, - .allstate_event_mask = S(LM_E_SCTP_DISC_IND), + .allstate_event_mask = S(LM_E_ASP_DOWN_IND) | + S(LM_E_SCTP_DISC_IND), .allstate_action = lm_allstate, .log_subsys = DLSS7, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42571?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: I7e6127c150e479d0c436875b41824b3061e4fa48 Gerrit-Change-Number: 42571 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: Use osmo_ss7_asp_active() in several places
by laforge 01 Apr '26

01 Apr '26

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42570?usp=email ) Change subject: Use osmo_ss7_asp_active() in several places ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I172e691cb61ac68e2410b44e124737f7a4dd2775 Gerrit-Change-Number: 42570 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 09:31:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log April 2026