- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: stp: Fix expectancies of TC_clnt_quirk_snm_inactive
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39619?usp=email ) Change subject: stp: Fix expectancies of TC_clnt_quirk_snm_inactive ...................................................................... stp: Fix expectancies of TC_clnt_quirk_snm_inactive The test STP_Tests_M3UA.TC_clnt_quirk_snm_inactive validates the snm_inactive quirk by sending a DAUD before the link being activated, and expecting a DAVA to make sure osmo-stp did indeed process the SNM message. However, osmo-stp used to lack proper route validation based on link state, which means it would incorrectly assumed the link for the affected PC (55) in the test was active and hence would answer with a DAVA. After libosmo-sigtran.git Change-Id I928fb1ef5db6922f1386a188e3fbf9e70780f25d this wrong behavior is fixed, and hence osmo-stp starts answering with a DUNA instead of a DAVA, since AS "as-client" has not yet been activated during the test. Fix the test expectancies by expecting a DUNA instead of a DAVA. Change-Id: I907981c1487b299df852c405bae1fefff4bf5191 Depends: libosmo-sigtran.git Change-Id I928fb1ef5db6922f1386a188e3fbf9e70780f25d Related: SYS#7112 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index c3598d3..3fb3fc0 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1325,7 +1325,7 @@ var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(f_m3ua_srv_config(0).point_code) }; f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DAVA(aff_pcs)); + f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DUNA(aff_pcs)); setverdict(pass); f_no_quirk("no_notify"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39619?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I907981c1487b299df852c405bae1fefff4bf5191 Gerrit-Change-Number: 39619 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce tests TC_dyn_(2)asp_as_rkm_permitted
by pespin 03 Mar '25

