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

[XS] Change in osmo-bts[master]: osmo-bts-trx: rx_rach_fn(): remove redundant fall-back
by fixeria 29 Mar '26

29 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42523?usp=email ) Change subject: osmo-bts-trx: rx_rach_fn(): remove redundant fall-back ...................................................................... osmo-bts-trx: rx_rach_fn(): remove redundant fall-back Condition `synch_seq != RACH_SYNCH_SEQ_TS0` is unlikely to be true, given that no other synch. sequences are defined by 3GPP TS 45.002. Even if this happens for whatever reason (e.g. a bug), assigning `synch_seq` to `RACH_SYNCH_SEQ_TS0` is not needed, as `synch_seq` is never read after the switch statement. The logging message is not useful either, since we already print the synch. seq. above. Change-Id: I4cdc03dc6631ca17d13a3067ad03020e3e97eab1 --- M src/osmo-bts-trx/sched_lchan_rach.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/42523/1 diff --git a/src/osmo-bts-trx/sched_lchan_rach.c b/src/osmo-bts-trx/sched_lchan_rach.c index c92dfe2..a4a01a9 100644 --- a/src/osmo-bts-trx/sched_lchan_rach.c +++ b/src/osmo-bts-trx/sched_lchan_rach.c @@ -186,12 +186,6 @@ case RACH_SYNCH_SEQ_TS0: default: - /* Fall-back to the default TS0 if needed */ - if (synch_seq != RACH_SYNCH_SEQ_TS0) { - LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, "Falling-back to the default TS0\n"); - synch_seq = RACH_SYNCH_SEQ_TS0; - } - rc = gsm0503_rach_decode_ber(&ra, bi->burst + RACH_EXT_TAIL_LEN + RACH_SYNCH_SEQ_LEN, trx->bts->bsic, &n_errors, &n_bits_total); if (rc) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4cdc03dc6631ca17d13a3067ad03020e3e97eab1 Gerrit-Change-Number: 42523 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: osmo-bts-trx: rx_data_fn(): fix copy-paste in comment
by fixeria 29 Mar '26

29 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42522?usp=email ) Change subject: osmo-bts-trx: rx_data_fn(): fix copy-paste in comment ...................................................................... osmo-bts-trx: rx_data_fn(): fix copy-paste in comment Change-Id: Ibf35c468310a690fd873cf968bb2c44b493ca5ea --- M src/osmo-bts-trx/sched_lchan_xcch.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/42522/1 diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index 0580d33..38e1f1a 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -117,8 +117,7 @@ /* When SACCH Repetition is active, we may try to decode the * current SACCH block by including the information from the - * information from the previous SACCH block. See also: - * 3GPP TS 44.006, section 11.2 */ + * previous SACCH block. See also 3GPP TS 44.006, section 11.2 */ if (rep_sacch) { add_sbits(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 4)); rc = gsm0503_xcch_decode(l2, BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf35c468310a690fd873cf968bb2c44b493ca5ea Gerrit-Change-Number: 42522 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_IPA: Introduce tests TC_ipa_tcp_{cli,srv}_adm_shutdown
by fixeria 28 Mar '26

28 Mar '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520?usp=email ) Change subject: stp: STP_Tests_IPA: Introduce tests TC_ipa_tcp_{cli,srv}_adm_shutdown ...................................................................... Patch Set 1: (2 comments) File stp/STP_Tests_IPA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520/comment/07258a8d_ab3f… : PS1, Line 209: //if (not g_ipa_configs[i].is_server) { Maybe add a comment explaining why the if is commented out? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520/comment/873dde39_f3b9… : PS1, Line 230: f_listen_ipa I am not strictly against abusing this function, but IMO a separate function with a self-explaining name (e.g. `f_ensure_no_conn(idx, Tval)` or whatever you like better) would be cleaner. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520?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: Ie30de6caa3e2b680aff9e50898e63f615b526500 Gerrit-Change-Number: 42520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Mar 2026 17:34:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_M3UA_TCP: Introduce tests TC_m3ua_tcp_{cli,srv}_adm_sh...
by fixeria 28 Mar '26

28 Mar '26

Attention is currently required from: daniel, laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42519?usp=email ) Change subject: stp: STP_Tests_M3UA_TCP: Introduce tests TC_m3ua_tcp_{cli,srv}_adm_shutdown ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File stp/STP_Tests_M3UA_TCP.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42519/comment/b5c480e2_c556… : PS1, Line 144: alt Please fix the formatting (shift to the left). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42519?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: Ia37a0e244895fbb447ef8e71a0980538cc9fd7f8 Gerrit-Change-Number: 42519 Gerrit-PatchSet: 1 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Mar 2026 17:23:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ccid-firmware[master]: firmware: replace libosmocore fsm timers
by Hoernchen 27 Mar '26

