- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_adm_block_after_act
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42550?usp=email ) Change subject: stp: m3ua: Introduce test TC_adm_block_after_act ...................................................................... stp: m3ua: Introduce test TC_adm_block_after_act Related: OS#6752 Change-Id: I18672d228c1d15ef99039bccbb972e0b2496b545 --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/42550/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 3eed8d3..c47aa02 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -679,6 +679,26 @@ f_clear_m3ua(); } +/* Test administrative state, VTY "[no] block": Activate ASP, then block it; + * it should send an unsolicited ASPIA ACK */ +testcase TC_adm_block_after_act() 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_M3UA_asp_up_act(0, rctx := rctx_sender); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "block"); + f_M3UA_exp(0, tr_M3UA_ASPIA_ACK(rctx_sender)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, rctx_sender)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, 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" }; diff --git a/stp/expected-results.xml b/stp/expected-results.xml index c3f13a0..5d70fff 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -39,6 +39,7 @@ <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_adm_block_after_act' 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/+/42550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18672d228c1d15ef99039bccbb972e0b2496b545 Gerrit-Change-Number: 42550 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: firmware: fix timers, add missing return
by lynxis lazus 31 Mar '26

31 Mar '26

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email ) Change subject: firmware: fix timers, add missing return ...................................................................... firmware: fix timers, add missing return Change-Id: I5b12284c88d8fe6e4fe55cc4cd2aad550d276af4 --- M sysmoOCTSIM/libosmo_emb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/sysmoOCTSIM/libosmo_emb.c b/sysmoOCTSIM/libosmo_emb.c index 37f6126..e96f88e 100644 --- a/sysmoOCTSIM/libosmo_emb.c +++ b/sysmoOCTSIM/libosmo_emb.c @@ -21,7 +21,7 @@ uint64_t get_jiffies(void) { - ldrd_u64(&jiffies); + return ldrd_u64(&jiffies); } void store_jiffies(uint64_t j) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I5b12284c88d8fe6e4fe55cc4cd2aad550d276af4 Gerrit-Change-Number: 42544 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ccid-firmware[master]: firmware: fix timers, add missing return
by lynxis lazus 31 Mar '26

31 Mar '26

Attention is currently required from: Hoernchen. lynxis lazus has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email ) Change subject: firmware: fix timers, add missing return ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I5b12284c88d8fe6e4fe55cc4cd2aad550d276af4 Gerrit-Change-Number: 42544 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Mar 2026 15:15:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

31 Mar '26

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42548?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/42548/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: newpatchset 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

1 0

