- gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: vty: Prohibit configuring an IPA ASP as IPSP
by pespin 06 Feb '26

06 Feb '26

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42071?usp=email ) Change subject: vty: Prohibit configuring an IPA ASP as IPSP ...................................................................... vty: Prohibit configuring an IPA ASP as IPSP We could eventually define how the IPA CCM is expected to behave when in IPSP role (eg. implementing/allowing both sides of IPA CCM, or assigning an IPA CCM role based on TCP client/server), but that has not yet been defined. IPSP is actually a good candidate for IPA ASPs, since in IPA proto we don't have SNM messaging either, and it's meant to be used point-to-point (or through STP by assigning hardocded routes). Change-Id: I18ad3e9ad4aac7a3d8e84483ba1bf09016520b54 --- M src/ss7_asp_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/42071/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42071?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: I18ad3e9ad4aac7a3d8e84483ba1bf09016520b54 Gerrit-Change-Number: 42071 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: Allow vty-configuration of IPSP role "ASPs"
by pespin 06 Feb '26

06 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42027?usp=email ) Change subject: IPSP: Allow vty-configuration of IPSP role "ASPs" ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42027?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: I0f0fa881471b87a4bb82a0211c6fb6e4c50b48ec Gerrit-Change-Number: 42027 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 06 Feb 2026 17:09:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP
by pespin 06 Feb '26

06 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?usp=email ) Change subject: IPSP: Add a comment that it's intentional to drop all M3UA SNM for IPSP ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42026?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: I7b87bf03964e7e9aac683ad860e511f83a685821 Gerrit-Change-Number: 42026 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 06 Feb 2026 17:09:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in libosmo-sigtran[master]: IPSP: don't route any incoming M3UA messages in IPSP case
by pespin 06 Feb '26

06 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?usp=email ) Change subject: IPSP: don't route any incoming M3UA messages in IPSP case ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42025?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: Iad7280619ec5814cda7a179418079048a5955976 Gerrit-Change-Number: 42025 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 06 Feb 2026 17:09:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in libosmo-sigtran[master]: vty: Prohibit configuring an ASP as IPSP in an SG node
by pespin 06 Feb '26

06 Feb '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42028?usp=email ) Change subject: vty: Prohibit configuring an ASP as IPSP in an SG node ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42028?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: I38bbd9226bad478f8068d02f7a4d7b3711596208 Gerrit-Change-Number: 42028 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 06 Feb 2026 17:08:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in libosmo-sigtran[master]: vty: Prohibit confiruing an IPA ASP as IPSP
by pespin 06 Feb '26

