June 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: epdg/testenv/run osmo epdg…: wait up to 30s

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: wait up to 30s ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?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: Ia7298275b92f30efc40e9d6afa1abc8d7c5536d6 Gerrit-Change-Number: 40477 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 11:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg/testenv/run osmo epdg…: fix ip link ls output

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: fix ip link ls output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?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: I8ce8824930e8841dddd7a67d178d5140e4f71b84 Gerrit-Change-Number: 40476 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 11:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg/testenv/run osmo epdg…: wait up to 30s

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: wait up to 30s ...................................................................... epdg/testenv/run_osmo_epdg…: wait up to 30s Wait up to 30s for the tun device as waiting 10s is not enough if jenkins is under high load. Related: https://jenkins.osmocom.org/jenkins/job/ttcn3-epdg-test-net-next/29/console Change-Id: Ia7298275b92f30efc40e9d6afa1abc8d7c5536d6 --- M epdg/testenv/run_osmo_epdg_with_dummy_ue.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/40477/1 diff --git a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh index 439dccc..99d43e8 100755 --- a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh +++ b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh @@ -14,7 +14,7 @@ set +x FOUND=0 -for i in $(seq 1 10); do +for i in $(seq 1 30); do sleep 1 if ip link ls dev "$EPDG_TUN" >/dev/null 2>&1; then FOUND=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?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: Ia7298275b92f30efc40e9d6afa1abc8d7c5536d6 Gerrit-Change-Number: 40477 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg/testenv/run osmo epdg…: fix ip link ls output

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: fix ip link ls output ...................................................................... epdg/testenv/run_osmo_epdg…: fix ip link ls output In the code that waits until the tun device is available, fix the silencing of stdout and stderr. Change-Id: I8ce8824930e8841dddd7a67d178d5140e4f71b84 --- M epdg/testenv/run_osmo_epdg_with_dummy_ue.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/40476/1 diff --git a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh index 93853b8..439dccc 100755 --- a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh +++ b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh @@ -16,7 +16,7 @@ FOUND=0 for i in $(seq 1 10); do sleep 1 - if ip link ls dev "$EPDG_TUN" 2>&1 >/dev/null; then + if ip link ls dev "$EPDG_TUN" >/dev/null 2>&1; then FOUND=1 break fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?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: I8ce8824930e8841dddd7a67d178d5140e4f71b84 Gerrit-Change-Number: 40476 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email ) Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout Related: SYS#7501 Related: OS#4072 Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 --- M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml 3 files changed, 97 insertions(+), 3 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/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 7b78a72..497bd82 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -159,12 +159,13 @@ } friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg, - float timeout_val := 5.0, boolean answer_beat := true) runs on RAW_M3UA_CT { + float timeout_val := 5.0, boolean answer_beat := true) +runs on RAW_M3UA_CT return M3UA_RecvFrom { var M3UA_RecvFrom rx; timer T := timeout_val; T.start; alt { - [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { + [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) -> value rx { setverdict(pass); } [answer_beat] as_m3ua_beat_answer(idx); @@ -178,6 +179,7 @@ log2str("Timeout waiting for M3UA[", idx, "] ", msg)); } } + return rx; } /* flush any number of queued messages matching 'msg' */ @@ -496,6 +498,71 @@ f_clear_m3ua(); } +friend function f_TC_beat_timeout(Misc_Helpers.ro_charstring asps) runs on RAW_M3UA_CT +{ + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var M3UA_RecvFrom rx; + var template (omit) M3UA_Heartbeat_Data hbd := omit; + var float timeout_val := 3.0 + 1.0; + + f_init_m3ua(answer_beat := false, m3ua_configs := m3ua_configs); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat 3"); + + if (m3ua_configs[0].is_server) { + 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, *)); + } + + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("1st BEAT received"); + if (ispresent(rx.msg.m3UA_BEAT.messageParameters.heartbeat_Data)) { + hbd := rx.msg.m3UA_BEAT.messageParameters.heartbeat_Data; + } + f_M3UA_send(0, ts_M3UA_BEAT_ACK(hbd)); + /* Make sure next HEARBEAT arrives around the time we configured. + * Do not answer this nor next heardbeat: */ + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("2nd BEAT received"); + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("3rd BEAT received"); + + /* After 2*T(beat), IUT should figure out peer is not responding and terminate the conn: */ + timer T := timeout_val; + T.start; + alt { + [] M3UA[0].receive(PortEvent:{connClosed := ?}) { + setverdict(pass); /* TCP */ + } + [] M3UA[0].receive(tr_SctpShutDownEvent(g_m3ua_conn_id[0])) { + setverdict(pass); /* SCTP */ + } + [] M3UA[0].receive(tr_SctpAssocChange) { repeat; } + [] M3UA[0].receive(tr_SctpPeerAddrChange) { repeat; } + [] M3UA[0].receive(t_M3UA_RecvFrom(?)) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected M3UA ", rx, " while waiting for SctpShutDownEvent")); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for M3UA SctpShutDownEvent")); + } + } + + /* return to default value: */ + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat 30"); + + f_clear_m3ua(); +} + +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + f_TC_beat_timeout(asps); +} + /* Test the ASP-ACTIVATE procedure (without traffic-mode or routing ctx) */ testcase TC_asp_act() runs on RAW_M3UA_CT { f_init_m3ua(); @@ -1138,6 +1205,12 @@ f_clear_m3ua(); } +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_clnt_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + f_TC_beat_timeout(asps); +} + /* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ testcase TC_clnt_asp_act() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; @@ -1587,6 +1660,7 @@ execute( TC_connect_asp_up() ); execute( TC_beat() ); execute( TC_beat_payload() ); + execute( TC_beat_timeout() ); execute( TC_asp_act() ); execute( TC_asp_act_override() ); execute( TC_asp_act_loadshare() ); @@ -1617,6 +1691,7 @@ /* Test STP as SCTP client + M3UA ASP role */ execute( TC_clnt_connect_asp_up() ); + execute( TC_clnt_beat_timeout() ); execute( TC_clnt_asp_act() ); execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn index a5e4c2a..1da65cc 100644 --- a/stp/STP_Tests_M3UA_TCP.ttcn +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -116,12 +116,27 @@ f_TC_m3ua_tcp(0, 1); } +/* 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" }; + f_TC_beat_timeout(asps); +} + +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_m3ua_tcp_clnt_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-client0-tcp" }; + f_TC_beat_timeout(asps); +} + control { /* M3UA TCP Tests */ execute( TC_m3ua_tcp_cli() ); execute( TC_m3ua_tcp_cli_srv() ); execute( TC_m3ua_tcp_srv() ); execute( TC_m3ua_tcp_srv_cli() ); + + 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 db4cbec..fde8564 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,8 +1,9 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='55' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='59' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_override' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_loadshare' time='MASKED'/> @@ -23,6 +24,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_dyn_asp_as_rkm_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_dyn_2asp_as_rkm_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_connect_asp_up' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_sg_to_asp' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_to_sg' time='MASKED'/> @@ -44,6 +46,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_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'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_known_client_nodynamic' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?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: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 4 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>

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email ) Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?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: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 4 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 09:36:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email ) Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?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: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 09:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: m3ua/sua: Implement ASP Hearbeat procedure

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?usp=email ) Change subject: m3ua/sua: Implement ASP Hearbeat procedure ...................................................................... m3ua/sua: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure. Change-Id: Ie4d90447ef8f1b1174085aad55114ab6460ca559 --- M src/xua_asp_fsm.c 1 file changed, 88 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index adc9f0e..26f3a78 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -89,6 +89,12 @@ struct osmo_timer_list timer; int out_event; } t_ack; + + /* Timer for tracking HEARTBEAT without HEARTBEAT ACK */ + struct { + struct osmo_timer_list timer; + uint32_t unacked_beats; + } t_beat; }; struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, @@ -388,6 +394,67 @@ } } +static void xua_t_beat_stop(struct osmo_fsm_inst *fi) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + + LOGPFSML(fi, LOGL_DEBUG, "T(beat) stopped\n"); + osmo_timer_del(&xafp->t_beat.timer); + xafp->t_beat.unacked_beats = 0; +} + +static void xua_t_beat_send(struct osmo_fsm_inst *fi) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; + + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_BEAT, OSMO_TDEF_S, -1); + + /* T(beat) disabled */ + if (timeout_sec == 0) { + xua_t_beat_stop(fi); + return; + } + + LOGPFSML(fi, LOGL_DEBUG, "Tx HEARTBEAT (%u unacked)\n", xafp->t_beat.unacked_beats); + + /* Avoid increasing in case some extra gratuitous PING is transmitted: */ + if (!osmo_timer_pending(&xafp->t_beat.timer)) + xafp->t_beat.unacked_beats++; + + /* (re-)arm T(beat): */ + osmo_timer_schedule(&xafp->t_beat.timer, timeout_sec, 0); + + /* Send HEARTBEAT: */ + peer_send(fi, XUA_ASP_E_ASPSM_BEAT, NULL); + +} + +static void xua_t_beat_cb(void *_fi) +{ + struct osmo_fsm_inst *fi = _fi; + struct xua_asp_fsm_priv *xafp = fi->priv; + + if (xafp->t_beat.unacked_beats < 2) { + if (xafp->t_beat.unacked_beats == 1) + LOGPFSML(fi, LOGL_NOTICE, + "Peer didn't respond to HEARTBEAT with HEARTBEAT ACK, retrying once more\n"); + xua_t_beat_send(fi); + return; + } + + /* RFC4666 4.3.4.6: If no Heartbeat Ack message (or any other M3UA + * message) is received from the M3UA peer within 2*T(beat), the remote + * M3UA peer is considered unavailable. Transmission of Heartbeat + * messages is stopped, and the signalling process SHOULD attempt to + * re-establish communication if it is configured as the client for the + * disconnected M3UA peer. + */ + LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to HEARTBEAT with HEARTBEAT ACK and became disconnected\n"); + ss7_asp_disconnect_stream(xafp->asp); + +} + #define ENSURE_ASP_OR_IPSP(fi, event) \ do { \ struct xua_asp_fsm_priv *_xafp = fi->priv; \ @@ -423,6 +490,7 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + xua_t_beat_stop(fi); dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); } @@ -489,6 +557,13 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + bool went_up = (prev_state == XUA_ASP_S_DOWN); + + if (went_up) { + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + xua_t_beat_send(fi); + } + /* 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 @@ -498,7 +573,7 @@ struct xua_as_event_asp_inactive_ind_pars pars = { .asp = asp, .asp_requires_notify = (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) && - (prev_state == XUA_ASP_S_DOWN), + went_up, }; dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } @@ -620,6 +695,13 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + bool went_up = (prev_state == XUA_ASP_S_DOWN); + + if (went_up) { + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + xua_t_beat_send(fi); + } + dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } @@ -717,7 +799,8 @@ peer_send(fi, XUA_ASP_E_ASPSM_BEAT_ACK, xua); break; case XUA_ASP_E_ASPSM_BEAT_ACK: - /* FIXME: stop timer, if any */ + LOGPFSML(fi, LOGL_DEBUG, "Rx HEARTBEAT ACK\n"); + xafp->t_beat.unacked_beats = 0; break; case XUA_ASP_E_AS_ASSIGNED: /* Ignore, only used in IPA asps so far. */ @@ -742,6 +825,7 @@ return; osmo_timer_del(&xafp->t_ack.timer); + xua_t_beat_stop(fi); if (xafp->asp) xafp->asp->fi = NULL; @@ -839,6 +923,8 @@ xafp->role = role; xafp->asp = asp; + osmo_timer_setup(&xafp->t_beat.timer, xua_t_beat_cb, fi); + fi->priv = xafp; /* Attach FSM to ASP: */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?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: Ie4d90447ef8f1b1174085aad55114ab6460ca559 Gerrit-Change-Number: 40461 Gerrit-PatchSet: 5 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>

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... ipa: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure using own IPA PING & PONG messages. Related: OS#4072 Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d --- M src/ipa.c M src/xua_asp_fsm.c M src/xua_internal.h 3 files changed, 105 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/ipa.c b/src/ipa.c index c04b476..58646fa 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -52,6 +52,20 @@ #include "ss7_internal.h" #include "xua_asp_fsm.h" +/* generate a msgb containing an IPA CCM PING message */ +struct msgb *ipa_gen_ping(void) +{ + /* sufficient headroom for osmo_ipa_msg_push_header() */ + struct msgb *msg = ipa_msg_alloc(16); + if (!msg) + return NULL; + + msgb_put_u8(msg, IPAC_MSGT_PING); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); + + return msg; +} + struct msgb *ipa_to_msg(struct xua_msg *xua) { struct xua_msg_part *data_ie; diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 1d6b078..adc9f0e 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -879,8 +879,11 @@ /* Structure holding parsed data of the IPA CCM ID exchange */ struct ipaccess_unit *ipa_unit; - /* Timer for tracking if no PONG is received in response to PING */ - struct osmo_timer_list pong_timer; + /* Timer for tracking PING without PONG response */ + struct { + struct osmo_timer_list timer; + uint32_t unacked_beats; + } t_beat; /* Did we receive IPA ID ACK before IPA ID RESP ? */ bool ipa_id_ack_rcvd; }; @@ -907,11 +910,82 @@ return fd; } +static void ipa_t_beat_stop(struct osmo_fsm_inst *fi) +{ + struct ipa_asp_fsm_priv *iafp = fi->priv; + + LOGPFSML(fi, LOGL_DEBUG, "T(beat) stopped\n"); + osmo_timer_del(&iafp->t_beat.timer); + iafp->t_beat.unacked_beats = 0; +} + +static void ipa_t_beat_send(struct osmo_fsm_inst *fi) +{ + struct ipa_asp_fsm_priv *iafp = fi->priv; + struct msgb *msg; + uint32_t timeout_sec; + + timeout_sec = osmo_tdef_get(iafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_BEAT, OSMO_TDEF_S, -1); + + /* T(beat) disabled */ + if (timeout_sec == 0) { + ipa_t_beat_stop(fi); + return; + } + + LOGPFSML(fi, LOGL_DEBUG, "Tx HEARTBEAT (%u unacked)\n", iafp->t_beat.unacked_beats); + + /* Avoid increasing in case some extra gratuitous PING is transmitted: */ + if (!osmo_timer_pending(&iafp->t_beat.timer)) + iafp->t_beat.unacked_beats++; + + /* (re-)arm T(beat): */ + osmo_timer_schedule(&iafp->t_beat.timer, timeout_sec, 0); + + /* Send PING: */ + if ((msg = ipa_gen_ping())) + osmo_ss7_asp_send(iafp->asp, msg); + /* we don't own msg anymore in any case here */ +} + +static void ipa_t_beat_cb(void *_fi) +{ + struct osmo_fsm_inst *fi = _fi; + struct ipa_asp_fsm_priv *iafp = fi->priv; + + if (iafp->t_beat.unacked_beats < 2) { + if (iafp->t_beat.unacked_beats == 1) + LOGPFSML(fi, LOGL_NOTICE, + "Peer didn't respond to PING with PONG, retrying once more\n"); + ipa_t_beat_send(fi); + return; + } + + /* RFC4666 4.3.4.6: If no Heartbeat Ack message (or any other M3UA + * message) is received from the M3UA peer within 2*T(beat), the remote + * M3UA peer is considered unavailable. Transmission of Heartbeat + * messages is stopped, and the signalling process SHOULD attempt to + * re-establish communication if it is configured as the client for the + * disconnected M3UA peer. + */ + LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to PING with PONG and became disconnected\n"); + ss7_asp_disconnect_stream(iafp->asp); + +} + /*************** ** FSM states ** ***************/ /* Server + Client: Initial State, wait for M-ASP-UP.req */ +static void ipa_asp_fsm_down_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; + ipa_t_beat_stop(fi); + dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); +} + static void ipa_asp_fsm_down(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1079,6 +1153,10 @@ .asp = asp, .asp_requires_notify = false, }; + + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + ipa_t_beat_send(fi); + dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } @@ -1163,8 +1241,8 @@ ipaccess_send_pong(fd); break; case XUA_ASP_E_ASPSM_BEAT_ACK: - /* stop timer, if any */ - osmo_timer_del(&iafp->pong_timer); + LOGPFSML(fi, LOGL_DEBUG, "Rx HEARTBEAT ACK\n"); + iafp->t_beat.unacked_beats = 0; break; case XUA_ASP_E_AS_ASSIGNED: as = data; @@ -1183,16 +1261,6 @@ } } -static void ipa_pong_timer_cb(void *_fi) -{ - struct osmo_fsm_inst *fi = _fi; - struct ipa_asp_fsm_priv *iafp = fi->priv; - - LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to PING? with PONG!\n"); - /* kill ASP and (wait for) re-connect */ - osmo_ss7_asp_disconnect(iafp->asp); -} - static int ipa_asp_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1207,7 +1275,12 @@ { struct ipa_asp_fsm_priv *iafp = fi->priv; - if (iafp && iafp->asp) + if (!iafp) + return; + + ipa_t_beat_stop(fi); + + if (iafp->asp) iafp->asp->fi = NULL; } @@ -1219,7 +1292,7 @@ S(IPA_ASP_S_WAIT_ID_RESP), .name = "ASP_DOWN", .action = ipa_asp_fsm_down, - .onenter = xua_asp_fsm_down_onenter, + .onenter = ipa_asp_fsm_down_onenter, }, /* Server Side */ [IPA_ASP_S_WAIT_ID_RESP] = { @@ -1340,8 +1413,7 @@ iafp->asp = asp; iafp->ipa_unit = talloc_zero(iafp, struct ipaccess_unit); iafp->ipa_unit->unit_name = talloc_strdup(iafp->ipa_unit, unit_name); - iafp->pong_timer.cb = ipa_pong_timer_cb; - iafp->pong_timer.data = fi; + osmo_timer_setup(&iafp->t_beat.timer, ipa_t_beat_cb, fi); fi->priv = iafp; diff --git a/src/xua_internal.h b/src/xua_internal.h index 60d751c..576708f 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -116,6 +116,7 @@ int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, const struct xua_msg_part *rctx_ie); +struct msgb *ipa_gen_ping(void); struct msgb *ipa_to_msg(struct xua_msg *xua); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?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: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 5 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> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: m3ua/sua: Implement ASP Hearbeat procedure

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?usp=email ) Change subject: m3ua/sua: Implement ASP Hearbeat procedure ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?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: Ie4d90447ef8f1b1174085aad55114ab6460ca559 Gerrit-Change-Number: 40461 Gerrit-PatchSet: 5 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 09:33:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025