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

[XS] Change in libosmo-sigtran[master]: Create missing LayerManager fsm in dynamic srv xua asps
by pespin 01 Apr '26

01 Apr '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42574?usp=email ) Change subject: Create missing LayerManager fsm in dynamic srv xua asps ...................................................................... Create missing LayerManager fsm in dynamic srv xua asps Dynamic xUA ASPs in transport_role=server where missing initialization +start of its LayerManager, meaning they had no xua_default_lm_fsm instance attached. Previous the xua_default_lm_fsm didn't do anything internally, but since recently ir properly transitions through states in SG role too, so we want to handle blocking/unblocking, etc. Change-Id: Id01e7a24e92aecc61aa2850632b3712bb338e9f2 --- M src/ss7_asp.c M src/ss7_asp.h M src/ss7_xua_srv.c 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/74/42574/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index f30375f..6efd9f4 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -693,7 +693,7 @@ return NULL; } -static void ss7_asp_xua_layer_manager_start(struct osmo_ss7_asp *asp) +void ss7_asp_xua_layer_manager_start(struct osmo_ss7_asp *asp) { OSMO_ASSERT(!asp->lm); /* No LM in IPA */ diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 3012e5e..a4e0e2f 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -194,6 +194,7 @@ void ss7_asp_set_blocked(struct osmo_ss7_asp *asp, bool blocked); void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp); +void ss7_asp_xua_layer_manager_start(struct osmo_ss7_asp *asp); unsigned int ss7_asp_get_all_rctx(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, const struct osmo_ss7_as *excl_as); diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 0d095ee..c080f63 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -179,6 +179,7 @@ oxs->cfg.local.host_cnt); ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &hostbuf_ptr, 1); + ss7_asp_xua_layer_manager_start(asp); if ((rc = xua_asp_fsm_start(asp, LOGL_DEBUG)) < 0) { talloc_free(sock_name); osmo_ss7_asp_destroy(asp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42574?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: Id01e7a24e92aecc61aa2850632b3712bb338e9f2 Gerrit-Change-Number: 42574 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_adm_block_act_err
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42548?usp=email ) Change subject: stp: m3ua: Introduce test TC_adm_block_act_err ...................................................................... stp: m3ua: Introduce test TC_adm_block_act_err Related: OS#6752 Related: libosmo-sigtran.git Change-Id I23851fe05c06b6bf59b902632029a2382231427e Change-Id: I9869ec2b71a3f6814340e181d67bab4c9266a2f4 --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index ec456a2..3eed8d3 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -659,6 +659,26 @@ f_clear_m3ua(); } +/* Test administrative state, VTY "[no] block": Block ASP, then try to activate it; + * it should be rejected with an Error msg cause "Refused - Management Blocking" */ +testcase TC_adm_block_act_err() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + f_init_m3ua(m3ua_configs := m3ua_configs); + + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "block"); + + f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); + f_M3UA_send(0, ts_M3UA_ASPAC(c_M3UA_TMT_override, rctx_sender)); + f_M3UA_exp(0, tr_M3UA_ERR('0000000D'O, rctx_sender)); + + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "no block"); + f_M3UA_asp_act(0, c_M3UA_TMT_override, rctx_sender, ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE); + + f_clear_m3ua(); +} + /* Test administrative state, VTY "[no] shutdown" */ testcase TC_m3ua_sctp_srv_adm_shutdown() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; @@ -1869,6 +1889,7 @@ execute( TC_tmt_loadshare_sls() ); execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); + execute( TC_adm_block_act_err() ); execute( TC_m3ua_sctp_srv_adm_shutdown() ); execute( TC_combinedlset_loadshare() ); execute( TC_inaccessible_sp_duna() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 2dfe5b1..c3f13a0 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -38,6 +38,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_daud_in_asp' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_no_snm_inactive' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_snm_inactive' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_adm_block_act_err' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_sctp_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_aspac_dava_aspia_duna' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42548?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: I9869ec2b71a3f6814340e181d67bab4c9266a2f4 Gerrit-Change-Number: 42548 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Move NTFY expect to up & act step helper functions
by pespin 01 Apr '26

01 Apr '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42547?usp=email ) Change subject: stp: Move NTFY expect to up & act step helper functions ...................................................................... stp: Move NTFY expect to up & act step helper functions Change-Id: Ia835a5dd54cc37f529ca1c4ff9892d44fe239241 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 26 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 59839b0..ec456a2 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -457,9 +457,14 @@ ***********************************************************************/ /* perform an outbound ASP-UP procedure */ -friend function f_M3UA_asp_up(integer idx, template (omit) OCT4 aspid := omit) runs on RAW_M3UA_CT { +friend function f_M3UA_asp_up(integer idx, template (omit) OCT4 aspid := omit, + template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE) runs on RAW_M3UA_CT { f_M3UA_send(idx, ts_M3UA_ASPUP(aspid)); f_M3UA_exp(idx, tr_M3UA_ASPUP_ACK); + + if (not istemplatekind(ntfy_after_up, "omit")) { + f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_up, *)); + } } /* perform an outbound BEAT procedure */ @@ -475,9 +480,14 @@ /* perform an outbound ASP-ACTIVATE procedure */ friend function f_M3UA_asp_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, - template (omit) OCT4 rctx := omit) runs on RAW_M3UA_CT { + template (omit) OCT4 rctx := omit, + template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE) runs on RAW_M3UA_CT { f_M3UA_send(idx, ts_M3UA_ASPAC(tmt, rctx)); f_M3UA_exp(idx, tr_M3UA_ASPAC_ACK(tmt, rctx)); + + if (not istemplatekind(ntfy_after_act, "omit")) { + f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_act, *)); + } } /* perform an outbound ASP-INACTIVATE procedure */ @@ -486,21 +496,15 @@ f_M3UA_exp(idx, tr_M3UA_ASPIA_ACK(rctx)); } -/* perform outbound ASP-UP and ASP-ACT, optionally expect interemittent NOTIFY */ +/* perform outbound ASP-UP and ASP-ACT, optionally expect intermittent NOTIFY */ friend function f_M3UA_asp_up_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, template (omit) OCT4 rctx := omit, template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE, template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE, template (omit) boolean exp_duna_after_act := omit /* auto */) runs on RAW_M3UA_CT { - f_M3UA_asp_up(idx, omit); - if (not istemplatekind(ntfy_after_up, "omit")) { - f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_up, *)); - } - f_M3UA_asp_act(idx, tmt, rctx); - if (not istemplatekind(ntfy_after_act, "omit")) { - f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_act, *)); - } + f_M3UA_asp_up(idx, omit, ntfy_after_up); + f_M3UA_asp_act(idx, tmt, rctx, ntfy_after_act); if (g_iut_supports_rfc666_4_5_1_duna_after_act) { var boolean exp_duna; if (istemplatekind(exp_duna_after_act, "omit")) { @@ -521,16 +525,14 @@ /* Test the ASP-UP procedure */ testcase TC_connect_asp_up() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_asp_up(0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, *)); + f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); f_clear_m3ua(); } /* Test the heartbeat procedure without optional heartbeat data payload */ testcase TC_beat() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_asp_up(0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, *)); + f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); f_M3UA_beat(0, omit); f_clear_m3ua(); } @@ -538,8 +540,7 @@ /* Test the heartbeat procedure with optional heartbeat data payload */ testcase TC_beat_payload() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_asp_up(0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, *)); + f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); f_M3UA_beat(0, 'a1a2a3a4a5'O); f_clear_m3ua(); } @@ -558,8 +559,7 @@ f_init_m3ua_srv(); f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(m3ua_configs[0].routing_ctx, 4)); } else { - f_M3UA_asp_up(0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, *)); + f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); } rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); @@ -1070,10 +1070,10 @@ /* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023) * INACTIVE, handle the 2 NOTIFY manually afterwards: */ - f_M3UA_asp_up(0, omit); + f_M3UA_asp_up(0, ntfy_after_up := omit); f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); - f_M3UA_asp_act(0, omit, rctxB); + f_M3UA_asp_act(0, omit, rctxB, ntfy_after_act := omit); f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(oct2int(dpcB))}, rctxA)); if (g_iut_supports_rfc666_4_5_1_duna_after_act) { @@ -1120,7 +1120,7 @@ f_init_m3ua(m3ua_configs := m3ua_configs); /* ASPUP + ACK */ - f_M3UA_asp_up(0); + f_M3UA_asp_up(0, ntfy_after_up := omit); /* REG REQ + RESP */ f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, @@ -1133,7 +1133,6 @@ /* ASPAC + ACK */ f_M3UA_asp_act(0, c_M3UA_TMT_loadshare, rctx0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *)); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only"); f_clear_m3ua(); @@ -1169,7 +1168,7 @@ ///////// ASP 0 ///////////// /* ASPUP + ACK */ - f_M3UA_asp_up(0); + f_M3UA_asp_up(0, ntfy_after_up := omit); /* REG REQ + RESP */ f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, @@ -1182,11 +1181,10 @@ /* ASPAC + ACK */ f_M3UA_asp_act(0, c_M3UA_TMT_loadshare, rctx0); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *)); ///////// ASP 1 ///////////// /* ASPUP + ACK */ - f_M3UA_asp_up(1); + f_M3UA_asp_up(1, ntfy_after_up := omit); /* REG REQ + RESP */ f_M3UA_send(1, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, @@ -1199,11 +1197,8 @@ * ASPUP+ASPUP-ACK to let it know AS state. */ f_M3UA_exp(1, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *)); - /* ASPAC + ACK */ - f_M3UA_asp_act(1, c_M3UA_TMT_loadshare, rctx1); - /* See RFC 4666 5.1.4: No NOTIFY is sent because there's no state change. - * f_M3UA_exp(1, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *)); - */ + /* ASPAC + ACK: See RFC 4666 5.1.4: No NOTIFY(c_M3UA_ST_I_AS_ACTIVE) is sent because there's no state change. */ + f_M3UA_asp_act(1, c_M3UA_TMT_loadshare, rctx1, ntfy_after_act := omit); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only"); f_clear_m3ua(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42547?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: Ia835a5dd54cc37f529ca1c4ff9892d44fe239241 Gerrit-Change-Number: 42547 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