06 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42071?usp=email ) Change subject: vty: Prohibit confiruing an IPA ASP as IPSP ...................................................................... vty: Prohibit confiruing an IPA ASP as IPSP We could eventually define how the IPA CCM is expected to behave when in IPSP role (eg. implementing/allowing both sides of IPA CCM, or assigning an IPA CCM role based on TCP client/server), but that has not yet been defined. IPSP is actually a good candidate for IPA ASPs, since in IPA proto we don't have SNM messaging either, and it's meant to be used point-to-point (or through STP by assigning hardocded routes). Change-Id: I18ad3e9ad4aac7a3d8e84483ba1bf09016520b54 --- M src/ss7_asp_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/42071/1 diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 27b7462..6731398 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -423,6 +423,11 @@ vty_out(vty, "IPSP role can't be used in an SG node since they are point-to-point%s", VTY_NEWLINE); return CMD_WARNING; } + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + /* There's no definition yet on how IPA ASPs should behave in IPSP role... */ + vty_out(vty, "IPSP role is not supported in ASP protol 'ipa'%s", VTY_NEWLINE); + return CMD_WARNING; + } asp->cfg.role = OSMO_SS7_ASP_ROLE_IPSP; } else { OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42071?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: I18ad3e9ad4aac7a3d8e84483ba1bf09016520b54 Gerrit-Change-Number: 42071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Adapt RKM code to support IPSP
by pespin 06 Feb '26

06 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42072?usp=email ) Change subject: xua_rkm: Adapt RKM code to support IPSP ...................................................................... xua_rkm: Adapt RKM code to support IPSP Related: OS#6474 Change-Id: I9c59d6fb43d4e7ceda552f156dd7761173545b11 --- M src/ss7_as_vty.c M src/xua_rkm.c 2 files changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/72/42072/1 diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index 80359aa..f92b6d7 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -667,9 +667,9 @@ * then announce using RKM. * Still, allow STPs to have AS(P) configured in an ASP mode to talk to a * peer STP by announcing remote PCs. */ - if (as_role == OSMO_SS7_ASP_ROLE_ASP && + if ((as_role == OSMO_SS7_ASP_ROLE_ASP || as_role == OSMO_SS7_ASP_ROLE_IPSP) && !osmo_ss7_pc_is_local(as->inst, as->cfg.routing_key.pc)) - vty_out(vty, "%% AS '%s' with local role ASP should have a local PC configured in its " + vty_out(vty, "%% AS '%s' with local role ASP/IPSP should have a local PC configured in its " "routing-key. Fix your config!%s", as->cfg.name, VTY_NEWLINE); if (as->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 21591e9..22bcafe 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -219,16 +219,15 @@ rctx, osmo_ss7_pointcode_print(asp->inst, dpc)); /* We have two cases here: - * a) pre-configured routing context on both ASP and SG: We will - * find the AS based on the RCTX send by the client, check if - * the routing key matches, associated AS with ASP and return - * success. - * b) no routing context set on ASP, no pre-existing AS - * definition on SG. We have to create the AS, set the RK, + * a) pre-configured routing context on both ASP and SG (or IPSP peers): + * We will find the AS based on the RCTX send by the client, check if + * the routing key matches, associated AS with ASP and return success. + * b) no routing context set on peer (ASP/IPSP), no pre-existing local AS + * definition (SG/IPSP). We have to create the AS, set the RK, * allocate the RCTX and return that RCTX to the client. This * is a slightly non-standard interpretation of M3UA RKM - * which requires the SG to not have a-priori-knowledge of - * all AS/RK in situations where the ASP are trusted. + * which requires the SG/IPSP to not have a-priori-knowledge of + * all AS/RK in situations where the peers are trusted. */ /* check if there is already an AS for this routing key */ @@ -255,7 +254,9 @@ if (as) { LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: Found existing AS for RCTX %u\n", rctx); - if (as->cfg.routing_key.pc != dpc) { + /* In IPSP we expect in fact to have the local PC configured in routing-key. */ + if (asp->cfg.role == OSMO_SS7_ASP_ROLE_SG && + as->cfg.routing_key.pc != dpc) { LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: DPC doesn't match, rejecting AS (%u != %u)\n", as->cfg.routing_key.pc, dpc); msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INVAL_RKEY, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42072?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: I9c59d6fb43d4e7ceda552f156dd7761173545b11 Gerrit-Change-Number: 42072 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: xua_asp_fsm: Improvements to support IPSP
by pespin 06 Feb '26