[M] Change in libosmo-sigtran[master]: xua asp block: SGP/IPSP: Answer ASPAC with Err if blocked
by pespin 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42549?usp=email ) Change subject: xua asp block: SGP/IPSP: Answer ASPAC with Err if blocked ...................................................................... xua asp block: SGP/IPSP: Answer ASPAC with Err if blocked Reject received ASPACs when the asp is administratively blocked. Moving an already active ASP into inactive state upon user applies adminsitrative block is not covered in this commit; it will be implementer later. This commit doesn't yet implement asp blocking in ASP role nor (ASP-side) IPSP role. Related: OS#6752 Change-Id: I23851fe05c06b6bf59b902632029a2382231427e --- M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/xua_asp_fsm.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 6 files changed, 66 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/49/42549/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index ba3b95c..96e8759 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1530,6 +1530,18 @@ return -1; } +/* Change adminsitrative state "block" of an ASP. + * A blocked ASP can't stay nor be turned into ACTIVE state. */ +void ss7_asp_set_blocked(struct osmo_ss7_asp *asp, bool blocked) +{ + if (asp->cfg.adm_state.blocked == blocked) + return; + LOGPASP(asp, DLSS7, LOGL_NOTICE, "Applying Adm State change: '%sblock' -> '%sblock'\n", + asp->cfg.adm_state.blocked ? "" : "no ", + blocked ? "" : "no "); + asp->cfg.adm_state.blocked = blocked; +} + /* Apply sane configs for unconfigured options and restart the ASP. */ void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp) { diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 6b8e974..3012e5e 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -192,6 +192,7 @@ 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_set_blocked(struct osmo_ss7_asp *asp, bool blocked); void ss7_asp_restart_after_reconfigure(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, diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 3cae016..e3c82fe 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -705,9 +705,33 @@ "Allows a SCTP Association with ASP, but doesn't let it become active\n", CMD_ATTR_NODE_EXIT) { - /* TODO */ - vty_out(vty, "Not supported yet%s", VTY_NEWLINE); - return CMD_WARNING; + struct osmo_ss7_asp *asp = vty->index; + + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_M3UA && + asp->cfg.proto != OSMO_SS7_ASP_PROT_SUA) { + vty_out(vty, "%% 'block' not supported for ASP protocol %s%s", + osmo_ss7_asp_protocol_name(asp->cfg.proto), VTY_NEWLINE); + 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; +} + +DEFUN_ATTR(asp_no_block, asp_no_block_cmd, + "no block", + NO_STR "Allows a SCTP Association with ASP, but doesn't let it become active\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + ss7_asp_set_blocked(asp, false); + return CMD_SUCCESS; } DEFUN_ATTR(asp_shutdown, asp_shutdown_cmd, @@ -1492,6 +1516,7 @@ gen_asp_timer_lm_cmd_strs(&asp_timer_lm_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_timer_lm_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_block_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_shutdown_cmd); } diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 8524c4d..7ee3fd1 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -655,7 +655,7 @@ struct xua_msg_part *asp_id_ie; struct xua_msg *xua_in; uint32_t traf_mode = 0; - struct xua_msg_part *part; + struct xua_msg_part *rctx_ie; uint32_t asp_id; int i; @@ -711,9 +711,9 @@ return; } } - if ((part = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) { - for (i = 0; i < part->len / sizeof(uint32_t); i++) { - uint8_t *rctx_raw = &part->dat[i * sizeof(uint32_t)]; + if ((rctx_ie = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) { + for (i = 0; i < rctx_ie->len / sizeof(uint32_t); i++) { + uint8_t *rctx_raw = &rctx_ie->dat[i * sizeof(uint32_t)]; uint32_t rctx = osmo_load32be(rctx_raw); as = ss7_asp_find_as_by_rctx(asp, rctx); if (!as) { @@ -726,6 +726,23 @@ } } + if (asp->cfg.adm_state.blocked) { + /* RFC4666 (M3UA) 3.8.1: The "Refused - Management Blocking" error is sent + * when an ASP Up or ASP Active message is received and the request is refused + * for management reasons (e.g., management lockout). If this error is in + * response to an ASP Active message, the Routing Context(s) in the ASP Active + * message SHOULD be included in the Error message." + * RC4666 (M3UA) 4.3.4.3: "If for any local reason (e.g., management lockout) + * the SGP responds to an ASP Active message with an Error message with reason + * Refused Management Blocking". + */ + LOGPFSML(fi, LOGL_INFO, "ASPAC: Reject due to ASP in administrative state 'block'\n"); + peer_send_error_ext(fi, SUA_ERR_REFUSED_MGMT_BLOCKING, + rctx_ie ? rctx_ie->dat : NULL, + rctx_ie ? rctx_ie->len : 0); + return; + } + if (traf_mode) { /* if the peer has specified a traffic mode at all */ /* First validate peer not trying to establish an incompatible traffic mode: */ llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 561fc39..3c6e466 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -303,6 +303,7 @@ timer xua (ack|beat) <1-999999> timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp) <1-999999> block + no block shutdown no shutdown ... @@ -332,6 +333,7 @@ tcp-param Configure TCP parameters destination-audit Configure ASP Auditing (xUA DAUD) quirk Disable quirk to work around interop issues + block Allows a SCTP Association with ASP, but doesn't let it become active shutdown Terminates SCTP association; New associations will be rejected ... diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 62b7aa3..0b8f4fd 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -299,6 +299,7 @@ timer xua (ack|beat) <1-999999> timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp) <1-999999> block + no block shutdown no shutdown ... @@ -330,6 +331,7 @@ tcp-param Configure TCP parameters destination-audit Configure ASP Auditing (xUA DAUD) quirk Disable quirk to work around interop issues + block Allows a SCTP Association with ASP, but doesn't let it become active shutdown Terminates SCTP association; New associations will be rejected ... -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42549?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: I23851fe05c06b6bf59b902632029a2382231427e Gerrit-Change-Number: 42549 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 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( 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 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/42548/1 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() ); -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9869ec2b71a3f6814340e181d67bab4c9266a2f4 Gerrit-Change-Number: 42548 Gerrit-PatchSet: 1 Gerrit-Owner: 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 31 Mar '26

31 Mar '26

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/42547/1 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: newchange 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>

1 0

[XS] Change in pysim[master]: docs/conf.py: add autodoc_mock_imports for klein and twisted
by fixeria 31 Mar '26

31 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42546?usp=email ) Change subject: docs/conf.py: add autodoc_mock_imports for klein and twisted ...................................................................... docs/conf.py: add autodoc_mock_imports for klein and twisted The eSIM SM-DP+ server modules (`pySim.esim.es2p`, `pySim.esim.es9p`, `pySim.esim.http_json_api`) unconditionally import optional server-side dependencies at module level: pySim.esim.es2p -- from klein import Klein pySim.esim.http_json_api -- from twisted.web.server import Request Both imports fail during a docs build if the packages are absent or broken, causing three "autodoc: failed to import" warnings and three missing chapters in the generated manual. Even when klein and twisted are installed, twisted 23.10.0 (the version pulled in transitively by smpp.twisted3's `Twisted~=23.10.0` constraint) is incompatible with Python 3.13+ because twisted.web.http unconditionally executes `import cgi`, a module that was removed from the standard library in Python 3.13. Fix: add `autodoc_mock_imports = ['klein', 'twisted']` to conf.py. Sphinx inserts mock entries into sys.modules before each autodoc import attempt, so the modules can be imported and documented without requiring the real packages to be importable at build time. Change-Id: I71650466f02a6a6d150650deed167c05d2cb6e64 --- M docs/conf.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/42546/1 diff --git a/docs/conf.py b/docs/conf.py index 99107e2..165d235 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,6 +65,12 @@ autoclass_content = 'both' +# es2p and http_json_api/es9p use optional server-side deps (klein, twisted.web) +# that may be absent or Python-version-incompatible (twisted 23.x uses the +# `cgi` stdlib module removed in Python 3.13). Mock them so autodoc can still +# import and document those modules. +autodoc_mock_imports = ['klein', 'twisted'] + # sphinxarg.ext generates generic sub-headings ("Named arguments", # "Positional arguments", "Sub-commands", "General options", ...) for every # argparse command/tool. These repeat across many files and trigger tons -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42546?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71650466f02a6a6d150650deed167c05d2cb6e64 Gerrit-Change-Number: 42546 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: firmware: werror on missing return
by Hoernchen 31 Mar '26

31 Mar '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42545?usp=email ) Change subject: firmware: werror on missing return ...................................................................... firmware: werror on missing return Silently ignoring a missing return just broke all timers, so prevent similar mistakes in the future. Change-Id: I2e25884077af6334c9e9ddace3900b04061fae04 --- M sysmoOCTSIM/gcc/Makefile 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/45/42545/1 diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 461b313..445324e 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -11,7 +11,10 @@ CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -fno-omit-frame-pointer -ggdb3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes -fno-common -Wno-unused-variable -Wno-unused-function -Wlarger-than=512 -Wstack-usage=255 + -fno-omit-frame-pointer -ggdb3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD \ + -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes \ + -fno-common -Wno-unused-variable -Wno-unused-function -Wlarger-than=512 -Wstack-usage=255 \ + -Werror=return-type CFLAGS += -DLIBOSMOCORE_NO_LOGGING -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2e25884077af6334c9e9ddace3900b04061fae04 Gerrit-Change-Number: 42545 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: firmware: fix timers, add missing return
by Hoernchen 31 Mar '26

31 Mar '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email ) Change subject: firmware: fix timers, add missing return ...................................................................... firmware: fix timers, add missing return Change-Id: I5b12284c88d8fe6e4fe55cc4cd2aad550d276af4 --- M sysmoOCTSIM/libosmo_emb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/44/42544/1 diff --git a/sysmoOCTSIM/libosmo_emb.c b/sysmoOCTSIM/libosmo_emb.c index 37f6126..e96f88e 100644 --- a/sysmoOCTSIM/libosmo_emb.c +++ b/sysmoOCTSIM/libosmo_emb.c @@ -21,7 +21,7 @@ uint64_t get_jiffies(void) { - ldrd_u64(&jiffies); + return ldrd_u64(&jiffies); } void store_jiffies(uint64_t j) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I5b12284c88d8fe6e4fe55cc4cd2aad550d276af4 Gerrit-Change-Number: 42544 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log