01 Apr '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42572?usp=email ) Change subject: cosmetic: xua_asp_fsm: Fix wrong indentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I21c13ff7bc67c060e739eae38088ac00700680de Gerrit-Change-Number: 42572 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 11:21:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

01 Apr '26

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42571?usp=email ) Change subject: xua_lm: Add S_INACTIVE state and improve state transitions ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 11:20:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_adm_block_after_act
by fixeria 01 Apr '26

01 Apr '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42550?usp=email ) Change subject: stp: m3ua: Introduce test TC_adm_block_after_act ...................................................................... Patch Set 2: (1 comment) File stp/STP_Tests_M3UA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42550/comment/28e8b86b_1423… : PS2, Line 684: TC_adm_block_after_act You're missing to add this one to the `control` section below. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42550?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: I18672d228c1d15ef99039bccbb972e0b2496b545 Gerrit-Change-Number: 42550 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 11:17:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_adm_block_act_err
by fixeria 01 Apr '26

01 Apr '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42548?usp=email ) Change subject: stp: m3ua: Introduce test TC_adm_block_act_err ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42548?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: I9869ec2b71a3f6814340e181d67bab4c9266a2f4 Gerrit-Change-Number: 42548 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 11:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Move NTFY expect to up & act step helper functions
by fixeria 01 Apr '26

01 Apr '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42547?usp=email ) Change subject: stp: Move NTFY expect to up & act step helper functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42547?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: Ia835a5dd54cc37f529ca1c4ff9892d44fe239241 Gerrit-Change-Number: 42547 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 Apr 2026 11:13:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

01 Apr '26

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

1 0

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

01 Apr '26

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

1 0

2026

2025

2024

2023

2022

gerrit-log April 2026