06 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42073?usp=email ) Change subject: xua_asp_fsm: Improvements to support IPSP ...................................................................... xua_asp_fsm: Improvements to support IPSP Change-Id: Ia268848ee9bb2f97a47ba9be60ecd16fbeb4fb40 --- M src/xua_asp_fsm.c 1 file changed, 30 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/73/42073/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 580a298..d3a7410 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -510,33 +510,27 @@ } } -#define ENSURE_ASP_OR_IPSP(fi, event) \ +#define ENSURE_ROLE_COND(fi, event, cond) \ do { \ struct xua_asp_fsm_priv *_xafp = fi->priv; \ enum osmo_ss7_asp_role _role = _xafp->asp->cfg.role; \ - if (_role != OSMO_SS7_ASP_ROLE_ASP && \ - _role != OSMO_SS7_ASP_ROLE_IPSP) { \ + if (!(cond)) { \ LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \ "in role %s\n", \ osmo_fsm_event_name(fi->fsm, event), \ get_value_string(osmo_ss7_asp_role_names, _role));\ return; \ } \ - } while(0) + } while (0) -#define ENSURE_SG_OR_IPSP(fi, event) \ - do { \ - struct xua_asp_fsm_priv *_xafp = fi->priv; \ - enum osmo_ss7_asp_role _role = _xafp->asp->cfg.role; \ - if (_role != OSMO_SS7_ASP_ROLE_SG && \ - _role != OSMO_SS7_ASP_ROLE_IPSP) { \ - LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \ - "in role %s\n", \ - osmo_fsm_event_name(fi->fsm, event), \ - get_value_string(osmo_ss7_asp_role_names, _role));\ - return; \ - } \ - } while(0) +#define ENSURE_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_IPSP) + +#define ENSURE_ASP_OR_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_ASP || _role == OSMO_SS7_ASP_ROLE_IPSP) + +#define ENSURE_SG_OR_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_SG || _role == OSMO_SS7_ASP_ROLE_IPSP) /*************** @@ -640,6 +634,7 @@ struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; struct osmo_ss7_as *as; + struct xua_msg_part *asp_id_ie; struct xua_msg *xua_in; uint32_t traf_mode = 0; struct xua_msg_part *part; @@ -655,6 +650,17 @@ /* send M3UA_MSGT_ASPSM_ASPDN and start t_ack */ peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPSM_ASPDN); break; + case XUA_ASP_E_ASPSM_ASPUP_ACK: + /* This may come in IPSP if we received ASPUP from peer before it answered our ASPUP: */ + ENSURE_IPSP(fi, event); + /* Optional ASP Identifier */ + if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) { + asp->remote_asp_id = xua_msg_part_get_u32(asp_id_ie); + asp->remote_asp_id_present = true; + } + /* inform layer manager */ + send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM); + break; case XUA_ASP_E_ASPTM_ASPAC_ACK: /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); @@ -776,6 +782,11 @@ struct xua_msg *xua_in; check_stop_t_ack(fi, event); switch (event) { + case XUA_ASP_E_ASPTM_ASPAC_ACK: + /* This may come in IPSP if we received ASPAC from peer before it answered our ASPAC: */ + ENSURE_IPSP(fi, event); + send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_CONFIRM); + break; case XUA_ASP_E_ASPSM_ASPDN_ACK: /* only in role ASP */ ENSURE_ASP_OR_IPSP(fi, event); @@ -913,6 +924,7 @@ [XUA_ASP_S_INACTIVE] = { .in_event_mask = S(XUA_ASP_E_M_ASP_ACTIVE_REQ) | S(XUA_ASP_E_M_ASP_DOWN_REQ) | + S(XUA_ASP_E_ASPSM_ASPUP_ACK) | S(XUA_ASP_E_ASPTM_ASPAC) | S(XUA_ASP_E_ASPTM_ASPAC_ACK) | S(XUA_ASP_E_ASPTM_ASPIA) | @@ -929,6 +941,7 @@ .in_event_mask = S(XUA_ASP_E_ASPSM_ASPDN) | S(XUA_ASP_E_ASPSM_ASPDN_ACK) | S(XUA_ASP_E_ASPSM_ASPUP) | + S(XUA_ASP_E_ASPTM_ASPAC_ACK) | S(XUA_ASP_E_ASPTM_ASPIA) | S(XUA_ASP_E_ASPTM_ASPIA_ACK) | S(XUA_ASP_E_ASPTM_ASPAC) | -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42073?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: Ia268848ee9bb2f97a47ba9be60ecd16fbeb4fb40 Gerrit-Change-Number: 42073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_default_fsm: Support IPSP role
by pespin 06 Feb '26

