- gerrit-log - lists.osmocom.org

[M] Change in libosmo-abis[master]: ipaccess: Use osmo_stream APIs to set TCP keepalive pars
by pespin 26 Jun '25

26 Jun '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40537?usp=email ) Change subject: ipaccess: Use osmo_stream APIs to set TCP keepalive pars ...................................................................... ipaccess: Use osmo_stream APIs to set TCP keepalive pars This way osmo_stream takes care of applying the sockopts when needed. Related: OS#6637 Change-Id: I91deef49563bcec51e1e1eaceec6c1eedc708529 --- M TODO-RELEASE M src/input/ipaccess.c 2 files changed, 108 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/37/40537/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..32849fa 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-netif >1.6.0 stream OSMO_STREAM_{CLI,SRV}_TCP_SOCKOPT_* diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 10dec22..6eddba0 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -619,51 +619,115 @@ return 0; } -static void update_fd_settings(struct e1inp_line *line, int fd) +struct keepalive_pars { + int idle_val; + int interval_val; + int retry_count_val; + unsigned int user_timeout_val; +}; + +static void line_get_keepalive_pars(const struct e1inp_line *line, struct keepalive_pars *pars) { - int ret; - int val, idle_val, interval_val, retry_count_val, user_timeout_val; + pars->idle_val = line->keepalive_idle_timeout > 0 ? + line->keepalive_idle_timeout : + DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; + pars->interval_val = line->keepalive_probe_interval > -1 ? + line->keepalive_probe_interval : + DEFAULT_TCP_KEEPALIVE_INTERVAL; + pars->retry_count_val = line->keepalive_num_probes > 0 ? + line->keepalive_num_probes : + DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; + pars->user_timeout_val = 1000 * pars->retry_count_val * (pars->interval_val + pars->idle_val); +} + +static void cli_apply_tcp_pars(struct e1inp_line *line, struct osmo_stream_cli *cli) +{ + struct keepalive_pars pars; + int rc; + uint8_t on = 1; if (line->keepalive_num_probes == 0) return; - /* Enable TCP keepalive to find out if the connection is gone */ - val = 1; - ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(errno)); - else - LOGPIL(line, DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); + line_get_keepalive_pars(line, &pars); - idle_val = line->keepalive_idle_timeout > 0 ? - line->keepalive_idle_timeout : - DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; - interval_val = line->keepalive_probe_interval > -1 ? - line->keepalive_probe_interval : - DEFAULT_TCP_KEEPALIVE_INTERVAL; - retry_count_val = line->keepalive_num_probes > 0 ? - line->keepalive_num_probes : - DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; - user_timeout_val = 1000 * retry_count_val * (interval_val + idle_val); - LOGPIL(line, DLINP, LOGL_NOTICE, "TCP keepalive idle_timeout=%us, interval=%us, retry_count=%u " - "user_timeout=%ums\n", idle_val, interval_val, retry_count_val, user_timeout_val); - /* The following options are not portable! */ - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle_val, sizeof(idle_val)); - if (ret < 0) { + LOGPIL(line, DLINP, LOGL_INFO, + "TCP keepalive idle_timeout=%us, interval=%us, retry_count=%u user_timeout=%ums\n", + pars.idle_val, pars.interval_val, pars.retry_count_val, pars.user_timeout_val); + + rc = osmo_stream_cli_set_param(cli, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPALIVE, + &on, sizeof(on)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(-rc)); + + rc = osmo_stream_cli_set_param(cli, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE, + &pars.idle_val, sizeof(pars.idle_val)); + if (rc < 0) LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", - strerror(errno)); - } - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval_val, sizeof(interval_val)); - if (ret < 0) { + strerror(-rc)); + + rc = osmo_stream_cli_set_param(cli, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL, + &pars.interval_val, sizeof(pars.interval_val)); + if (rc < 0) LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", - strerror(errno)); - } - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &retry_count_val, sizeof(retry_count_val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", strerror(errno)); - ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout_val, sizeof(user_timeout_val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", strerror(errno)); + strerror(-rc)); + + rc = osmo_stream_cli_set_param(cli, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT, + &pars.retry_count_val, sizeof(pars.retry_count_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", + strerror(-rc)); + + rc = osmo_stream_cli_set_param(cli, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &pars.user_timeout_val, sizeof(pars.user_timeout_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", + strerror(-rc)); +} + +static void srv_apply_tcp_pars(struct e1inp_line *line, struct osmo_stream_srv *conn) +{ + struct keepalive_pars pars; + int rc; + uint8_t on = 1; + + if (line->keepalive_num_probes == 0) + return; + + line_get_keepalive_pars(line, &pars); + + LOGPIL(line, DLINP, LOGL_INFO, + "TCP keepalive idle_timeout=%us, interval=%us, retry_count=%u user_timeout=%ums\n", + pars.idle_val, pars.interval_val, pars.retry_count_val, pars.user_timeout_val); + + rc = osmo_stream_srv_set_param(conn, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPALIVE, + &on, sizeof(on)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(-rc)); + + rc = osmo_stream_srv_set_param(conn, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE, + &pars.idle_val, sizeof(pars.idle_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", + strerror(-rc)); + + rc = osmo_stream_srv_set_param(conn, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL, + &pars.interval_val, sizeof(pars.interval_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", + strerror(-rc)); + + rc = osmo_stream_srv_set_param(conn, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT, + &pars.retry_count_val, sizeof(pars.retry_count_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", + strerror(-rc)); + + rc = osmo_stream_srv_set_param(conn, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &pars.user_timeout_val, sizeof(pars.user_timeout_val)); + if (rc < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", + strerror(-rc)); } /* callback of the OML listening filedescriptor */ @@ -701,14 +765,13 @@ osmo_stream_srv_set_read_cb(conn, ipaccess_bsc_conn_read_cb); osmo_stream_srv_set_closed_cb(conn, ipaccess_bsc_conn_closed_cb); osmo_stream_srv_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + srv_apply_tcp_pars(line, conn); /* We use bfd->fd in here for osmo_stats_tcp, and bfd->data to access osmo_stream_srv from e1i_ts. */ bfd = &e1i_ts->driver.ipaccess.fd; osmo_fd_setup(bfd, fd, 0, NULL, conn, E1INP_SIGN_OML); osmo_stats_tcp_osmo_fd_register(bfd, "ipa-oml"); - update_fd_settings(line, fd); - /* Request ID. FIXME: request LOCATION, HW/SW VErsion, Unit Name, Serno */ ret = ipa_ccm_send_id_req(fd); if (ret < 0) { @@ -756,6 +819,7 @@ osmo_stream_srv_set_read_cb(conn, ipaccess_bsc_conn_read_cb); osmo_stream_srv_set_closed_cb(conn, ipaccess_bsc_conn_closed_cb); osmo_stream_srv_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + srv_apply_tcp_pars(line, conn); /* We use bfd->fd in here for osmo_stats_tcp, and bfd->data to access osmo_stream_srv from e1i_ts. */ bfd = &e1i_ts->driver.ipaccess.fd; @@ -768,7 +832,6 @@ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not send ID REQ. Reason: %s\n", strerror(errno)); goto err_socket; } - update_fd_settings(line, fd); return 0; err_socket: @@ -928,7 +991,6 @@ struct e1inp_line *line = e1i_ts->line; struct osmo_ipa_ka_fsm_inst *ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; - update_fd_settings(line, osmo_stream_cli_get_fd(cli)); if (ka_fsm && line->ipa_kap) osmo_ipa_ka_fsm_start(ka_fsm); return 0; @@ -1048,6 +1110,8 @@ osmo_stream_cli_set_disconnect_cb(cli, ipaccess_bts_disconnect_cb); osmo_stream_cli_set_read_cb2(cli, ipaccess_bts_read_cb); + cli_apply_tcp_pars(line, cli); + if (osmo_stream_cli_open(cli)) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "cannot open OML BTS link: %s\n", strerror(errno)); osmo_stream_cli_destroy(cli); @@ -1126,6 +1190,8 @@ osmo_stream_cli_set_disconnect_cb(cli, ipaccess_bts_disconnect_cb); osmo_stream_cli_set_read_cb2(cli, ipaccess_bts_read_cb); + cli_apply_tcp_pars(line, cli); + if (osmo_stream_cli_open(cli)) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "cannot open RSL BTS link: %s\n", strerror(errno)); osmo_stream_cli_destroy(cli); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40537?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I91deef49563bcec51e1e1eaceec6c1eedc708529 Gerrit-Change-Number: 40537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: asp: Support setting TCP_USER_TIMEOUT over VTY
by osmith 26 Jun '25

