- gerrit-log - lists.osmocom.org

[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

6 days, 20 hours

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>

6 days, 21 hours

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>

6 days, 21 hours

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

6 days, 21 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: 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/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... Patch Set 5: Code-Review+2 -- 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: comment 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 09:32:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 21 hours

1
0
0 0

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

by osmith

Attention is currently required from: fixeria, pespin. osmith 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+1 -- 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jun 2025 09:29:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 21 hours

1
0
0 0

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

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... Patch Set 5: Code-Review+1 -- 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: comment 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-CC: fixeria <vyanitskiy(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:26:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 21 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: IPA: Introduce test TC_clnt_beat_timeout

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40475?usp=email ) Change subject: stp: IPA: Introduce test TC_clnt_beat_timeout ...................................................................... stp: IPA: Introduce test TC_clnt_beat_timeout Change-Id: I5a41857dbd9f0bfe40a3a539aaed8361bc29fd6b Related: SYS#7501 Related: OS#4072 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp-ipa.confmerge 4 files changed, 55 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 5399093..9e9538e 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -60,6 +60,13 @@ is_server := false, remote_port := 5000, local_port := 20007 + }, + { + asp_name := "ipa-asp-client0", + as_name := "ipa-as-client0", + is_server := true, + remote_port := 7001, + local_port := 6001 } } diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 54a64d8..a34fd6d 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -203,6 +203,30 @@ } } +friend function f_listen_ipa(integer idx) 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; + T.start; + alt { + [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)) { + st := 2; repeat; + } + [st == 2] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { + setverdict(pass); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No connection to IPA[", idx, "] Port")); + } + } +} /* "accept-asp-connections pre-configured" and client from unknown ASP source * (but known AS/ipa_unit_name) */ @@ -564,11 +588,10 @@ f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "timer xua beat 3"); if (ipa_configs[0].is_server) { - /* TODO */ + f_listen_ipa(0); } else { f_connect_ipa(0); } - f_sleep(3.0); /* receive CCM IPA PING: */ f_ipa_cfg_chg_ccm_enabled(IPA_CFG[0], false); @@ -610,6 +633,12 @@ f_TC_beat_timeout(asps); } +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_clnt_beat_timeout() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-client0" }; + f_TC_beat_timeout(asps); +} + control { execute( TC_unknown_client_nodynamic() ); execute( TC_unknown_as_client_nodynamic() ); @@ -624,6 +653,7 @@ 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 db36ab4..db4cbec 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='54' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='55' 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'/> @@ -56,6 +56,7 @@ <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' 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'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_m3ua_to_ipa' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 500f5ac..954f175 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -17,12 +17,12 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server asp ipa-asp-loadshare-receiver1 20003 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server as ipa-as-loadshare-receiver ipa traffic-mode loadshare routing-key 0 7 @@ -41,18 +41,28 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server asp ipa-asp-override-receiver1 20007 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server as ipa-as-override-receiver ipa traffic-mode override routing-key 0 8 point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + asp ipa-asp-client0 6001 7001 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role asp + transport-role client + as ipa-as-client ipa + traffic-mode override + routing-key 0 9 + point-code override dpc 35 + asp ipa-asp-client0 ! ! ROUTING TABLE: ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40475?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: I5a41857dbd9f0bfe40a3a539aaed8361bc29fd6b Gerrit-Change-Number: 40475 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

6 days, 22 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: IPA: Introduce test TC_beat_timeout

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40473?usp=email ) Change subject: stp: IPA: Introduce test TC_beat_timeout ...................................................................... stp: IPA: Introduce test TC_beat_timeout Change-Id: I6f16915238d7762faf1c63fdeccca7e4a5f20893 Related: SYS#7501 Related: OS#4072 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 91 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 07d1f2b..54a64d8 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -107,7 +107,24 @@ friend function f_vty_cs7_ipa_as_cmd(charstring as_name, charstring cmd) runs on IPA_CT { f_vty_config2(VTY, {"cs7 instance 0", "as " & as_name & " ipa"}, cmd); +} +private function f_ipa_asp_cfg_str(in IpaConfig cfg) +return charstring { + var charstring str; + + str := "asp " & cfg.asp_name; + str := str & " " & int2str(cfg.local_port); + str := str & " " & int2str(cfg.remote_port); + str := str & " ipa"; + + return str; +} + +private function f_vty_cs7_ipa_asp_cmd(IpaConfig cfg, charstring cmd) runs on IPA_CT +{ + var charstring asp_cfg_str := f_ipa_asp_cfg_str(cfg); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, cmd); } friend function f_IPA_send(integer idx, octetstring data) runs on IPA_CT { @@ -115,14 +132,20 @@ IPA[idx].send(t_ASP_MTP3_TRANSFERreq(sio, 0, 0, 0, data)); } -friend function f_IPA_exp(integer idx, template (present) octetstring data) runs on IPA_CT { +friend function f_IPA_exp(integer idx, template (present) octetstring data, float timeout_val := 5.0) runs on IPA_CT { + timer T := timeout_val; + T.start; alt { [] IPA[idx].receive(t_ASP_MTP3_TRANSFERind(?, ?, ?, ?, data)) { setverdict(pass); } [] IPA[idx].receive { - setverdict(fail, "Received unexpected data on IPA port while waiting for ", data); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected data on IPA port while waiting for ", data)); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for IPA[", idx, "] ", data)); } } } @@ -525,6 +548,68 @@ f_IPA_ping(0); } +private function f_TC_beat_timeout(Misc_Helpers.ro_charstring asps) runs on IPA_CT +{ + var IpaConfigs ipa_configs := ipa_build_configs(asps); + var ASP_MTP3_TRANSFERind rx; + var float timeout_val := 3.0 + 1.0; + var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; + var IpaCcmMsgtype ipa_pong_msg := IPAC_MSGT_PONG; + var octetstring ipa_ping_data := int2oct(enum2int(ipa_ping_msg), 1); + var octetstring ipa_pong_data := int2oct(enum2int(ipa_pong_msg), 1); + + f_init_common(); + f_init_ipa(ipa_configs := ipa_configs); + + f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "timer xua beat 3"); + + if (ipa_configs[0].is_server) { + /* TODO */ + } else { + f_connect_ipa(0); + } + f_sleep(3.0); + /* receive CCM IPA PING: */ + f_ipa_cfg_chg_ccm_enabled(IPA_CFG[0], false); + + IPA_CTRL[0].receive(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_ping_data)); + log("1st PING received"); + IPA_CTRL[0].send(valueof(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_pong_data))); + + /* Make sure next HEARBEAT arrives around the time we configured. + * Do not answer this nor next heardbeat: */ + IPA_CTRL[0].receive(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_ping_data)); + log("2nd PING received"); + IPA_CTRL[0].receive(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_ping_data)); + log("3rd PING received"); + + /* After 2*T(beat), IUT should figure out peer is not responding and terminate the conn: */ + timer T := timeout_val; + T.start; + alt { + [] IPA_CTRL[0].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN)) { + setverdict(pass); + } + [] IPA[0].receive(t_ASP_MTP3_TRANSFERind(?, ?, ?, ?, ?)) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected IPA ", rx, " while waiting for connClosed")); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for IPA connClosed")); + } + } + + /* return to default value: */ + f_vty_cs7_ipa_asp_cmd(g_ipa_configs[0], "timer xua beat 30"); +} + +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_beat_timeout() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender" }; + f_TC_beat_timeout(asps); +} + control { execute( TC_unknown_client_nodynamic() ); execute( TC_unknown_as_client_nodynamic() ); @@ -538,6 +623,7 @@ execute( TC_unknown_client_dynamic_tmt_loadshare() ); execute( TC_beat() ); + execute( TC_beat_timeout() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 44e0ea2..db36ab4 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='53' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='54' 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'/> @@ -55,6 +55,7 @@ <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' 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_M3UA' name='TC_m3ua_to_ipa' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40473?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: I6f16915238d7762faf1c63fdeccca7e4a5f20893 Gerrit-Change-Number: 40473 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

