- gerrit-log - lists.osmocom.org

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

11 Feb '26

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email ) Change subject: xua_default_fsm: Support IPSP role ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 Gerrit-Change-Number: 42074 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:58:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

11 Feb '26

Attention is currently required from: daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?usp=email to look at the new patch set (#2). Change subject: cosmetic: ss7_asp.h: Drop comment no longer valid ...................................................................... cosmetic: ss7_asp.h: Drop comment no longer valid Since a while ago, only the remote asp ID is stored in asp->remote_asp_id. The SLS has its own field (ipa.sls). Fixes: b8fe5e4a1adfb54f265efc81432eab6252e9b04f Change-Id: I2253b1cb9e24270b9d6b3400d3fa20827c66ad23 --- M src/ss7_asp.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/04/42104/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2253b1cb9e24270b9d6b3400d3fa20827c66ad23 Gerrit-Change-Number: 42104 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

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

11 Feb '26

Attention is currently required from: daniel, laforge. Hello Jenkins Builder, daniel, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by daniel, Code-Review+1 by laforge Change subject: xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_ACTIVE_REQ ...................................................................... xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_ACTIVE_REQ Sending that kind of event is up to the layer manager. Right now, all ASPs (except ipa_aspm_fsm, which doesn't need that event because there's no ACTIVATE in IPA) have an associated layer manager FSM, so that workaround is not needed. Change-Id: If6c2c5b6ffc4080320aadc550d823abc5d613d6f --- M src/xua_asp_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/42090/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If6c2c5b6ffc4080320aadc550d823abc5d613d6f Gerrit-Change-Number: 42090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

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

11 Feb '26

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?usp=email ) Change subject: cosmetic: ss7_asp.h: Drop comment no longer valid ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104/comment/22127725_97352… : PS1, Line 9: Since a while ago, remote asp ID is stored in asp->remote_asp_id. > ```suggestion […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2253b1cb9e24270b9d6b3400d3fa20827c66ad23 Gerrit-Change-Number: 42104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:33:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 0

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

11 Feb '26

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?usp=email ) Change subject: xua_aspm_fsm: Remove unneeded workaround submitting XUA_ASP_E_M_ASP_ACTIVE_REQ ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090/comment/bd48ca40_3e34f… : PS1, Line 10: Right now, all ASPs (except ipa_aspm_fsm, which don't need that event > ```suggestion […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If6c2c5b6ffc4080320aadc550d823abc5d613d6f Gerrit-Change-Number: 42090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:30:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 0

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

11 Feb '26

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email ) Change subject: xua_default_fsm: Support IPSP role ...................................................................... Patch Set 3: (2 comments) File src/xua_default_lm_fsm.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074/comment/b13bf6bd_5be22… : PS3, Line 235: ENSURE_ASP_OR_IPSP(fi, event); > Just to check - this effectively adds logging in role SG? Yes. https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074/comment/49ebcb66_c3e0a… : PS3, Line 308: ENSURE_IPSP(fi, event); > This also "just" adds logging in role != IPSP? Yes. -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3 Gerrit-Change-Number: 42074 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Feb 2026 14:29:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 0

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

11 Feb '26

pespin has submitted this change. ( 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(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve 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: merged 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42029?usp=email ) Change subject: m3ua: Allow rx SCON in IPSP role ...................................................................... m3ua: Allow rx SCON in IPSP role Change-Id: I49838219aab912243a761ab9b5167095e363c72b --- M src/m3ua.c 1 file changed, 29 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/m3ua.c b/src/m3ua.c index 44ae513..abf951f 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -1107,6 +1107,34 @@ return rc; } +/* received SNM message on IPSP side + * xua is owned by parent call m3ua_rx_snm() */ +static int m3ua_rx_snm_ipsp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie; + int rc = 0; + + switch (xua->hdr.msg_type) { + case M3UA_SNM_SCON: + /* RFC4666 1.4.6: "The M3UA layer at an ASP or IPSP MAY indicate local congestion + * to an M3UA peer with an SCON message." + * An IPSP can only be connected against another IPSP, hence if an IPSP can send + * an SCON, it can be derived that it is expected it can receive it: */ + rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + xua_snm_rx_scon(asp, as, xua); + break; + default: + /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */ + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return rc; +} + /* received SNM message * This function takes ownership of xua msg passed to it. */ static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) @@ -1150,7 +1178,7 @@ rc = m3ua_rx_snm_asp(asp, xua); break; case OSMO_SS7_ASP_ROLE_IPSP: - /* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */ + rc = m3ua_rx_snm_ipsp(asp, xua); default: rc = M3UA_ERR_UNSUPP_MSG_CLASS; break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42029?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: I49838219aab912243a761ab9b5167095e363c72b Gerrit-Change-Number: 42029 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de>

1 0

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

11 Feb '26

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I9c59d6fb43d4e7ceda552f156dd7761173545b11 Gerrit-Change-Number: 42072 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Feb '26

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/xua_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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ia268848ee9bb2f97a47ba9be60ecd16fbeb4fb40 Gerrit-Change-Number: 42073 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log