26 Jun '25

Attention is currently required from: daniel, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email ) Change subject: asp: Support setting TCP_USER_TIMEOUT over VTY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?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: If3cbc05a304857be7030c684ffd94d929bc8dc23 Gerrit-Change-Number: 40535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 11:29:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: asp: Support setting TCP_USER_TIMEOUT over VTY
by pespin 26 Jun '25

26 Jun '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email ) Change subject: asp: Support setting TCP_USER_TIMEOUT over VTY ...................................................................... asp: Support setting TCP_USER_TIMEOUT over VTY Change-Id: If3cbc05a304857be7030c684ffd94d929bc8dc23 --- M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/ss7_xua_srv.c M tests/vty/osmo_stp_test.vty 5 files changed, 74 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/35/40535/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index ca4a4c6..0fea556 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -227,7 +227,7 @@ }; static unsigned int g_ss7_asp_rcg_idx; -int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) +static int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) { uint8_t byte = 1; int val; @@ -301,6 +301,38 @@ return 0; } +static int ss7_asp_apply_tcp_user_timeout(const struct osmo_ss7_asp *asp) +{ + int rc = 0; + unsigned int val; + + if (!asp->cfg.tcp.user_timeout_present) + return 0; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Setting TCP user-timeout %u ms\n", + asp->cfg.tcp.user_timeout_value); + + val = asp->cfg.tcp.user_timeout_value; + if (asp->server) { + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &val, sizeof(val)); + } else if (asp->client) { + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &val, sizeof(val)); + } + + return rc; +} + +int ss7_asp_apply_tcp_pars(const struct osmo_ss7_asp *asp) +{ + int rc; + rc = ss7_asp_apply_tcp_keepalive(asp); + if (rc < 0) + return rc; + return ss7_asp_apply_tcp_user_timeout(asp); +} + int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; @@ -797,7 +829,7 @@ switch (asp->cfg.trans_proto) { case IPPROTO_TCP: - (void)ss7_asp_apply_tcp_keepalive(asp); + (void)ss7_asp_apply_tcp_pars(asp); break; case IPPROTO_SCTP: (void)asp_client_apply_sctp_init_pars(asp); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 00c6825..6bc0201 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -135,9 +135,11 @@ bool keepalive_time_present; bool keepalive_intvl_present; bool keepalive_probes_present; + bool user_timeout_present; int keepalive_time_value; /* seconds */ int keepalive_intvl_value; /* seconds */ int keepalive_probes_value; + unsigned int user_timeout_value; /* milliseconds */ } tcp; /*! The underlaying transport protocol (one of IPPROTO_*) */ @@ -153,7 +155,7 @@ int ss7_asp_get_fd(const struct osmo_ss7_asp *asp); int ss7_asp_disconnect_stream(struct osmo_ss7_asp *asp); -int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp); +int ss7_asp_apply_tcp_pars(const struct osmo_ss7_asp *asp); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 534c1d9..0c79b0f 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -445,9 +445,10 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_DESC "Configure TCP parameters\n" #define ASP_TCP_PARAM_KEEPALIVE_DESC \ - "Configure TCP parameters\n" \ - "Configure TCP keep-alive related parameters\n" \ + ASP_TCP_PARAM_DESC \ + "Configure TCP keep-alive related parameters\n" DEFUN_ATTR(asp_tcp_param_keepalive_enabled, asp_tcp_param_keepalive_enabled_cmd, "tcp-param keepalive enabled", @@ -520,6 +521,33 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_USER_TIMEOUT_DESC \ + ASP_TCP_PARAM_DESC \ + "Configure TCP User Timeout socket option (TCP_USER_TIMEOUT)\n" +DEFUN_ATTR(asp_tcp_param_user_timeout, asp_tcp_param_user_timeout_cmd, + "tcp-param user-timeout <0-65535>", + ASP_TCP_PARAM_USER_TIMEOUT_DESC + "Value of the parameter\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + asp->cfg.tcp.user_timeout_present = true; + asp->cfg.tcp.user_timeout_value = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_user_timeout, asp_no_tcp_param_user_timeout_cmd, + "no tcp-param user-timeout", + NO_STR ASP_TCP_PARAM_USER_TIMEOUT_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.user_timeout_present = false; + asp->cfg.tcp.user_timeout_value = 0; + return CMD_SUCCESS; +} + DEFUN_ATTR(asp_block, asp_block_cmd, "block", "Allows a SCTP Association with ASP, but doesn't let it become active\n", @@ -1228,6 +1256,8 @@ } else if (asp->cfg.trans_proto == IPPROTO_TCP) { vty_out(vty, " no tcp-param keepalive%s", VTY_NEWLINE); } + if (asp->cfg.tcp.user_timeout_present) + vty_out(vty, " tcp-param user-timeout %u%s", asp->cfg.tcp.user_timeout_value, VTY_NEWLINE); for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (!(asp->cfg.quirks & ((uint32_t) 1 << i))) @@ -1318,6 +1348,8 @@ install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_keepalive_cfg_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cfg_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_user_timeout_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_user_timeout_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_xua_cmd_strs(&asp_timer_xua_cmd); diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index b60acf6..077eea0 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -193,7 +193,7 @@ switch (asp->cfg.trans_proto) { case IPPROTO_TCP: - rc = ss7_asp_apply_tcp_keepalive(asp); + rc = ss7_asp_apply_tcp_pars(asp); break; case IPPROTO_SCTP: rc = ss7_asp_apply_peer_primary_address(asp); diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index b89bb30..2c5b5d8 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -287,6 +287,8 @@ tcp-param keepalive (time|intvl|probes) <0-65535> no tcp-param keepalive no tcp-param keepalive (time|intvl|probes) + tcp-param user-timeout <0-65535> + no tcp-param user-timeout quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) timer xua (ack|beat) <1-999999> -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?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: If3cbc05a304857be7030c684ffd94d929bc8dc23 Gerrit-Change-Number: 40535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare
by osmith 26 Jun '25