06 Feb '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email ) Change subject: xua_default_fsm: Support IPSP role ...................................................................... xua_default_fsm: Support IPSP role Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 --- M src/xua_default_lm_fsm.c 1 file changed, 68 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/74/42074/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 3e364c1..d19c0c3 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -59,6 +59,9 @@ enum lm_event { LM_E_SCTP_EST_IND, LM_E_ASP_UP_CONF, + LM_E_ASP_UP_IND, + LM_E_ASP_ACT_IND, + LM_E_ASP_INACT_IND, LM_E_NOTIFY_IND, LM_E_AS_INACTIVE_IND, LM_E_AS_ACTIVE_IND, @@ -70,6 +73,9 @@ static const struct value_string lm_event_names[] = { { LM_E_SCTP_EST_IND, "SCTP-ESTABLISH.ind" }, { LM_E_ASP_UP_CONF, "ASP-UP.conf" }, + { LM_E_ASP_UP_IND, "ASP-UP.ind" }, + { LM_E_ASP_ACT_IND, "ASP-ACT.ind" }, + { LM_E_ASP_INACT_IND, "ASP-INACT.ind" }, { LM_E_NOTIFY_IND, "NOTIFY.ind" }, { LM_E_AS_INACTIVE_IND, "AS-INACTIVE.ind" }, { LM_E_AS_ACTIVE_IND, "AS-ACTIVE.ind" }, @@ -127,6 +133,28 @@ ((struct xua_layer_manager_default_priv *)(fi->priv))->asp->cfg.T_defs_lm, \ -1) +#define ENSURE_ROLE_COND(fi, event, cond) \ + do { \ + struct xua_layer_manager_default_priv *_lmp = fi->priv; \ + enum osmo_ss7_asp_role _role = _lmp->asp->cfg.role; \ + if (!(cond)) { \ + LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \ + "in role %s\n", \ + osmo_fsm_event_name(fi->fsm, event), \ + get_value_string(osmo_ss7_asp_role_names, _role));\ + return; \ + } \ + } while (0) + +#define ENSURE_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_IPSP) + +#define ENSURE_ASP_OR_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_ASP || _role == OSMO_SS7_ASP_ROLE_IPSP) + +#define ENSURE_SG_OR_IPSP(fi, event) \ + ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_SG || _role == OSMO_SS7_ASP_ROLE_IPSP) + static struct osmo_ss7_as *find_first_as_in_asp(struct osmo_ss7_asp *asp) { struct osmo_ss7_as *as; @@ -167,11 +195,13 @@ switch (event) { case LM_E_SCTP_EST_IND: - if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) { + if (lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP || + lmp->asp->cfg.role == OSMO_SS7_ASP_ROLE_IPSP) { /* Try to transition to ASP-UP, wait to receive message for a few seconds */ lm_fsm_state_chg(fi, S_WAIT_ASP_UP); osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_UP_REQ, NULL); } + /* role SG: Unimplemented, do nothing, stay in this state forever. */ break; } } @@ -180,10 +210,20 @@ { switch (event) { case LM_E_ASP_UP_CONF: + ENSURE_ASP_OR_IPSP(fi, event); /* ASP is up, wait for some time if any NOTIFY * indications about AS in this ASP are received */ lm_fsm_state_chg(fi, S_WAIT_NOTIFY); break; + case LM_E_ASP_UP_IND: + ENSURE_SG_OR_IPSP(fi, event); + /* ASP is up, wait for some time if any NOTIFY + * indications about AS in this ASP are received. + * SG role: we move to S_WAIT_NOTIFY to actually wait + * for ASPIA msg (LM_E_ASP_INACT_IND) + */ + lm_fsm_state_chg(fi, S_WAIT_NOTIFY); + break; } } @@ -193,7 +233,14 @@ struct osmo_xlm_prim *oxp = data; switch (event) { + case LM_E_ASP_UP_CONF: + ENSURE_ASP_OR_IPSP(fi, event); + /* in IPSP, we may receive a ASP-UP ACK for the ASP-UP we sent, + * _after_ we received the ASP-UP from the peer in state + * WAIT_ASP_UP. Ignore it. */ + break; case LM_E_NOTIFY_IND: + ENSURE_ASP_OR_IPSP(fi, event); OSMO_ASSERT(oxp->oph.primitive == OSMO_XLM_PRIM_M_NOTIFY); OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); @@ -209,13 +256,18 @@ lm_fsm_state_chg(fi, S_ACTIVE); osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; + case LM_E_ASP_ACT_IND: + ENSURE_SG_OR_IPSP(fi, event); + lm_fsm_state_chg(fi, S_ACTIVE); + break; case LM_E_AS_INACTIVE_IND: /* we now know that an AS is associated with this ASP at * the SG, and that this AS is currently inactive */ /* request the ASP to go into active state (which * hopefully will bring the AS to active, too) */ lm_fsm_state_chg(fi, S_ACTIVE); - osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); + if (lmp->asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); break; } }; @@ -253,6 +305,10 @@ struct osmo_xlm_prim *oxp; switch (event) { + case LM_E_ASP_ACT_IND: + /* This may come in IPSP if we received ASPAC from peer before it answered our ASPAC: */ + ENSURE_IPSP(fi, event); + break; case LM_E_AS_INACTIVE_IND: /* request the ASP to go into active state */ osmo_fsm_inst_dispatch(lmp->asp->fi, XUA_ASP_E_M_ASP_ACTIVE_REQ, NULL); @@ -337,7 +393,8 @@ .action = lm_idle, }, [S_WAIT_ASP_UP] = { - .in_event_mask = S(LM_E_ASP_UP_CONF), + .in_event_mask = S(LM_E_ASP_UP_CONF) | + S(LM_E_ASP_UP_IND), .out_state_mask = S(S_IDLE) | S(S_WAIT_NOTIFY), .name = "WAIT_ASP_UP", @@ -345,7 +402,9 @@ }, [S_WAIT_NOTIFY] = { .in_event_mask = S(LM_E_AS_INACTIVE_IND) | - S(LM_E_NOTIFY_IND), + S(LM_E_ASP_ACT_IND) | + S(LM_E_NOTIFY_IND) | + S(LM_E_ASP_UP_CONF), .out_state_mask = S(S_IDLE) | S(S_RKM_REG) | S(S_ACTIVE), @@ -360,7 +419,8 @@ .action = lm_rkm_reg, }, [S_ACTIVE] = { - .in_event_mask = S(LM_E_AS_INACTIVE_IND) | + .in_event_mask = S(LM_E_ASP_ACT_IND) | + S(LM_E_AS_INACTIVE_IND) | S(LM_E_NOTIFY_IND), .out_state_mask = S(S_IDLE), .name = "ACTIVE", @@ -373,6 +433,9 @@ { XUA_SAP_LM, OSMO_XLM_PRIM_M_SCTP_ESTABLISH, PRIM_OP_INDICATION, LM_E_SCTP_EST_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION, LM_E_SCTP_DISC_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_CONFIRM, LM_E_ASP_UP_CONF }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_UP, PRIM_OP_INDICATION, LM_E_ASP_UP_IND }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_ACTIVE, PRIM_OP_INDICATION, LM_E_ASP_ACT_IND }, + { XUA_SAP_LM, OSMO_XLM_PRIM_M_ASP_INACTIVE, PRIM_OP_INDICATION, LM_E_ASP_INACT_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_STATUS, PRIM_OP_INDICATION, LM_E_AS_STATUS_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_NOTIFY, PRIM_OP_INDICATION, LM_E_NOTIFY_IND }, { XUA_SAP_LM, OSMO_XLM_PRIM_M_AS_INACTIVE, PRIM_OP_INDICATION, LM_E_AS_INACTIVE_IND }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 Gerrit-Change-Number: 42074 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: Refactor xua_layer_manager object
by pespin 06 Feb '26

06 Feb '26

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Refactor xua_layer_manager object ...................................................................... Refactor xua_layer_manager object Several changes to improve separation of the LM object and its lifecycle: * Store in ss7_asp a pointer to a xua_layer_manager, which contains all implementation dependent information inside its priv pointer. * Add a new free_func field to the xua_layer_manager struct in order to be able to free it without knowing how it was allocated. * Get rid og the loglevel param, LOGL_DEBUG was always passed and that was actually an implementation specific detail of the default xua layer manager. * Pass pointer to function to be called by LM to submit primitives to M3UA. Change-Id: Ia96ebf40444f46ad718d61befbecb523f267fd6c --- M include/osmocom/sigtran/osmo_ss7.h M src/ss7_asp.c M src/ss7_asp.h M src/xua_default_lm_fsm.c 4 files changed, 69 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/54/42054/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42054?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: Ia96ebf40444f46ad718d61befbecb523f267fd6c Gerrit-Change-Number: 42054 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log