6 days, 22 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: IPA: Introduce test TC_beat

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40472?usp=email ) Change subject: stp: IPA: Introduce test TC_beat ...................................................................... stp: IPA: Introduce test TC_beat Similar to the one already available in STP_Tests_M3UA, but testing PING/PONG in IPA. Change-Id: I3d762fb4780aaa9931c3841cce69da6ee95529f3 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 43 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 8a34054..07d1f2b 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -25,6 +25,8 @@ import from SCCPasp_Types all; import from SCCP_Emulation all; +import from IPA_Types all; +import from IPA_CodecPort all; import from IPA_Emulation all; import from M3UA_Emulation all; @@ -66,6 +68,7 @@ * having to re-invent IPA CCM handling here */ port MTP3asp_PT IPA[MAX_NR_IPA]; port IPA_SP_PT IPA_CTRL[MAX_NR_IPA]; + port IPA_CFG_PT IPA_CFG[MAX_NR_IPA]; var IPA_Emulation_CT vc_IPA[MAX_NR_IPA]; var IPA_CCM_Parameters g_ccm_pars[MAX_NR_IPA]; var IpaConfigs g_ipa_configs; @@ -157,6 +160,7 @@ map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT); connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT); connect(self:IPA_CTRL[i], vc_IPA[i]:IPA_SP_PORT); + connect(self:IPA_CFG[i], vc_IPA[i]:CFG_PORT); g_ccm_pars[i] := c_IPA_default_ccm_pars; g_ccm_pars[i].name := g_ipa_configs[i].as_name; } @@ -486,6 +490,41 @@ f_tc_tmt_loadshare_sls(true); } +private function f_IPA_ping(integer idx) runs on IPA_CT +{ + var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; + var IpaCcmMsgtype ipa_pong_msg := IPAC_MSGT_PONG; + var octetstring ipa_ping_data := int2oct(enum2int(ipa_ping_msg), 1); + var octetstring ipa_pong_data := int2oct(enum2int(ipa_pong_msg), 1); + timer T := 3.0; + T.start; + + IPA_CTRL[idx].send(valueof(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_ping_data))); + + alt { + [] IPA_CTRL[idx].receive(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_pong_data)) { + setverdict(pass); + } + [] IPA_CTRL[idx].receive(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_ping_data)) { + /* Answer any PING from peer meanwhile: */ + IPA_CTRL[0].send(valueof(t_ASP_IPA_UD(IPAC_PROTO_CCM, ipa_pong_data))); + repeat; + } + } +} + +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); + + f_init_common(); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0); + + f_ipa_cfg_chg_ccm_enabled(IPA_CFG[0], false); + f_IPA_ping(0); +} + control { execute( TC_unknown_client_nodynamic() ); execute( TC_unknown_as_client_nodynamic() ); @@ -497,6 +536,8 @@ execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); + + execute( TC_beat() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 88e8d17..44e0ea2 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='52' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='53' 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'/> @@ -54,6 +54,7 @@ <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_m3ua_to_ipa' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40472?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: I3d762fb4780aaa9931c3841cce69da6ee95529f3 Gerrit-Change-Number: 40472 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

6 days, 22 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log