27 Mar '26

Attention is currently required from: Hoernchen, jolly. Hello Jenkins Builder, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: firmware: replace libosmocore fsm timers ...................................................................... firmware: replace libosmocore fsm timers Concurrent access from main loop and the different uart irqs was not going well and caused crashes. The libosmocore fsm does still allocate one internal timer, but it is not used by the firmware, so libosmocore will not touch the rbtree. Additionally ignore checkpatch jiffies complaints because we're trying to do firmware here. Closes: SYS#7877 Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd --- M .checkpatch.conf M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_host/Makefile A ccid_host/libosmo_emb.c A ccid_host/libosmo_emb.h M sysmoOCTSIM/main.c 9 files changed, 112 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/81/42481/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd Gerrit-Change-Number: 42481 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-ccid-firmware[master]: firmware: replace libosmocore fsm timers
by Jenkins Builder 27 Mar '26

27 Mar '26

Attention is currently required from: Hoernchen, jolly. Jenkins Builder has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email ) Change subject: firmware: replace libosmocore fsm timers ...................................................................... Patch Set 9: (1 comment) File ccid_host/libosmo_emb.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481/comment/d801367e_50… : PS9, Line 28: return (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000; ; Statements terminations use 1 semicolon -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?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: Id2bd67b3946bb451008965f0b68b4a919f4d10bd Gerrit-Change-Number: 42481 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Mar 2026 18:15:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ccid-firmware[master]: firmware: replace libosmocore fsm timers
by Hoernchen 27 Mar '26

27 Mar '26

Attention is currently required from: Hoernchen, jolly. Hello Jenkins Builder, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: firmware: replace libosmocore fsm timers ...................................................................... firmware: replace libosmocore fsm timers Concurrent access from main loop and the different uart irqs was not going well and caused crashes. The libosmocore fsm does still allocate one internal timer, but it is not used by the firmware, so libosmocore will not touch the rbtree. Additionally ignore checkpatch jiffies complaints because we're trying to do firmware here. Closes: SYS#7877 Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd --- M .checkpatch.conf M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_host/Makefile A ccid_host/libosmo_emb.c A ccid_host/libosmo_emb.h M sysmoOCTSIM/main.c 9 files changed, 112 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/81/42481/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd Gerrit-Change-Number: 42481 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_M3UA_TCP: Introduce tests TC_m3ua_tcp_{cli,srv}_adm_sh...
by pespin 27 Mar '26

27 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42519?usp=email ) Change subject: stp: STP_Tests_M3UA_TCP: Introduce tests TC_m3ua_tcp_{cli,srv}_adm_shutdown ...................................................................... stp: STP_Tests_M3UA_TCP: Introduce tests TC_m3ua_tcp_{cli,srv}_adm_shutdown Related tests already existed for STP_Tests_M3UA, but we want to explicitly test against M3UA_TCP since these tests involve the transport layer directly. Related: OS#6752 Change-Id: Ia37a0e244895fbb447ef8e71a0980538cc9fd7f8 --- M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml 3 files changed, 87 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/42519/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 6fb772d..485ca76 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -129,7 +129,7 @@ return m3ua_configs; } -private template PortEvent tr_ConnOpened := { +friend template PortEvent tr_ConnOpened := { connOpened := ? } @@ -1547,7 +1547,7 @@ return str; } -private function f_vty_cs7_asp_cmd(in M3uaConfig cfg, charstring cmd) runs on RAW_M3UA_CT +friend function f_vty_cs7_asp_cmd(in M3uaConfig cfg, charstring cmd) runs on RAW_M3UA_CT { var charstring asp_cfg_str := f_asp_cfg_str(cfg); f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, cmd); diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn index 1da65cc..dbd70ac 100644 --- a/stp/STP_Tests_M3UA_TCP.ttcn +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -35,6 +35,13 @@ import from STP_Tests_Common all; import from STP_Tests_M3UA all; +private altstep as_M3UA_wait_tcp_conn_closed(integer idx) runs on RAW_M3UA_CT { + var PortEvent pev; + [] M3UA[idx].receive(PortEvent:{connClosed:=?}) -> value pev { + log("Peer closed conn: ", pev) + } +} + private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { var M3uaConfig cfg_a := g_m3ua_configs[idx_a]; var M3uaConfig cfg_b := g_m3ua_configs[idx_b]; @@ -116,6 +123,78 @@ f_TC_m3ua_tcp(0, 1); } +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_m3ua_tcp_srv_adm_shutdown() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + f_init_m3ua(m3ua_configs := m3ua_configs); + + f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit); + f_sleep(1.0); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "shutdown"); + log("ASP should now be DOWN") + as_M3UA_wait_tcp_conn_closed(0); + + f_sleep(1.0); + /* Make sure SCTP conn will be closed when we connect to it. */ + log("Connecting to ASP (expect closed):"); + f_M3UA_connect_tcp(0); + timer T := 5.0; + T.start; + alt { + [] as_M3UA_wait_tcp_conn_closed(0); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected close from ASP SCTP server!"); + } + } + + /* Now let the ASP be active again, it should reconnect to us: */ + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "no shutdown"); + log("Connecting to ASP (expect success):"); + f_M3UA_connect_tcp(0); + f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit, ntfy_after_up := c_M3UA_ST_I_AS_PENDING); + + f_clear_m3ua(); +} + +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_m3ua_tcp_cli_adm_shutdown() runs on RAW_M3UA_CT { + var PortEvent pev; + var Misc_Helpers.ro_charstring asps := { "asp-client0-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); + f_init_m3ua_srv(); + + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); + f_sleep(1.0); + f_vty_cs7_asp_cmd(m3ua_configs[0], "shutdown"); + log("ASP should now be DOWN") + as_M3UA_wait_tcp_conn_closed(0); + + /* Wait for a while to make sure ASP doesn't reconnect to us: */ + timer T := 10.0; + T.start; + alt { + [] M3UA[0].receive(tr_ConnOpened) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Unexpected reconnect from ASP client!"); + } + [] T.timeout {} + } + + /* Now let the ASP be active again, it should reconnect to us: */ + f_vty_cs7_asp_cmd(m3ua_configs[0], "no shutdown"); + log("Waiting for client ASP to reconnect to us"); + M3UA[0].receive(tr_ConnOpened) -> value pev { + g_m3ua_conn_id[0] := pev.connOpened.connId; + } + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); + + f_clear_m3ua(); +} + /* Test the IUT sends heartbeat procedure when needed. */ testcase TC_m3ua_tcp_beat_timeout() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender-tcp" }; @@ -135,8 +214,11 @@ execute( TC_m3ua_tcp_srv() ); execute( TC_m3ua_tcp_srv_cli() ); + execute( TC_m3ua_tcp_srv_adm_shutdown() ); + execute( TC_m3ua_tcp_cli_adm_shutdown() ); + execute( TC_m3ua_tcp_beat_timeout() ); execute( TC_m3ua_tcp_clnt_beat_timeout() ); } -} \ No newline at end of file +} diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 7d9d684..44f5ced 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -49,6 +49,8 @@ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_cli' time='MASKED'/> + <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_adm_shutdown' time='MASKED'/> + <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_clnt_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_nodynamic' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42519?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: Ia37a0e244895fbb447ef8e71a0980538cc9fd7f8 Gerrit-Change-Number: 42519 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_IPA: Introduce tests TC_ipa_tcp_{cli,srv}_adm_shutdown
by pespin 27 Mar '26

