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

[M] Change in libosmo-sigtran[master]: Implement ASP adm state shutdown

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40197?usp=email ) Change subject: Implement ASP adm state shutdown ...................................................................... Implement ASP adm state shutdown These commands are used to tweak administrative use of a given ASP, tearing down the existing SCTP/TCP connection in the process of needed, plus: * In the case of SCTP client: avoid reconnecting until administratively enabled again. * In the case of SCTP server: Immediately close incoming connections for that ASP until administratively enabled again. Related: OS#6752 Change-Id: I7e4eedb65c4f2952f8b39ca4c539ca2f40e9946c --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_asp.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/ss7_asp.h M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty 7 files changed, 121 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/97/40197/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 0bde3d9..dc9aada 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -248,6 +248,7 @@ /*! in normal operation */ OSMO_SS7_ASP_ADM_S_ENABLED, }; +extern const struct value_string osmo_ss7_asp_admin_state_names[]; enum osmo_ss7_asp_role { OSMO_SS7_ASP_ROLE_ASP, diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f2d511a..56767e9 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -124,6 +124,13 @@ { 0, NULL } }; +const struct value_string osmo_ss7_asp_admin_state_names[] = { + { OSMO_SS7_ASP_ADM_S_SHUTDOWN, "SHUTDOWN" }, + { OSMO_SS7_ASP_ADM_S_BLOCKED, "BLOCKED" }, + { OSMO_SS7_ASP_ADM_S_ENABLED, "ENABLED" }, + { 0, NULL } +}; + const struct value_string osmo_ss7_asp_role_names[] = { { OSMO_SS7_ASP_ROLE_ASP, "ASP" }, { OSMO_SS7_ASP_ROLE_SG, "SG" }, @@ -553,6 +560,8 @@ } rate_ctr_group_set_name(asp->ctrg, name); asp->inst = inst; + /* ASP in "no shutdown" state by default: */ + asp->cfg.adm_state = OSMO_SS7_ASP_ADM_S_ENABLED; ss7_asp_peer_init(&asp->cfg.remote); asp->cfg.remote.port = remote_port; ss7_asp_peer_init(&asp->cfg.local); @@ -746,6 +755,12 @@ return rc; OSMO_ASSERT(asp->fi); + if (asp->cfg.adm_state == OSMO_SS7_ASP_ADM_S_SHUTDOWN) { + LOGPASP(asp, DLSS7, LOGL_NOTICE, "Skipping start for ASP in administrative state %s\n", + get_value_string(osmo_ss7_asp_admin_state_names, OSMO_SS7_ASP_ADM_S_SHUTDOWN)); + return 0; + } + /* Now start the new stream: */ if (asp->cfg.is_server) { @@ -1014,8 +1029,11 @@ static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) { + struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(cli); + LOGPASP(asp, DLSS7, LOGL_NOTICE, "Closing and reconnecting ASP\n"); xua_cli_close(cli); - osmo_stream_cli_reconnect(cli); + if (asp->cfg.adm_state != OSMO_SS7_ASP_ADM_S_SHUTDOWN) + osmo_stream_cli_reconnect(cli); return 0; } diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index bf3bec2..41872fe 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1113,6 +1113,9 @@ asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; } + /* Reset value, will be checked at osmo_ss7_vty_go_parent() */ + asp->cfg.explicit_shutdown_state_by_vty_since_node_enter = false; + vty->node = L_CS7_ASP_NODE; vty->index = asp; vty->index_sub = &asp->cfg.description; @@ -1424,9 +1427,33 @@ "Terminates SCTP association; New associations will be rejected\n", CMD_ATTR_NODE_EXIT) { - /* TODO */ - vty_out(vty, "Not supported yet%s", VTY_NEWLINE); - return CMD_WARNING; + struct osmo_ss7_asp *asp = vty->index; + + LOGPASP(asp, DLSS7, LOGL_NOTICE, "Applying Adm State change: %s -> %s\n", + get_value_string(osmo_ss7_asp_admin_state_names, asp->cfg.adm_state), + get_value_string(osmo_ss7_asp_admin_state_names, OSMO_SS7_ASP_ADM_S_SHUTDOWN)); + + asp->cfg.explicit_shutdown_state_by_vty_since_node_enter = true; + asp->cfg.adm_state = OSMO_SS7_ASP_ADM_S_SHUTDOWN; + ss7_asp_restart_after_reconfigure(asp); + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_shutdown, asp_no_shutdown_cmd, + "no shutdown", + NO_STR "Terminates SCTP association; New associations will be rejected\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + LOGPASP(asp, DLSS7, LOGL_NOTICE, "Applying Adm State change: %s -> %s\n", + get_value_string(osmo_ss7_asp_admin_state_names, asp->cfg.adm_state), + get_value_string(osmo_ss7_asp_admin_state_names, OSMO_SS7_ASP_ADM_S_ENABLED)); + + asp->cfg.explicit_shutdown_state_by_vty_since_node_enter = true; + asp->cfg.adm_state = OSMO_SS7_ASP_ADM_S_ENABLED; + ss7_asp_restart_after_reconfigure(asp); + return CMD_SUCCESS; } DEFUN_ATTR(asp_quirk, asp_quirk_cmd, @@ -2015,6 +2042,19 @@ vty_out(vty, " quirk %s%s", get_value_string(asp_quirk_names, (1 << i)), VTY_NEWLINE); } write_asp_timers(vty, " ", asp); + + switch (asp->cfg.adm_state) { + case OSMO_SS7_ASP_ADM_S_SHUTDOWN: + vty_out(vty, " shutdown%s", VTY_NEWLINE); + break; + case OSMO_SS7_ASP_ADM_S_BLOCKED: + vty_out(vty, " blocked%s", VTY_NEWLINE); + break; + case OSMO_SS7_ASP_ADM_S_ENABLED: + /* Default, no need to print: */ + vty_out(vty, " no shutdown%s", VTY_NEWLINE); + break; + } } @@ -3282,7 +3322,26 @@ switch (vty->node) { case L_CS7_ASP_NODE: asp = vty->index; - ss7_asp_restart_after_reconfigure(asp); + if (asp->cfg.explicit_shutdown_state_by_vty_since_node_enter) { + /* Interactive VTY, inform of new behavior upon use of new '[no] shutdown' commands: */ + if (vty->type != VTY_FILE) + vty_out(vty, "%% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered%s", VTY_NEWLINE); + asp->cfg.explicit_shutdown_state_by_vty_since_node_enter = false; + } else if (vty->type == VTY_FILE) { + /* Make sure config reading is backward compatible by starting the ASP if no explicit 'no shutdown' is read: */ + vty_out(vty, + "%% VTY node 'asp' without a '[no] shutdown' command at the end is deprecated, " + "please make sure you update your cfg file for future compatibility.%s", + VTY_NEWLINE); + ss7_asp_restart_after_reconfigure(asp); + } else { + /* Interactive VTY without '[no] shutdown' explicit cmd, remind the user that we are no + * longer automatically restarting the ASP when going out of the "asp" node: */ + vty_out(vty, + "%% NOTE: Make sure to use '[no] shutdown' command in 'asp' node " + "in order to restart the ASP for new configs to be applied.%s", + VTY_NEWLINE); + } vty->node = L_CS7_NODE; vty->index = asp->inst; break; @@ -3431,12 +3490,13 @@ install_lib_element(L_CS7_ASP_NODE, &asp_sctp_role_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_sctp_param_init_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_sctp_param_init_cmd); - install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd); - install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd); gen_asp_timer_cmd_strs(&asp_timer_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_timer_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_shutdown_cmd); install_node(&as_node, NULL); install_lib_element_ve(&show_cs7_as_cmd); diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 5483aae..893797a 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -74,6 +74,16 @@ LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); + if (asp && asp->cfg.adm_state == OSMO_SS7_ASP_ADM_S_SHUTDOWN) { + LOGPASP(asp, DLSS7, LOGL_NOTICE, + "Reject incoming new connection from %s for ASP in adm state %s\n", + sock_name, get_value_string(osmo_ss7_asp_admin_state_names, asp->cfg.adm_state)); + close(fd); + talloc_free(sock_name); + return 0; + } + srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " @@ -107,7 +117,6 @@ } osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); - asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", sock_name, asp->cfg.name); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 5dee90a..2e25f97 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -87,6 +87,12 @@ enum osmo_ss7_asp_role role; bool role_set_by_vty; bool trans_role_set_by_vty; + /* Used internally by "asp" node to figure out if "no shutdown" + * was done explicitly, in order to avoid automatic asp + * reconfiguring/restart at go_parent(). + * Can be dropped in the future once we make sure everybody uses + * "[no] shutdown" explicitly in cfg files. */ + bool explicit_shutdown_state_by_vty_since_node_enter; struct osmo_ss7_asp_peer local; struct osmo_ss7_asp_peer remote; diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index b993cbb..1a3b516 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -6,15 +6,21 @@ OsmoSTP(config-cs7)# asp asp1 2905 54321 m3ua OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.110 OsmoSTP(config-cs7-asp)# local-ip 27.0.0.1 +OsmoSTP(config-cs7-asp)# no shutdown OsmoSTP(config-cs7-asp)# exit +% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered OsmoSTP(config-cs7)# asp asp2 2905 54321 m3ua OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.120 OsmoSTP(config-cs7-asp)# local-ip 27.0.0.1 +OsmoSTP(config-cs7-asp)# no shutdown OsmoSTP(config-cs7-asp)# exit +% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered OsmoSTP(config-cs7)# asp asp3 2905 54321 m3ua OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.130 OsmoSTP(config-cs7-asp)# local-ip 27.0.0.1 +OsmoSTP(config-cs7-asp)# no shutdown OsmoSTP(config-cs7-asp)# exit +% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered OsmoSTP(config-cs7)# as as1 m3ua OsmoSTP(config-cs7-as)# asp asp1 OsmoSTP(config-cs7-as)# routing-key 56 0.1.2 @@ -36,16 +42,19 @@ remote-ip 127.0.0.110 role sg sctp-role server + no shutdown asp asp2 2905 54321 m3ua local-ip 27.0.0.1 remote-ip 127.0.0.120 role sg sctp-role server + no shutdown asp asp3 2905 54321 m3ua local-ip 27.0.0.1 remote-ip 127.0.0.130 role sg sctp-role server + no shutdown as as1 m3ua asp asp1 routing-key 56 0.1.2 diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index e56e0ff..de852e1 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -283,8 +283,12 @@ transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) + quirk (no_notify|daud_in_asp|snm_inactive) + no quirk (no_notify|daud_in_asp|snm_inactive) + timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp) <1-999999> block shutdown + no shutdown ... OsmoSTP(config-cs7-asp)# ? @@ -297,6 +301,8 @@ role Specify the xUA role for this ASP transport-role Specify the transport layer role for this ASP sctp-param Configure SCTP parameters + quirk Enable quirk to work around interop issues + timer Configure ASP default timer values block Allows a SCTP Association with ASP, but doesn't let it become active shutdown Terminates SCTP association; New associations will be rejected ... @@ -305,6 +311,7 @@ ... sctp-param Configure SCTP parameters quirk Disable quirk to work around interop issues + shutdown Terminates SCTP association; New associations will be rejected ... OsmoSTP(config-cs7-asp)# remote-ip 127.0.0.200 @@ -351,8 +358,9 @@ remote-ip 127.0.0.201 ... end +OsmoSTP(config-cs7-asp)# no shutdown OsmoSTP(config-cs7-asp)# exit - +% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered OsmoSTP(config-cs7)# as my-ass m3ua OsmoSTP(config-cs7-as)# list ... @@ -594,6 +602,7 @@ remote-ip 127.0.0.201 role sg sctp-role server + no shutdown as my-ass m3ua asp my-asp routing-key 0 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40197?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I7e4eedb65c4f2952f8b39ca4c539ca2f40e9946c Gerrit-Change-Number: 40197 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Store asp name in array of m3ua cfgs

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: stp: Store asp name in array of m3ua cfgs ...................................................................... stp: Store asp name in array of m3ua cfgs This way we keep STP specific config in one place instead of having to figure out the ASP name on each test where we want to modify that ASP. Change-Id: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/40192/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 Gerrit-Change-Number: 40192 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40195?usp=email ) Change subject: stp: Introduce test TC_clnt_adm_shutdown ...................................................................... stp: Introduce test TC_clnt_adm_shutdown Related: OS#6752 Change-Id: I8b1c8b633afc1515dedfccd43e642401896b167e --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/40195/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index bee2488..a4dd539 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1445,6 +1445,49 @@ f_clear_m3ua(); } +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_clnt_adm_shutdown() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_init_m3ua_srv(); + + var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + f_sleep(1.0); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "shutdown"); + log("ASP should now be DOWN") + var PortEvent pev; + alt { + [] M3UA[M3UA_SRV(0)].receive(PortEvent:{sctpEvent := ?}) -> value pev { + log("sctp event: ", pev) + repeat; + } + [] M3UA[M3UA_SRV(0)].receive(PortEvent:{connClosed:=?}) -> value pev { + log("Peer closed conn: ", pev) + } + } + + /* Wait for a while to make sure ASP doesn't reconnect to us: */ + timer T := 10.0; + T.start; + alt { + [] M3UA[M3UA_SRV(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(f_m3ua_srv_config(0), "no shutdown"); + log("Waiting for client ASP to reconnect to us"); + M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) -> value pev { + g_m3ua_conn_id[M3UA_SRV(0)] := pev.connOpened.connId; + } + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + + f_clear_m3ua(); +} + 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]; @@ -1567,6 +1610,7 @@ execute( TC_clnt_no_snm_inactive() ); execute( TC_clnt_quirk_snm_inactive() ); + execute( TC_clnt_adm_shutdown() ); /* M3UA SSNM tests */ execute( TC_ssnm_aspac_dava_aspia_duna() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 3fbe1a5..02a801a 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -36,6 +36,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_daud_in_asp' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_no_snm_inactive' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_snm_inactive' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_aspac_dava_aspia_duna' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna_multipc' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40195?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: I8b1c8b633afc1515dedfccd43e642401896b167e Gerrit-Change-Number: 40195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?usp=email ) Change subject: stp: Introduce test TC_m3ua_scp_srv_adm_shutdown ...................................................................... stp: Introduce test TC_m3ua_scp_srv_adm_shutdown Related: OS#6752 Change-Id: Iad34af7e7758fbd3a0d686a261ccce53bc705817 --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/40196/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index a4dd539..4cca78f 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -542,6 +542,53 @@ f_clear_m3ua(); } +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_m3ua_scp_srv_adm_shutdown() runs on RAW_M3UA_CT { + f_init_m3ua(); + + f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit); + f_sleep(1.0); + f_vty_cs7_asp_cmd(f_m3ua_cli_config(0), "shutdown"); + log("ASP should now be DOWN") + var PortEvent pev; + alt { + [] M3UA[0].receive(PortEvent:{sctpEvent := ?}) -> value pev { + log("sctp event: ", pev) + repeat; + } + [] M3UA[0].receive(PortEvent:{connClosed:=?}) -> value pev { + log("Peer closed conn: ", pev) + } + } + + 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_sctp(0); + timer T := 5.0; + T.start; + alt { + [] M3UA[0].receive(PortEvent:{sctpEvent := ?}) -> value pev { + log("sctp event: ", pev) + repeat; + } + [] M3UA[0].receive(PortEvent:{connClosed:=?}) -> value pev { + log("Peer closed conn: ", pev) + } + [] 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(f_m3ua_cli_config(0), "no shutdown"); + log("Connecting to ASP (expect success):"); + f_M3UA_connect_sctp(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 if traffic is routed from idx_tx/pc_tx to idx_rx/pc_rx */ private function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx, integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, @@ -1572,6 +1619,7 @@ execute( TC_tmt_loadshare_sls() ); execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); + execute( TC_m3ua_scp_srv_adm_shutdown() ); execute( TC_m3ua_tcp_cli() ); execute( TC_m3ua_tcp_cli_srv() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 02a801a..bb944ca 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -12,6 +12,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_tmt_broadcast' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_act_rctx_data_no_rctx' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_m3ua_scp_srv_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_srv' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?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: Iad34af7e7758fbd3a0d686a261ccce53bc705817 Gerrit-Change-Number: 40196 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: asp: Make sure previous stream_srv is immediatelly destroyed when req...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40194?usp=email ) Change subject: asp: Make sure previous stream_srv is immediatelly destroyed when requested ...................................................................... asp: Make sure previous stream_srv is immediatelly destroyed when requested This will be needed when the asp is in SCTP=server mode and we request it to shutdown/restart. Change-Id: I8edd64234654ba987f35de2d7ad610e96bda27eb --- M src/osmo_ss7_asp.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/94/40194/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 4044003..02dbcb8 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -699,6 +699,12 @@ asp->client = NULL; osmo_stream_cli_destroy(cli); } + if (asp->server) { + /* Make sure we close the previous stream right now: */ + srv = asp->server; + asp->server = NULL; + osmo_stream_srv_destroy(srv); + } } else { /* We are in client mode now */ if (asp->server) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40194?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8edd64234654ba987f35de2d7ad610e96bda27eb Gerrit-Change-Number: 40194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: asp: Make sure asp->{client,server} is nulled before destroy callback

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40193?usp=email ) Change subject: asp: Make sure asp->{client,server} is nulled before destroy callback ...................................................................... asp: Make sure asp->{client,server} is nulled before destroy callback disconnect_cb() in case of stream_cli and closed_cb() in case of stream_srv may call some libosmo-sigtran code. Make sure we don't access the pointer anymore in that case for safety. Change-Id: I3f0774eac630c8bc7e9a10f874e1c72763fd14a0 --- M src/osmo_ss7_asp.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/93/40193/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index c054369..4044003 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -686,22 +686,27 @@ * announce disconnection to upper layers. */ int ss7_asp_disconnect_stream(struct osmo_ss7_asp *asp) { + struct osmo_stream_cli *cli; + struct osmo_stream_srv *srv; + /* First tear down previous state if existing: */ if (asp->cfg.is_server) { /* We are in server mode now */ if (asp->client) { /* if we previously were in client mode, * destroy it */ - osmo_stream_cli_destroy(asp->client); + cli = asp->client; asp->client = NULL; + osmo_stream_cli_destroy(cli); } } else { /* We are in client mode now */ if (asp->server) { /* if we previously were in server mode, * destroy it */ - osmo_stream_srv_destroy(asp->server); + srv = asp->server; asp->server = NULL; + osmo_stream_srv_destroy(srv); } if (asp->client) { /* Make sure we close the previous stream before starting a new one: */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I3f0774eac630c8bc7e9a10f874e1c72763fd14a0 Gerrit-Change-Number: 40193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Store asp name in array of m3ua cfgs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?usp=email ) Change subject: stp: Store asp name in array of m3ua cfgs ...................................................................... stp: Store asp name in array of m3ua cfgs This way we keep STP specific config in one place instead of having to figure out the ASP name on each test where we want to modify that ASP. Change-Id: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/40192/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 18076bd..bee2488 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -48,6 +48,7 @@ M3uaConfigs mp_m3ua_configs := { /* as-sender: One ASP within AS */ { + asp_name := "asp-sender", use_tcp := false, remote_port := 2905, local_port := 9999, @@ -56,12 +57,14 @@ }, /* as-receiver: Two ASP within AS */ { + asp_name := "asp-receiver0", use_tcp := false, remote_port := 2905, local_port := 10000, point_code := 42, routing_ctx := 1042 }, { + asp_name := "asp-receiver1", use_tcp := false, remote_port := 2905, local_port := 10001, @@ -70,6 +73,7 @@ }, /* as-sender-tcp: One ASP within AS */ { + asp_name := "asp-sender-tcp", use_tcp := true, remote_port := 2905, local_port := 9999, @@ -78,6 +82,7 @@ }, /* as-client: One ASP within AS */ { + asp_name := "asp-client0", use_tcp := false, remote_port := 2906, local_port := 10002, @@ -86,6 +91,7 @@ }, /* as-client60-norctx */ { + asp_name := "asp-client60-norctx0", use_tcp := false, remote_port := 2907, local_port := 11060, @@ -94,6 +100,7 @@ }, /* as-client61-norctx */ { + asp_name := "asp-client61-norctx0", use_tcp := false, remote_port := 2907, local_port := 11061, @@ -102,6 +109,7 @@ }, /* as-client-tcp: One ASP within AS */ { + asp_name := "asp-client0-tcp", use_tcp := true, remote_port := 2906, local_port := 10002, @@ -118,6 +126,8 @@ } type record M3uaConfig { + /* Name of the ASP in the STP, (eg. to access it over VTY) */ + charstring asp_name, /* use TCP (true) or SCTP (false) */ boolean use_tcp, /* STP-side SCTP (or TCP) port for M3UA */ @@ -1309,11 +1319,11 @@ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } -private function f_asp_cfg_str(charstring asp_name, in M3uaConfig cfg) +private function f_asp_cfg_str(in M3uaConfig cfg) return charstring { var charstring str; - str := "asp " & asp_name; + str := "asp " & cfg.asp_name; str := str & " " & int2str(cfg.local_port); str := str & " " & int2str(cfg.remote_port); str := str & " m3ua"; @@ -1325,14 +1335,18 @@ return str; } +private 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); +} + private function f_quirk(charstring quirk) runs on RAW_M3UA_CT { - var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); - f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "quirk " & quirk); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "quirk " & quirk) } private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT { - var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); - f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "no quirk " & quirk); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no quirk " & quirk) } /* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?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: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 Gerrit-Change-Number: 40192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?usp=email ) Change subject: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS ...................................................................... Patch Set 5: (1 comment) This change is ready for review. Patchset: PS5: TTCN3 tests are now passing fine after having new correct expectancies here: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191 stp: Update TC_rkm_unreg_active to expect multiple routing contexts IMHO this patch can be merged now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?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: I646301ec3d08ef98f227cf4d19da1039e40cedd2 Gerrit-Change-Number: 40011 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 May 2025 14:13:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Update TC_rkm_unreg_active to expect multiple routing contexts

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?usp=email ) Change subject: stp: Update TC_rkm_unreg_active to expect multiple routing contexts ...................................................................... stp: Update TC_rkm_unreg_active to expect multiple routing contexts That test is registering a new routcing context (AS) into an existing/pre-configured ASP. As a result, the ASP serves 2 AS. When we receive notifications on that ASP then we'll be receiving info on 2 routing contexts, one for the pre-confgiured AS and one for the dynamically registered one. Depends: libosmo-sigtran.git I646301ec3d08ef98f227cf4d19da1039e40cedd2 Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/40191/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 89be9e0..18076bd 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -889,12 +889,12 @@ /* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023) * INACTIVE, handle the 2 NOTIFY manually afterwards: */ f_M3UA_asp_up(0, omit); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_asp_act(0, omit, rctxB); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxB)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxA)); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxA)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxB)); /* then try to de-register -> ERR_ASP_ACTIVE */ @@ -904,8 +904,8 @@ /* deactivate ASP and properly de-register to clean up */ f_M3UA_asp_inact(0); f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctxA))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)})); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?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: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d Gerrit-Change-Number: 40191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?usp=email ) Change subject: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx() ...................................................................... xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx() Change-Id: I6fe4f388b11991e7c7396c9d632b376e8591a8f3 --- M src/xua_asp_fsm.c 1 file changed, 5 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/40190/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 4603734..11a34b4 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -173,32 +173,14 @@ /* add M3UA_IEI_ROUTE_CTX to xua_msg containig all routing keys of ASs within ASP */ static int xua_msg_add_asp_rctx(struct xua_msg *xua, struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as; uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; - unsigned int i = 0; + unsigned int cnt; - /* iterate over all ASs and build array of routing contexts */ - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - rctx[i++] = htonl(as->cfg.routing_key.context); - if (i >= ARRAY_SIZE(rctx)-1) { - break; - } - } - /* add xUA IE with routing contests to the message (if any) */ - if (i) { - /* bail out (and not add the IE) if there's only one routing context (and hence - * only one AS) within this ASP, and that routing context is zero, meaning no routing - * context IE shall be used */ - if (i == 1 && rctx[0] == 0) - return 0; - - xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, i*sizeof(uint32_t), (uint8_t *)rctx); - } - + cnt = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), NULL); + if (cnt > 0) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, cnt*sizeof(uint32_t), (uint8_t *)rctx); /* return count of routing contexts added */ - return i; + return cnt; } /* ask the xUA implementation to transmit a specific message */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6fe4f388b11991e7c7396c9d632b376e8591a8f3 Gerrit-Change-Number: 40190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025