26 Jun '25

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File stp/STP_Tests_IPA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530/comment/e423098f_5197… : PS1, Line 539: unknwon_dynamic_asp > ```suggestion […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?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: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 2 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:53:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare
by pespin 26 Jun '25

26 Jun '25

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... stp: ipa: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on IPA AS. Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Related: SYS#7112 --- 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, 152 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/40530/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?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: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 2 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare
by pespin 26 Jun '25

26 Jun '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc Gerrit-Change-Number: 40533 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[S] Change in osmo-ttcn3-hacks[master]: Fix typo unknwon -> unknown
by pespin 26 Jun '25

26 Jun '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?usp=email ) Change subject: Fix typo unknwon -> unknown ...................................................................... Fix typo unknwon -> unknown Change-Id: I483090332931d85a8808bd558c4d4ac4d36fa16b --- M bts/BTS_Tests.ttcn M stp/STP_Tests_IPA.ttcn 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/40534/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9c6f238..de02359 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2464,7 +2464,7 @@ case (RSL_ALG_ID_A5_6) { return 6; } case (RSL_ALG_ID_A5_7) { return 7; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; @@ -2482,7 +2482,7 @@ case (RSL_ALG_ID_A5_6) { return '101'B; } case (RSL_ALG_ID_A5_7) { return '110'B; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 2aab7c3..b34297e 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -301,13 +301,13 @@ setverdict(pass); } -private function f_tc_tmt_override(boolean unknwon_dynamic_asp) +private function f_tc_tmt_override(boolean unknown_dynamic_asp) runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender", "ipa-asp-override-receiver0", "ipa-asp-override-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3002; ipa_configs[1].local_port := 3003; ipa_configs[2].local_port := 3004; @@ -347,14 +347,14 @@ } } -private function f_tc_tmt_loadshare_roundrobin(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_roundrobin(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0", "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3005; ipa_configs[1].local_port := 3006; ipa_configs[2].local_port := 3007; @@ -415,7 +415,7 @@ } } -private function f_tc_tmt_loadshare_sls(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_sls(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; @@ -424,7 +424,7 @@ "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 9998; ipa_configs[1].local_port := 9999; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?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: I483090332931d85a8808bd558c4d4ac4d36fa16b Gerrit-Change-Number: 40534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare
by pespin 26 Jun '25

26 Jun '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... stp: ipa: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on IPA AS. Change-Id: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc tChange-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Related: SYS#7112 --- 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, 152 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/40533/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 9e9538e..8f6c24a 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -62,6 +62,20 @@ local_port := 20007 }, { + asp_name := "ipa-asp-LS0-0-0", + as_name := "ipa-as-LS0-0", + is_server := false, + remote_port := 5000, + local_port := 20010 + }, + { + asp_name := "ipa-asp-LS0-1-0", + as_name := "ipa-as-LS0-1", + is_server := false, + remote_port := 5000, + local_port := 20011 + }, + { asp_name := "ipa-asp-client0", as_name := "ipa-as-client0", is_server := true, diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 3fb0ace..2aab7c3 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -425,8 +425,8 @@ "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); if (unknwon_dynamic_asp) { - ipa_configs[0].local_port := 3010; - ipa_configs[1].local_port := 3011; + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; } f_init_ipa(ipa_configs := ipa_configs); @@ -528,6 +528,114 @@ f_tc_tmt_loadshare_sls(true); } +/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a combined linkset). + * STP routing table is configured with 1 combined linkset towards PC 32 mask /14 with 2 + * AS routes ("ipa-as-LS0-0", "ipa-as-LS0-1") with same priority, each using 1 + * ASP ("ipa-asp-LS0-0-0", "ipa-asp-LS0-1-0"). + * We take advantage of the fact that AS "ipa-as-loadshare-receiver" is never used + * to transmit in other tests and use it here for the routing of its configured + * "point-code override dpc 32" towards the "ipa-as-LS0-{0,1}" in the STP config. + */ +private function f_tc_combinedlset_loadshare(boolean unknown_dynamic_asp) +runs on IPA_CT { + var integer i; + + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-receiver0", + "ipa-asp-loadshare-receiver1", + "ipa-asp-LS0-0-0", + "ipa-asp-LS0-1-0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + if (unknown_dynamic_asp) { + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; + } + + f_init_ipa(ipa_configs := ipa_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_connect_ipa(0); + /* activate the first 'receiver' side ASP */ + f_connect_ipa(2); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, 2); + } + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(3); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(0, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+SLS cannot change in IPA ASPs. + * However, depending on how the SLS seed tables were allocated, it can + * be that STP was routing through Alternative Route and now that the + * 2nd receiver is up it is now routing to it (Normal Route). Account + * for both scenarios. */ + if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!"); + } + + + /* activate the second 'sender' side ASP */ + f_connect_ipa(1); + + num_rx_1 := 0; + num_rx_2 := 0; + sls_num_rx_1 := {}; + sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(i mod 2, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + setverdict(pass); +} +testcase TC_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(false); +} +/* same as above, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ +testcase TC_unknown_client_dynamic_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(true); +} + private function f_IPA_ping(integer idx) runs on IPA_CT { var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; @@ -641,6 +749,8 @@ execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); + execute( TC_combinedlset_loadshare() ); + execute( TC_unknown_client_dynamic_combinedlset_loadshare() ); execute( TC_beat() ); execute( TC_beat_timeout() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 646ca7b..91115d9 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='62' 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'/> @@ -59,6 +59,8 @@ <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_combinedlset_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_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'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 954f175..ef95384 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -53,6 +53,26 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + ! CombinedLinkset-loadsharing AS(P)s: + asp ipa-asp-LS0-0-0 20010 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-LS0-1-0 20011 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-LS0-0 ipa + point-code override dpc 38 + routing-key 0 44 + asp ipa-asp-LS0-0-0 + as ipa-as-LS0-1 ipa + point-code override dpc 39 + routing-key 0 45 + asp ipa-asp-LS0-1-0 + ! CLIENT asp ipa-asp-client0 6001 7001 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -68,6 +88,9 @@ ! route-table system update route 31 16777215 linkset ipa-as-loadshare-receiver + ! These 2 below are used in TC_combinedlset_loadshare to route traffic from ipa-as-loadshare-receiver towards: + update route 32 16777215 linkset ipa-as-LS0-0 priority 6 + update route 32 16777215 linkset ipa-as-LS0-1 priority 6 update route 33 16777215 linkset ipa-as-override-receiver ! !SERVERS: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?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: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc Gerrit-Change-Number: 40533 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: enft_kpi: enb_set_addr/1: restrict ULDL values
by pespin 26 Jun '25

26 Jun '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email ) Change subject: enft_kpi: enb_set_addr/1: restrict ULDL values ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4e6bc5b392db334f5c79f30076e5e864af1db27d Gerrit-Change-Number: 40531 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init
by pespin 26 Jun '25

26 Jun '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log