27 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520?usp=email ) Change subject: stp: STP_Tests_IPA: Introduce tests TC_ipa_tcp_{cli,srv}_adm_shutdown ...................................................................... stp: STP_Tests_IPA: Introduce tests TC_ipa_tcp_{cli,srv}_adm_shutdown Related tests already exist for M3UA and M3UA_TCP, but were missing for IPA ASPs. Change-Id: Ie30de6caa3e2b680aff9e50898e63f615b526500 Related: OS#6752 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 104 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/42520/1 diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 0a5b56c..3184b48 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -76,6 +76,13 @@ var IpaConfigs g_ipa_configs; } +private altstep as_IPA_wait_tcp_conn_closed(integer idx) runs on IPA_CT { + var ASP_IPA_Event evt; + [] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN)) -> value evt { + log("Peer closed conn: ", evt) + } +} + friend function ipa_build_configs(template (omit) Misc_Helpers.ro_charstring asps := omit) return IpaConfigs { @@ -182,6 +189,30 @@ } } +friend function f_IPA_close(integer i) runs on IPA_CT { + var Result res; + if (vc_IPA[i] == null) { + log("Not close()ing ipacfg := ", g_ipa_configs[i], " (not connected)"); + /* not connected */ + return; + } + vc_IPA[i].stop; + vc_IPA[i] := null; +} + +private function f_clear_ipa() runs on IPA_CT { + var integer i; + + log("Clearing IPA..."); + + for (i := 0; i < lengthof(g_ipa_configs); i:=i+1) { + //if (not g_ipa_configs[i].is_server) { + f_IPA_close(i); + //} + } + setverdict(pass, "IPA cleared"); +} + friend function f_connect_ipa(integer idx, boolean exp_act := true) runs on IPA_CT { vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, g_ipa_configs[idx].remote_port, @@ -196,28 +227,35 @@ } } -friend function f_listen_ipa(integer idx) runs on IPA_CT { +friend function f_listen_ipa(integer idx, boolean exp_conn := true, float to_val := 10.0) runs on IPA_CT { vc_IPA[idx].start(IPA_Emulation.main_server(mp_local_ipa_ip, g_ipa_configs[idx].local_port)); /* wait for incoming connection to IPA port before proceeding */ var integer st := 0; - timer T := 10.0; + timer T := to_val; T.start; alt { - [st == 0] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { + [exp_conn and st == 0] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { st := 1; repeat; } - [st == 1] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_RESP)) { + [exp_conn and st == 1] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_RESP)) { st := 2; repeat; } - [st == 2] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { + [exp_conn and st == 2] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { setverdict(pass); } - [] T.timeout { + [exp_conn] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No connection to IPA[", idx, "] Port")); } + [not exp_conn] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got unexpected connection to IPA[", idx, "] Port")); + } + [not exp_conn] T.timeout { + setverdict(pass); + } } } @@ -681,6 +719,61 @@ } } +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_ipa_tcp_srv_adm_shutdown() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0); + + f_sleep(1.0); + f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "shutdown"); + log("ASP should now be DOWN") + as_IPA_wait_tcp_conn_closed(0); + f_clear_ipa(); + f_init_ipa(ipa_configs := ipa_configs); + + f_sleep(1.0); + /* Make sure SCTP conn will be closed when we connect to it. */ + log("Connecting to ASP (expect closed):"); + f_connect_ipa(0, exp_act := false); + f_clear_ipa(); + + /* Now let the ASP be active again, it should allow us to reconnect: */ + f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "no shutdown"); + log("Connecting to ASP (expect success):"); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0); + setverdict(pass); +} + +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_ipa_tcp_cli_adm_shutdown() runs on IPA_CT { + var PortEvent pev; + var Misc_Helpers.ro_charstring asps := { "ipa-asp-client0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + + f_init_ipa(ipa_configs := ipa_configs); + f_listen_ipa(0); + f_sleep(1.0); + f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "shutdown"); + log("ASP should now be DOWN") + as_IPA_wait_tcp_conn_closed(0); + f_clear_ipa(); + + /* Wait for a while to make sure ASP doesn't reconnect to us: */ + f_init_ipa(ipa_configs := ipa_configs); + f_listen_ipa(0, exp_conn := false, to_val := 10.0); + f_clear_ipa(); + + /* Now let the ASP be active again, it should reconnect to us: */ + f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "no shutdown"); + log("Waiting for client ASP to reconnect to us"); + f_init_ipa(ipa_configs := ipa_configs); + f_listen_ipa(0); + setverdict(pass); +} + testcase TC_beat() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); @@ -775,6 +868,9 @@ execute( TC_unknown_client_dynamic_combinedlset_loadshare() ); execute( TC_inaccessible_sp() ); + execute( TC_ipa_tcp_srv_adm_shutdown() ); + execute( TC_ipa_tcp_cli_adm_shutdown() ); + execute( TC_beat() ); execute( TC_beat_timeout() ); execute( TC_clnt_beat_timeout() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 44f5ced..2dfe5b1 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -66,6 +66,8 @@ <testcase classname='STP_Tests_IPA' name='TC_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_inaccessible_sp' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_ipa_tcp_srv_adm_shutdown' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_ipa_tcp_cli_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42520?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: Ie30de6caa3e2b680aff9e50898e63f615b526500 Gerrit-Change-Number: 42520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: measurement: is_meas_complete(): fix fn_mod variable type
by fixeria 27 Mar '26

27 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/42515?usp=email ) Change subject: measurement: is_meas_complete(): fix fn_mod variable type ...................................................................... measurement: is_meas_complete(): fix fn_mod variable type `fn_mod` was declared as 'unsigned int' but initialized to -1, which yields `UINT_MAX` via implicit conversion. Use 'int' instead to make the sentinel value unambiguous and match the `%d` format used in the debug log. Change-Id: I6b0bce9bc9fca1d6effbb2da2319132cdff4e9c7 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index 19bff71..afbdc84 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -252,7 +252,7 @@ * unit-tests) */ int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) { - unsigned int fn_mod = -1; + int fn_mod = -1; const uint8_t *tbl; int rc = 0; enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b0bce9bc9fca1d6effbb2da2319132cdff4e9c7 Gerrit-Change-Number: 42515 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026