03 Mar '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39647?usp=email ) Change subject: stp: Introduce tests TC_dyn_(2)asp_as_rkm_permitted ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic3116cbe63832003876ae19b31491275aebb41a9 Gerrit-Change-Number: 39647 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 20:05:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: Make sure to NOTIFY current state to peer after ASP UP ACK / REG RESP
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39640?usp=email ) Change subject: Make sure to NOTIFY current state to peer after ASP UP ACK / REG RESP ...................................................................... Make sure to NOTIFY current state to peer after ASP UP ACK / REG RESP As per RFC4666 4.3.4.5: """ When an ASP moves from ASP-DOWN to ASP-INACTIVE within a particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, after sending the ASP-UP-ACK, in order to inform the ASP of the current AS state.""" It also needs to be done for REG RESP in order to support dynamic ASPs/ASs, since in that case if dynamic ASP sends to SG an ASP-UP msg, it contains no RCTX/AS reference, and hence the ASP will only be assigned to an AS after the REG-REQ is sent, at which point we can send the AS status to it. Change-Id: I3dffa2e9c554f03c7c721b757ff33a89961665b5 --- M src/xua_as_fsm.c M src/xua_as_fsm.h M src/xua_asp_fsm.c M src/xua_rkm.c 4 files changed, 129 insertions(+), 27 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 577c7d3..c4a167c 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -39,6 +39,19 @@ return msg; } +static void tx_notify(struct osmo_ss7_asp *asp, const struct osmo_xlm_prim_notify *npar) +{ + const char *type_name, *info_name, *info_str; + type_name = get_value_string(m3ua_ntfy_type_names, npar->status_type); + info_name = m3ua_ntfy_info_name(npar->status_type, npar->status_info); + info_str = npar->info_string ? npar->info_string : ""; + + LOGPASP(asp, DLSS7, LOGL_INFO, "Tx NOTIFY Type %s:%s (%s)\n", + type_name, info_name, info_str); + struct msgb *msg = encode_notify(npar); + osmo_ss7_asp_send(asp, msg); +} + static int as_notify_all_asp(struct osmo_ss7_as *as, struct osmo_xlm_prim_notify *npar) { struct msgb *msg; @@ -184,6 +197,37 @@ bool ipa_route_created; }; +static void fill_notify_statchg_pars(const struct osmo_fsm_inst *fi, struct osmo_xlm_prim_notify *npar) +{ + struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; + struct osmo_ss7_as *as = xafp->as; + *npar = (struct osmo_xlm_prim_notify){ + .status_type = M3UA_NOTIFY_T_STATCHG, + }; + + switch (fi->state) { + case XUA_AS_S_INACTIVE: + npar->status_info = M3UA_NOTIFY_I_AS_INACT; + break; + case XUA_AS_S_ACTIVE: + npar->status_info = M3UA_NOTIFY_I_AS_ACT; + break; + case XUA_AS_S_PENDING: + npar->status_info = M3UA_NOTIFY_I_AS_PEND; + break; + case XUA_AS_S_DOWN: + default: + /* Nothing will be sent anyway... */ + return; + } + + /* Add the routing context, if it is configured */ + if (as->cfg.routing_key.context) { + npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; + npar->route_ctx = as->cfg.routing_key.context; + } +} + /* is the given AS one with a single ASP of IPA type? */ static bool is_single_ipa_asp(struct osmo_ss7_as *as) { @@ -351,21 +395,21 @@ { struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; struct osmo_ss7_as *as = xafp->as; - struct osmo_xlm_prim_notify npar = { - .status_type = M3UA_NOTIFY_T_STATCHG, - }; + struct osmo_xlm_prim_notify npar; + + fill_notify_statchg_pars(fi, &npar); switch (fi->state) { case XUA_AS_S_INACTIVE: - npar.status_info = M3UA_NOTIFY_I_AS_INACT; + /* continue below */ break; case XUA_AS_S_ACTIVE: if (is_single_ipa_asp(as)) ipa_add_route(fi); - npar.status_info = M3UA_NOTIFY_I_AS_ACT; + /* continue below */ break; case XUA_AS_S_PENDING: - npar.status_info = M3UA_NOTIFY_I_AS_PEND; + /* continue below */ break; case XUA_AS_S_DOWN: if (is_single_ipa_asp(as)) @@ -384,11 +428,7 @@ return; } - /* Add the routing context, if it is configured */ - if (as->cfg.routing_key.context) { - npar.presence |= NOTIFY_PAR_P_ROUTE_CTX; - npar.route_ctx = as->cfg.routing_key.context; - } + fill_notify_statchg_pars(fi, &npar); /* TODO: ASP-Id of ASP triggering this state change */ @@ -409,10 +449,13 @@ static void xua_as_fsm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; - struct osmo_ss7_asp *asp = data; + struct osmo_ss7_asp *asp; + struct xua_as_event_asp_inactive_ind_pars *inact_ind_pars; + struct osmo_xlm_prim_notify npar; switch (event) { case XUA_ASPAS_ASP_DOWN_IND: + asp = data; /* one ASP transitions into ASP-DOWN */ if (check_any_other_asp_not_down(xafp->as, asp)) { /* ignore, we stay AS_INACTIVE */ @@ -424,7 +467,11 @@ osmo_fsm_inst_state_chg(fi, XUA_AS_S_ACTIVE, 0, 0); break; case XUA_ASPAS_ASP_INACTIVE_IND: - /* ignore */ + inact_ind_pars = data; + if (inact_ind_pars->asp_requires_notify) { + fill_notify_statchg_pars(fi, &npar); + tx_notify(inact_ind_pars->asp, &npar); + } break; } } @@ -433,14 +480,19 @@ { struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; struct osmo_ss7_asp *asp; + struct xua_as_event_asp_inactive_ind_pars *inact_ind_pars; struct msgb *msg; + struct osmo_xlm_prim_notify npar; switch (event) { case XUA_ASPAS_ASP_DOWN_IND: case XUA_ASPAS_ASP_INACTIVE_IND: - asp = data; - if (check_any_other_asp_in_active(xafp->as, asp)) { - /* ignore, we stay AS_ACTIVE */ + inact_ind_pars = data; + if (check_any_other_asp_in_active(xafp->as, inact_ind_pars->asp)) { + if (event == XUA_ASPAS_ASP_INACTIVE_IND && inact_ind_pars->asp_requires_notify) { + fill_notify_statchg_pars(fi, &npar); + tx_notify(inact_ind_pars->asp, &npar); + } /* ASP_DOWN_IND: ignore, nothing to be sent */ } else { uint32_t recovery_msec = xafp->as->cfg.recovery_timeout_msec; osmo_fsm_inst_state_chg(fi, XUA_AS_S_PENDING, 0, 0); @@ -467,7 +519,9 @@ static void xua_as_fsm_pending(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; + struct xua_as_event_asp_inactive_ind_pars *inact_ind_pars; struct msgb *msg; + struct osmo_xlm_prim_notify npar; switch (event) { case XUA_ASPAS_ASP_ACTIVE_IND: @@ -479,7 +533,11 @@ xua_as_transmit_msg(xafp->as, msg); break; case XUA_ASPAS_ASP_INACTIVE_IND: - /* ignore */ + inact_ind_pars = data; + if (inact_ind_pars->asp_requires_notify) { + fill_notify_statchg_pars(fi, &npar); + tx_notify(inact_ind_pars->asp, &npar); + } break; case XUA_ASPAS_ASP_DOWN_IND: /* ignore */ diff --git a/src/xua_as_fsm.h b/src/xua_as_fsm.h index 0e71350..cf897e2 100644 --- a/src/xua_as_fsm.h +++ b/src/xua_as_fsm.h @@ -1,6 +1,7 @@ #pragma once struct osmo_ss7_as; +struct osmo_ss7_asp; enum xua_as_state { XUA_AS_S_DOWN, @@ -9,8 +10,17 @@ XUA_AS_S_PENDING, }; +struct xua_as_event_asp_inactive_ind_pars { + struct osmo_ss7_asp *asp; + /* RFC4666 4.3.4.5: "When an ASP moves from ASP-DOWN to ASP-INACTIVE within a + * particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, + * after sending the ASP-UP-ACK, in order to inform the ASP of the current AS + * state." */ + bool asp_requires_notify; +}; + enum xua_as_event { - XUA_ASPAS_ASP_INACTIVE_IND, + XUA_ASPAS_ASP_INACTIVE_IND, /* param: struct xua_as_event_asp_inactive_ind_pars* */ XUA_ASPAS_ASP_DOWN_IND, XUA_ASPAS_ASP_ACTIVE_IND, XUA_AS_E_RECOVERY_EXPD, diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 12640d6..0e39b0d 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -355,7 +355,7 @@ /* Helper function to dispatch an ASP->AS event to all AS of which this * ASP is a memmber. Ignores routing contexts for now. */ -static void dispatch_to_all_as(struct osmo_fsm_inst *fi, uint32_t event) +static void dispatch_to_all_as(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; @@ -365,7 +365,7 @@ llist_for_each_entry(as, &inst->as_list, list) { if (!osmo_ss7_as_has_asp(as, asp)) continue; - osmo_fsm_inst_dispatch(as->fi, event, asp); + osmo_fsm_inst_dispatch(as->fi, event, data); } } @@ -418,7 +418,9 @@ static void xua_asp_fsm_down_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND); + struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; + dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); } static void xua_asp_fsm_down(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -478,7 +480,17 @@ static void xua_asp_fsm_inactive_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND); + struct xua_asp_fsm_priv *xafp = fi->priv; + /* RFC4666 4.3.4.5: "When an ASP moves from ASP-DOWN to ASP-INACTIVE within a + * particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, + * after sending the ASP-UP-ACK, in order to inform the ASP of the current AS + * state." + */ + struct xua_as_event_asp_inactive_ind_pars pars = { + .asp = xafp->asp, + .asp_requires_notify = (prev_state == XUA_ASP_S_DOWN), + }; + dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } static void xua_asp_fsm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -596,7 +608,9 @@ static void xua_asp_fsm_active_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND); + struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; + dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } static void xua_asp_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -1047,8 +1061,14 @@ static void ipa_asp_fsm_active_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND); - dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND); + struct ipa_asp_fsm_priv *iafp = fi->priv; + struct osmo_ss7_asp *asp = iafp->asp; + struct xua_as_event_asp_inactive_ind_pars pars = { + .asp = asp, + .asp_requires_notify = false, + }; + dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); + dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } /* Server + Client: We're actively transmitting user data */ @@ -1064,7 +1084,12 @@ static void ipa_asp_fsm_inactive_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND); + struct ipa_asp_fsm_priv *iafp = fi->priv; + struct xua_as_event_asp_inactive_ind_pars pars = { + .asp = iafp->asp, + .asp_requires_notify = false, + }; + dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } static void ipa_asp_fsm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/xua_rkm.c b/src/xua_rkm.c index f616a3a..9e77095 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -346,7 +346,16 @@ if (!as) continue; /* Notify AS that it has an INACTIVE ASP */ - osmo_fsm_inst_dispatch(as->fi, XUA_ASPAS_ASP_INACTIVE_IND, asp); + /* RFC4666 4.3.4.5: "When an ASP moves from ASP-DOWN to ASP-INACTIVE within a + * particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, + * after sending the ASP-UP-ACK, in order to inform the ASP of the current AS + * state." + */ + struct xua_as_event_asp_inactive_ind_pars pars = { + .asp = asp, + .asp_requires_notify = true, + }; + osmo_fsm_inst_dispatch(as->fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39640?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: I3dffa2e9c554f03c7c721b757ff33a89961665b5 Gerrit-Change-Number: 39640 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: asp: Add debug log when transmitting on ASP
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39649?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asp: Add debug log when transmitting on ASP ...................................................................... asp: Add debug log when transmitting on ASP Change-Id: I8095ea02fdb063f9928035a20f257dd6bf0e6420 --- M src/osmo_ss7_asp.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index b766071..3f6500c 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -1172,6 +1172,7 @@ } rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_TX_TOTAL); + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Tx %d bytes: %s\n", msg->len, msgb_hexdump(msg)); if (asp->cfg.is_server) { if (!asp->server) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39649?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: I8095ea02fdb063f9928035a20f257dd6bf0e6420 Gerrit-Change-Number: 39649 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: Improve format of logline prefix in LOGAS(P) macro
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39648?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Improve format of logline prefix in LOGAS(P) macro ...................................................................... Improve format of logline prefix in LOGAS(P) macro Adding "as-" and "asp" is totally misleading, because it's usual that we name ASs "as-XYZ" and ASPs "asp-XYZ". Intead, better use a usual prefix formatting to indicate the context. Change-Id: Ib7b6652f2a96bf5c2a2233043755e0c639d41544 --- M src/ss7_as.h M src/ss7_asp.h 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/ss7_as.h b/src/ss7_as.h index 9f4be25..4a7c50d 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -70,4 +70,4 @@ unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as); #define LOGPAS(as, subsys, level, fmt, args ...) \ - _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args) + _LOGSS7((as)->inst, subsys, level, "AS(%s) " fmt, (as)->cfg.name, ## args) diff --git a/src/ss7_asp.h b/src/ss7_asp.h index a05d870..483c5ea 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -114,4 +114,4 @@ void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp); #define LOGPASP(asp, subsys, level, fmt, args ...) \ - _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args) + _LOGSS7((asp)->inst, subsys, level, "ASP(%s) " fmt, (asp)->cfg.name, ## args) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39648?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: Ib7b6652f2a96bf5c2a2233043755e0c639d41544 Gerrit-Change-Number: 39648 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: m3ua: Log Tx NOTIFY msg
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39638?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: m3ua: Log Tx NOTIFY msg ...................................................................... m3ua: Log Tx NOTIFY msg Change-Id: Iae3f0922bd924e1472d551c8a3144b203da21f79 --- M src/m3ua.c M src/xua_as_fsm.c M src/xua_internal.h 3 files changed, 24 insertions(+), 14 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 5f94674..78f1aef 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -100,6 +100,19 @@ { 0, NULL } }; +const char *m3ua_ntfy_info_name(uint16_t ntfy_status_type, uint16_t ntfy_status_info) +{ + switch (ntfy_status_type) { + case M3UA_NOTIFY_T_STATCHG: + return get_value_string(m3ua_ntfy_stchg_names, ntfy_status_info); + case M3UA_NOTIFY_T_OTHER: + return get_value_string(m3ua_ntfy_other_names, ntfy_status_info); + default: + break; + } + return "NULL"; +} + static const struct value_string m3ua_iei_names[] = { { M3UA_IEI_INFO_STRING, "INFO String" }, { M3UA_IEI_ROUTE_CTX, "Routing Context" }, @@ -643,20 +656,7 @@ m3ua_decode_notify(&ntfy, asp, xua); type_name = get_value_string(m3ua_ntfy_type_names, ntfy.status_type); - - switch (ntfy.status_type) { - case M3UA_NOTIFY_T_STATCHG: - info_name = get_value_string(m3ua_ntfy_stchg_names, - ntfy.status_info); - break; - case M3UA_NOTIFY_T_OTHER: - info_name = get_value_string(m3ua_ntfy_other_names, - ntfy.status_info); - break; - default: - info_name = "NULL"; - break; - } + info_name = m3ua_ntfy_info_name(ntfy.status_type, ntfy.status_info); LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received NOTIFY Type %s:%s (%s)\n", type_name, info_name, ntfy.info_string ? ntfy.info_string : ""); diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 6517f73..577c7d3 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -43,11 +43,18 @@ { struct msgb *msg; unsigned int i, sent = 0; + const char *type_name, *info_name, *info_str; /* we don't send notify to IPA peers! */ if (as->cfg.proto == OSMO_SS7_ASP_PROT_IPA) return 0; + type_name = get_value_string(m3ua_ntfy_type_names, npar->status_type); + info_name = m3ua_ntfy_info_name(npar->status_type, npar->status_info); + info_str = npar->info_string ? npar->info_string : ""; + LOGPFSM(as->fi, "Broadcasting NOTIFY Type %s:%s (%s) to all non-DOWN ASPs\n", + type_name, info_name, info_str); + /* iterate over all non-DOWN ASPs and send them the message */ for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { struct osmo_ss7_asp *asp = as->cfg.asps[i]; @@ -71,6 +78,8 @@ /* TODO: Optional Routing Context */ + LOGPASP(asp, DLSS7, LOGL_INFO, "Tx NOTIFY Type %s:%s (%s)\n", + type_name, info_name, info_str); msg = encode_notify(npar); osmo_ss7_asp_send(asp, msg); sent++; diff --git a/src/xua_internal.h b/src/xua_internal.h index 4f6e931..3e9c15b 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -71,6 +71,7 @@ extern const struct value_string m3ua_ntfy_type_names[]; extern const struct value_string m3ua_ntfy_stchg_names[]; extern const struct value_string m3ua_ntfy_other_names[]; +const char *m3ua_ntfy_info_name(uint16_t ntfy_status_type, uint16_t ntfy_status_info); struct xua_msg *m3ua_encode_notify(const struct osmo_xlm_prim_notify *npar); int m3ua_decode_notify(struct osmo_xlm_prim_notify *npar, void *ctx, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39638?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: Iae3f0922bd924e1472d551c8a3144b203da21f79 Gerrit-Change-Number: 39638 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: Use default_layer_manager for all ASPs in SCTP-mode=client & m3ua-mod...
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39637?usp=email ) Change subject: Use default_layer_manager for all ASPs in SCTP-mode=client & m3ua-mode=ASP ...................................................................... Use default_layer_manager for all ASPs in SCTP-mode=client & m3ua-mode=ASP With previous behavior, only first ASP configured as SCTPmode=client and m3ua-mode=ASP in osmo_sccp_simple_client_on_ss7_id() would be applied the default_layer_manager. AS a result, if a client app (eg. osmo-bsc) would manually configure 1 AS with 2 ASPs (and leave it to dynamic RKM to setup everything at osmo-stp), it would fail, since the default LM FSM (in charge of waiting for NTFY and then sending REQ_REG) would only be applied to the first ASP. So one would see 1st ASP doing ASPUP+REG_REQ+ASPAC correctly, but the second one would do ASPUP+ASPAC directly, which would be refused by osmo-stp since it had no routing context configured for that ASP/AS. Change-Id: I50f9a088c55ad103cc23758192773fc855747e12 --- M src/osmo_ss7_asp.c M src/osmo_ss7_vty.c M src/sccp_user.c M src/ss7_asp.h M src/xua_default_lm_fsm.c 5 files changed, 37 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 503b31c..b766071 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -1291,3 +1291,22 @@ } return -1; } + +/* Apply sane configs for unconfigured options and restart the ASP. */ +void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp) +{ + /* Make sure proper defaults values are applied if user didn't provide + * specific default values */ + ss7_asp_set_default_peer_hosts(asp); + + /* Apply default LM FSM for client ASP */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA && + asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP && + !asp->cfg.is_server) { + osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG); + } else { + osmo_ss7_asp_remove_default_lm(asp); + } + + osmo_ss7_asp_restart(asp); +} diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 576ad7c..8365db2 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -3001,9 +3001,7 @@ switch (vty->node) { case L_CS7_ASP_NODE: asp = vty->index; - /* Make sure proper defaults values are set */ - ss7_asp_set_default_peer_hosts(asp); - osmo_ss7_asp_restart(asp); + ss7_asp_restart_after_reconfigure(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; break; diff --git a/src/sccp_user.c b/src/sccp_user.c index d27d4bb..b5b6b4b 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -628,6 +628,7 @@ asp = asp_i; LOGP(DLSCCP, LOGL_NOTICE, "%s: ASP %s for %s is not associated with any AS, using it\n", name, asp->cfg.name, osmo_ss7_asp_protocol_name(prot)); + osmo_ss7_as_add_asp(as, asp->cfg.name); break; } if (!asp) { @@ -642,6 +643,7 @@ if (!asp) goto out_rt; asp_created = true; + asp->simple_client_allocated = true; /* Ensure that the ASP we use is set to operate as a client. */ asp->cfg.is_server = false; /* Ensure that the ASP we use is set to role ASP. */ @@ -650,12 +652,10 @@ ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); if (default_remote_ip) ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); - /* Make sure proper defaults are applied if app didn't provide specific default values */ - ss7_asp_set_default_peer_hosts(asp); - asp->simple_client_allocated = true; + /* Make sure proper defaults are applied if app didn't + provide specific default values, then restart the ASP: */ + ss7_asp_restart_after_reconfigure(asp); } - - osmo_ss7_as_add_asp(as, asp->cfg.name); } /* Extra sanity checks if the ASP asp-clnt-* was pre-configured over VTY: */ @@ -696,12 +696,9 @@ goto out_asp; } } + /* ASP was already started here previously by VTY go_parent. */ } - /* Restart ASP */ - if (prot != OSMO_SS7_ASP_PROT_IPA) - osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG); - osmo_ss7_asp_restart(asp); LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name, asp->cfg.name); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 377274a..a05d870 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -110,5 +110,8 @@ int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); +void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp); +void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp); + #define LOGPASP(asp, subsys, level, fmt, args ...) \ _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args) diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index fc01605..0952c9e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -413,6 +413,14 @@ .prim_cb = default_lm_prim_cb, }; +void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp) +{ + if (!asp->lm_priv) + return; + osmo_fsm_inst_term(asp->lm_priv, OSMO_FSM_TERM_ERROR, NULL); + asp->lm_priv = NULL; +} + int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level) { struct lm_fsm_priv *lmp; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39637?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: I50f9a088c55ad103cc23758192773fc855747e12 Gerrit-Change-Number: 39637 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Make sure existing AS gets added in list to receive ASP-INAC...
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39639?usp=email ) Change subject: xua_rkm: Make sure existing AS gets added in list to receive ASP-INACTIVE.ind event ...................................................................... xua_rkm: Make sure existing AS gets added in list to receive ASP-INACTIVE.ind event Eg. if a 2nd ASP tries to register against a given AS (RFC 4666 5.1.3), it should still update the AS to tell it the ASP is in ASP-INACTIVE state. This way depending on traffic mode, the AS state may change as well. Change-Id: I85948ab98623a8a53521eb2d2e84244011b39a93 --- M src/xua_rkm.c 1 file changed, 18 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/xua_rkm.c b/src/xua_rkm.c index dd07db2..f616a3a 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -221,6 +221,14 @@ as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); if (as) { LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: Found existing AS for RCTX %u\n", rctx); + /* Early return before allocating stuff if no space left: */ + if (*nas_idx >= max_nas_idx) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: not enough room for newly assigned AS (max %u AS)\n", + max_nas_idx+1); + msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INSUFF_RESRC, 0); + return -1; + } + if (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); @@ -244,6 +252,14 @@ as->cfg.mode_set_by_peer = true; } } else if (asp->inst->cfg.permit_dyn_rkm_alloc) { + /* Early return before allocating stuff if no space left: */ + if (*nas_idx >= max_nas_idx) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: not enough room for newly assigned AS (max %u AS)\n", + max_nas_idx+1); + msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INSUFF_RESRC, 0); + return -1; + } + /* Create an AS for this routing key */ snprintf(namebuf, sizeof(namebuf), "as-rkm-%u", rctx); as = osmo_ss7_as_find_or_create(asp->inst, namebuf, OSMO_SS7_ASP_PROT_M3UA); @@ -272,17 +288,6 @@ msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_CANT_SUPP_UNQ_RT, 0); return -1; } - - /* append to list of newly assigned as */ - if (*nas_idx >= max_nas_idx) { - ss7_route_destroy(rt); - osmo_ss7_as_destroy(as); - LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: not enough room for newly assigned AS (max %u AS)\n", - max_nas_idx+1); - msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INSUFF_RESRC, 0); - return -1; - } - newly_assigned_as[(*nas_idx)++] = as; } else { /* not permitted to create dynamic RKM entries */ LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: RCTX %u not found in configuration, and " @@ -294,6 +299,8 @@ /* Success: Add just-create AS to connected ASP + report success */ osmo_ss7_as_add_asp(as, asp->cfg.name); msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_SUCCESS, rctx); + /* append to list of newly assigned as */ + newly_assigned_as[(*nas_idx)++] = as; return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39639?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: I85948ab98623a8a53521eb2d2e84244011b39a93 Gerrit-Change-Number: 39639 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: sctp_{server,proxy}: log SCTP TSN, SID, SSN, and data len
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39663?usp=email ) Change subject: sctp_{server,proxy}: log SCTP TSN, SID, SSN, and data len ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3692e3bfccdb2ab0a705b1f0903181197c0a2237 Gerrit-Change-Number: 39663 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 20:04:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: sctp_server: invalidate handler's Pid on 'EXIT'
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39631?usp=email ) Change subject: sctp_server: invalidate handler's Pid on 'EXIT' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39631?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I21fedf8579baa54dc1e7ade348abffd7ee9b04c4 Gerrit-Change-Number: 39631 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Mon, 03 Mar 2025 20:04:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log