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

[M] Change in libosmo-sigtran[master]: asp: Introduce support to configure and enable TCP keep-alive

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email ) Change subject: asp: Introduce support to configure and enable TCP keep-alive ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?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: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:40:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets

by osmith

Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email ) Change subject: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/ss7_xua_srv.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480/comment/cddbdd65_f912b… : PS1, Line 328: applyng ```suggestion LOGP(DLSS7, LOGL_NOTICE, "Failed applying %s Server SCTP INIT parameters\n", proto); ``` And maybe LOGL_ERROR? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?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: I013c51efd03a3f5561bf9849c8841b1c7e66c172 Gerrit-Change-Number: 40480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:30:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP_USER_TIMEOUT parameter

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email ) Change subject: stream: Support configuring TCP_USER_TIMEOUT parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22c7df92b463cf4ca82854a12ec24337d53e8b20 Gerrit-Change-Number: 40479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:23:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP keep-alive pars

by osmith

Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email ) Change subject: stream: Support configuring TCP keep-alive pars ...................................................................... Patch Set 1: Code-Review+1 (3 comments) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/5b9d1dbf_5b7166e… : PS1, Line 1542: keelapive ```suggestion /* TCP keepalive params: */ ``` File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/7289fcf7_86774ff… : PS1, Line 685: keelapive ```suggestion /* TCP keepalive params: */ ``` https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/6bae1e40_ab1ccb0… : PS1, Line 1454: keelapive ```suggestion /* TCP keepalive params: */ ``` -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Gerrit-Change-Number: 40478 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:21:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email ) Change subject: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets ...................................................................... asp,xua_srv: Apply SCTP sockopts only on SCTP osckets Otherwise if user somehow configured those paremeters over VTY, they would end up trying to be applied and most probably fail. Take the chance to split that really specific code to helper functions to sanitize a bit some lifecycle code paths. Change-Id: I013c51efd03a3f5561bf9849c8841b1c7e66c172 --- M src/ss7_asp.c M src/ss7_xua_srv.c 2 files changed, 58 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/80/40480/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 71e5627..d7e9b12 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -416,6 +416,34 @@ } } +static int asp_client_apply_sctp_init_pars(struct osmo_ss7_asp *asp) +{ + uint8_t byte; + + OSMO_ASSERT(asp->client); + byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); + byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); + if (asp->cfg.sctp_init.num_ostreams_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS, + &asp->cfg.sctp_init.num_ostreams_value, + sizeof(asp->cfg.sctp_init.num_ostreams_value)); + if (asp->cfg.sctp_init.max_instreams_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, + &asp->cfg.sctp_init.max_instreams_value, + sizeof(asp->cfg.sctp_init.max_instreams_value)); + if (asp->cfg.sctp_init.max_attempts_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, + &asp->cfg.sctp_init.max_attempts_value, + sizeof(asp->cfg.sctp_init.max_attempts_value)); + if (asp->cfg.sctp_init.max_init_timeo_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, + &asp->cfg.sctp_init.max_init_timeo_value, + sizeof(asp->cfg.sctp_init.max_init_timeo_value)); + return 0; +} + /* Set default values for local and remote peer hosts if they are not yet set. * \param[in] asp ASP for which to set default hosts. * \returns true if values where changed, false otherwise. @@ -650,7 +678,6 @@ static int ss7_asp_start_client(struct osmo_ss7_asp *asp) { - uint8_t byte; int rc; if (!asp->client) @@ -693,26 +720,10 @@ break; } osmo_stream_cli_set_data(asp->client, asp); - byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); - byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); - if (asp->cfg.sctp_init.num_ostreams_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS, - &asp->cfg.sctp_init.num_ostreams_value, - sizeof(asp->cfg.sctp_init.num_ostreams_value)); - if (asp->cfg.sctp_init.max_instreams_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, - &asp->cfg.sctp_init.max_instreams_value, - sizeof(asp->cfg.sctp_init.max_instreams_value)); - if (asp->cfg.sctp_init.max_attempts_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, - &asp->cfg.sctp_init.max_attempts_value, - sizeof(asp->cfg.sctp_init.max_attempts_value)); - if (asp->cfg.sctp_init.max_init_timeo_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, - &asp->cfg.sctp_init.max_init_timeo_value, - sizeof(asp->cfg.sctp_init.max_init_timeo_value)); + + if (asp->cfg.trans_proto == IPPROTO_SCTP) + asp_client_apply_sctp_init_pars(asp); + rc = osmo_stream_cli_open(asp->client); return rc; } diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 893797a..cd937d2 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -281,6 +281,28 @@ local_port, local_host); } +static int ss7_xua_srv_apply_sctp_init_pars(struct osmo_xua_server *xs) +{ + uint8_t byte; + OSMO_ASSERT(xs->server); + + byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, + &byte, sizeof(byte)); + byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, + &byte, sizeof(byte)); + if (xs->cfg.sctp_init.num_ostreams_present) + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS, + &xs->cfg.sctp_init.num_ostreams_value, + sizeof(xs->cfg.sctp_init.num_ostreams_value)); + if (xs->cfg.sctp_init.max_instreams_present) + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_MAX_INSTREAMS, + &xs->cfg.sctp_init.max_instreams_value, + sizeof(xs->cfg.sctp_init.max_instreams_value)); + return 0; +} + /*! \brief Set the xUA server to bind/listen to the currently configured ip/port * \param[in] xs xUA server to operate * \returns 0 on success, negative value on error. @@ -290,7 +312,6 @@ { char buf[512]; int rc; - uint8_t byte; const char *proto = get_value_string(osmo_ss7_asp_protocol_vals, xs->cfg.proto); rc = ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local); @@ -302,18 +323,10 @@ } /* Applying xUA Server config which may have changed through VTY on the srv_link before opening it: */ - byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); - byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); - if (xs->cfg.sctp_init.num_ostreams_present) - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS, - &xs->cfg.sctp_init.num_ostreams_value, - sizeof(xs->cfg.sctp_init.num_ostreams_value)); - if (xs->cfg.sctp_init.max_instreams_present) - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_MAX_INSTREAMS, - &xs->cfg.sctp_init.max_instreams_value, - sizeof(xs->cfg.sctp_init.max_instreams_value)); + if (xs->cfg.trans_proto == IPPROTO_SCTP) { + if ((rc = ss7_xua_srv_apply_sctp_init_pars(xs)) < 0) + LOGP(DLSS7, LOGL_NOTICE, "Failed applyng %s Server SCTP INIT parameters\n", proto); + } return osmo_stream_srv_link_open(xs->server); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?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: I013c51efd03a3f5561bf9849c8841b1c7e66c172 Gerrit-Change-Number: 40480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce support to configure and enable TCP keep-alive

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email ) Change subject: asp: Introduce support to configure and enable TCP keep-alive ...................................................................... asp: Introduce support to configure and enable TCP keep-alive Depends: libosmo-netif.git Change-Id Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 --- M TODO-RELEASE 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 6 files changed, 197 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40481/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..2d94ad1 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_KEEP* diff --git a/src/ss7_asp.c b/src/ss7_asp.c index d7e9b12..1383f32 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -227,6 +227,77 @@ }; static unsigned int g_ss7_asp_rcg_idx; +int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) +{ + uint8_t byte = 1; + int val; + int rc; + + if (!asp->cfg.tcp.keepalive_enable) + return 0; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Enabling TCP keep-alive\n"); + + if (asp->server) { + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPALIVE, + &byte, sizeof(byte)); + if (rc < 0) + return rc; + + if (asp->cfg.tcp.keepalive_time_present) { + val = asp->cfg.tcp.keepalive_time_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_intvl_present) { + val = asp->cfg.tcp.keepalive_intvl_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_probes_present) { + val = asp->cfg.tcp.keepalive_probes_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + + } else if (asp->client) { + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPALIVE, + &byte, sizeof(byte)); + if (rc < 0) + return rc; + + if (asp->cfg.tcp.keepalive_time_present) { + val = asp->cfg.tcp.keepalive_time_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_intvl_present) { + val = asp->cfg.tcp.keepalive_intvl_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_probes_present) { + val = asp->cfg.tcp.keepalive_probes_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + } + + return 0; +} + int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; @@ -721,8 +792,16 @@ } osmo_stream_cli_set_data(asp->client, asp); - if (asp->cfg.trans_proto == IPPROTO_SCTP) - asp_client_apply_sctp_init_pars(asp); + switch (asp->cfg.trans_proto) { + case IPPROTO_TCP: + rc = ss7_asp_apply_tcp_keepalive(asp); + break; + case IPPROTO_SCTP: + rc = asp_client_apply_sctp_init_pars(asp); + break; + default: + OSMO_ASSERT(0); + } rc = osmo_stream_cli_open(asp->client); return rc; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 889b5c9..00c6825 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -130,6 +130,16 @@ uint16_t max_init_timeo_value; /* ms */ } sctp_init; + struct { + bool keepalive_enable; + bool keepalive_time_present; + bool keepalive_intvl_present; + bool keepalive_probes_present; + int keepalive_time_value; /* seconds */ + int keepalive_intvl_value; /* seconds */ + int keepalive_probes_value; + } tcp; + /*! The underlaying transport protocol (one of IPPROTO_*) */ int trans_proto; } cfg; @@ -143,6 +153,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_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 3e22465..572b31d 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -445,6 +445,81 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_KEEPALIVE_DESC \ + "Configure TCP parameters\n" \ + "Configure TCP keep-alive related parameters\n" \ + +DEFUN_ATTR(asp_tcp_param_keepalive_enabled, asp_tcp_param_keepalive_enabled_cmd, + "tcp-param keepalive enabled", + ASP_TCP_PARAM_KEEPALIVE_DESC + "Enable TCP keep-alive\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.keepalive_enable = true; + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_keepalive, asp_no_tcp_param_keepalive_cmd, + "no tcp-param keepalive", + NO_STR ASP_TCP_PARAM_KEEPALIVE_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.keepalive_enable = false; + return CMD_SUCCESS; +} + +#define ASP_TCP_PARAM_KEEPALIVE_CFG_DESC \ + ASP_TCP_PARAM_KEEPALIVE_DESC \ + "Configure number of seconds a connection needs to be idle before beggining to send probes\n" \ + "Configure number of seconds between probes\n" \ + "Configure max number of probes to send before giving up if no response is obtained\n" +#define ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS "(time|intvl|probes)" + +DEFUN_ATTR(asp_tcp_param_keepalive_cfg, asp_tcp_param_keepalive_cfg_cmd, + "tcp-param keepalive " ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS " <0-65535>", + ASP_TCP_PARAM_KEEPALIVE_CFG_DESC + "Value of the parameter\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + uint16_t val = atoi(argv[1]); + + if (strcmp(argv[0], "time") == 0) { + asp->cfg.tcp.keepalive_time_present = true; + asp->cfg.tcp.keepalive_time_value = val; + } else if (strcmp(argv[0], "intvl") == 0) { + asp->cfg.tcp.keepalive_intvl_present = true; + asp->cfg.tcp.keepalive_intvl_value = val; + } else if (strcmp(argv[0], "probes") == 0) { + asp->cfg.tcp.keepalive_probes_present = true; + asp->cfg.tcp.keepalive_probes_value = val; + } else { + OSMO_ASSERT(0); + } + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_keepalive_cfg, asp_no_tcp_param_keepalive_cfg_cmd, + "no tcp-param keepalive " ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS, + NO_STR ASP_TCP_PARAM_KEEPALIVE_CFG_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + if (strcmp(argv[0], "num-ostreams") == 0) + asp->cfg.tcp.keepalive_time_present = false; + else if (strcmp(argv[0], "max-instreams") == 0) + asp->cfg.tcp.keepalive_intvl_present = false; + else if (strcmp(argv[0], "max-attempts") == 0) + asp->cfg.tcp.keepalive_probes_present = false; + else + OSMO_ASSERT(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", @@ -1141,6 +1216,19 @@ vty_out(vty, " sctp-param init max-attempts %u%s", asp->cfg.sctp_init.max_attempts_value, VTY_NEWLINE); if (asp->cfg.sctp_init.max_init_timeo_present) vty_out(vty, " sctp-param init timeout %u%s", asp->cfg.sctp_init.max_init_timeo_value, VTY_NEWLINE); + + if (asp->cfg.tcp.keepalive_enable) { + vty_out(vty, " tcp-param keepalive enabled%s", VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_time_present) + vty_out(vty, " tcp-param keepalive time %d%s", asp->cfg.tcp.keepalive_time_value, VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_intvl_present) + vty_out(vty, " tcp-param keepalive intvl %d%s", asp->cfg.tcp.keepalive_intvl_value, VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_probes_present) + vty_out(vty, " tcp-param keepalive probes %d%s", asp->cfg.tcp.keepalive_probes_value, VTY_NEWLINE); + } else if (asp->cfg.trans_proto == IPPROTO_TCP) { + vty_out(vty, " no tcp-param keepalive%s", VTY_NEWLINE); + } + for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (!(asp->cfg.quirks & ((uint32_t) 1 << i))) continue; @@ -1226,6 +1314,10 @@ 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_tcp_param_keepalive_enabled_cmd); + 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_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 cd937d2..d7806aa 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -191,9 +191,14 @@ * data */ osmo_stream_srv_set_data(srv, asp); - if (asp->cfg.trans_proto == IPPROTO_SCTP) { + switch (asp->cfg.trans_proto) { + case IPPROTO_TCP: + rc = ss7_asp_apply_tcp_keepalive(asp); + break; + case IPPROTO_SCTP: rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + break; } /* send M-SCTP_ESTABLISH.ind to Layer Manager */ diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index be2beb5..b89bb30 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -283,6 +283,10 @@ 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) + tcp-param keepalive enabled + tcp-param keepalive (time|intvl|probes) <0-65535> + no tcp-param keepalive + no tcp-param keepalive (time|intvl|probes) quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) timer xua (ack|beat) <1-999999> @@ -302,6 +306,7 @@ role Specify the xUA role for this ASP transport-role Specify the transport layer role for this ASP sctp-param Configure SCTP parameters + tcp-param Configure TCP 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 @@ -311,6 +316,7 @@ OsmoSTP(config-cs7-asp)# no ? ... sctp-param Configure SCTP parameters + tcp-param Configure TCP parameters quirk Disable quirk to work around interop issues shutdown Terminates SCTP association; New associations will be rejected ... -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?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: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP_USER_TIMEOUT parameter

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email ) Change subject: stream: Support configuring TCP_USER_TIMEOUT parameter ...................................................................... stream: Support configuring TCP_USER_TIMEOUT parameter This is set for instance in libosmo-abis, and may affect how keepalive behaves. See man 7 tcp for more information. Change-Id: I22c7df92b463cf4ca82854a12ec24337d53e8b20 --- M TODO-RELEASE M include/osmocom/netif/stream.h M include/osmocom/netif/stream_private.h M src/stream.c M src/stream_cli.c M src/stream_srv.c 6 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/79/40479/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index e519375..6340cdf 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line stream add OSMO_STREAM_{CLI,SRV,SRV_LINK}_TCP_SOCKOPT_KEEP*, osmo_stream_srv_set_param() +stream add OSMO_STREAM_{CLI,SRV,SRV_LINK}_TCP_SOCKOPT_USER_TIMEOUT diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 7b74e87..8c3fad5 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -103,6 +103,7 @@ OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ + OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_USER_TIMEOUT, /* unsigned int: 0 "system default", >0 see sockopt TCP_USER_TIMEOUT */ }; int osmo_stream_srv_link_set_param(struct osmo_stream_srv_link *link, enum osmo_stream_srv_link_param par, @@ -159,6 +160,7 @@ OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ + OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_USER_TIMEOUT, /* unsigned int: 0 "system default", >0 see sockopt TCP_USER_TIMEOUT */ }; int osmo_stream_srv_set_param(struct osmo_stream_srv *conn, enum osmo_stream_srv_param par, void *val, size_t val_len); @@ -274,6 +276,7 @@ OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ + OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_USER_TIMEOUT, /* unsigned int: 0 "system default", >0 see sockopt TCP_USER_TIMEOUT */ }; int osmo_stream_cli_set_param(struct osmo_stream_cli *cli, enum osmo_stream_cli_param par, diff --git a/include/osmocom/netif/stream_private.h b/include/osmocom/netif/stream_private.h index 7fb0de6..154e7f7 100644 --- a/include/osmocom/netif/stream_private.h +++ b/include/osmocom/netif/stream_private.h @@ -46,8 +46,10 @@ struct stream_tcp_pars { struct stream_tcp_keepalive_pars ka; - /* Others like TCP_USER_TIMEOUT will be added here in the future. */ + bool user_timeout_present; + unsigned int user_timeout_value; }; +int stream_setsockopt_tcp_user_timeout(int fd, unsigned int user_timeout); struct osmo_io_fd; struct msghdr; diff --git a/src/stream.c b/src/stream.c index a1e077a..339dd6a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -240,6 +240,17 @@ return 0; } +int stream_setsockopt_tcp_user_timeout(int fd, unsigned int user_timeout) +{ + int ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout, sizeof(user_timeout)); + if (ret < 0) { + ret = errno; + LOGP(DLINP, LOGL_ERROR, "Failed to set TCP_USER_TIMEOUT on fd %d: %s\n", fd, strerror(ret)); + return -ret; + } + return 0; +} + int stream_tcp_keepalive_pars_apply(int fd, const struct stream_tcp_keepalive_pars *tkp) { int ret; diff --git a/src/stream_cli.c b/src/stream_cli.c index 4b20a61..13a1589 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -1291,6 +1291,11 @@ ret = stream_tcp_keepalive_pars_apply(fd, &cli->tcp_pars.ka); if (ret < 0) goto error_close_socket; + if (cli->tcp_pars.user_timeout_present) { + ret = stream_setsockopt_tcp_user_timeout(fd, cli->tcp_pars.user_timeout_value); + if (ret < 0) + goto error_close_socket; + } } switch (cli->mode) { @@ -1571,6 +1576,14 @@ if (stream_cli_is_opened(cli)) return stream_setsockopt_tcp_keepcnt(osmo_stream_cli_get_fd(cli), cli->tcp_pars.ka.probes_value); break; + case OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_USER_TIMEOUT: + if (!val || val_len != sizeof(unsigned int)) + return -EINVAL; + cli->tcp_pars.user_timeout_present = true; + cli->tcp_pars.user_timeout_value = *(int *)val; + if (stream_cli_is_opened(cli)) + return stream_setsockopt_tcp_user_timeout(osmo_stream_cli_get_fd(cli), cli->tcp_pars.user_timeout_value); + break; default: return -ENOENT; }; diff --git a/src/stream_srv.c b/src/stream_srv.c index b7bc378..1eebd3a 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -150,6 +150,9 @@ LOGSLNK(link, LOGL_ERROR, "failed applying TCP keep-alive pars on fd %d\n", sock_fd); goto error_close_socket; } + /* tcp_pars.user_timeout (sockopt TCP_USER_TIMEOUT) is + * inherited by accept() connected sockets automatically, + * no need to re-apply it here. */ break; case IPPROTO_SCTP: _setsockopt_nosigpipe(link, sock_fd); @@ -710,6 +713,15 @@ link->tcp_pars.ka.probes_value = *(int *)val; /* Will be applied on accepted sockets */ break; + case OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_USER_TIMEOUT: + if (!val || val_len != sizeof(unsigned int)) + return -EINVAL; + link->tcp_pars.user_timeout_present = true; + link->tcp_pars.user_timeout_value = *(int *)val; + /* This value is inherited by accept() connected sockets (hence by child stream_srv): */ + if (osmo_stream_srv_link_is_opened(link)) + return stream_setsockopt_tcp_user_timeout(osmo_stream_srv_link_get_fd(link), + link->tcp_pars.user_timeout_value); default: return -ENOENT; }; @@ -1448,6 +1460,7 @@ { uint8_t on; int i; + unsigned int u; OSMO_ASSERT(conn); switch (par) { @@ -1472,6 +1485,12 @@ return -EINVAL; i = *(int *)val; return stream_setsockopt_tcp_keepcnt(osmo_stream_srv_get_fd(conn), i); + case OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_USER_TIMEOUT: + if (!val || val_len != sizeof(unsigned int)) + return -EINVAL; + u = *(unsigned int *)val; + return stream_setsockopt_tcp_user_timeout(osmo_stream_srv_get_fd(conn), u); + break; default: return -ENOENT; }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22c7df92b463cf4ca82854a12ec24337d53e8b20 Gerrit-Change-Number: 40479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP keep-alive pars

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email ) Change subject: stream: Support configuring TCP keep-alive pars ...................................................................... stream: Support configuring TCP keep-alive pars for servers, the param can either be set on the link (which will be automatically inherited/applied for all accepted conn sockets), or can be set specifically on a srv conn socket. The second is useful when user can supply different parameters for different clients connected to the listening socket, eg. ASP configuration in libosmo-sigtran. Change-Id: Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b --- M TODO-RELEASE M include/osmocom/netif/stream.h M include/osmocom/netif/stream_private.h M src/stream.c M src/stream_cli.c M src/stream_srv.c 6 files changed, 237 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/78/40478/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..e519375 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 +stream add OSMO_STREAM_{CLI,SRV,SRV_LINK}_TCP_SOCKOPT_KEEP*, osmo_stream_srv_set_param() diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 075e5e9..7b74e87 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -98,6 +98,11 @@ OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS, /* uint16_t: amount of streams */ OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_MAX_INSTREAMS, /* uint16_t: amount of streams */ + + OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPALIVE = 256, /* uint8_t: 0 disable, 1 enable */ + OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ + OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ + OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ }; int osmo_stream_srv_link_set_param(struct osmo_stream_srv_link *link, enum osmo_stream_srv_link_param par, @@ -149,6 +154,15 @@ void osmo_stream_srv_clear_tx_queue(struct osmo_stream_srv *conn); +enum osmo_stream_srv_param { + OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPALIVE = 256, /* uint8_t: 0 disable, 1 enable */ + OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ + OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ + OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ +}; +int osmo_stream_srv_set_param(struct osmo_stream_srv *conn, enum osmo_stream_srv_param par, + void *val, size_t val_len); + /*! @} */ /*! \defgroup stream_cli Osmocom Stream Client @@ -255,6 +269,11 @@ OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, /* uint16_t: amount of streams */ OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, /* uint16_t: amount of attempts */ OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, /* uint16_t: milliseconds */ + + OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPALIVE = 256, /* uint8_t: 0 disable, 1 enable */ + OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE, /* int: seconds */ + OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL, /* int: seconds */ + OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT, /* int: Number of probes */ }; int osmo_stream_cli_set_param(struct osmo_stream_cli *cli, enum osmo_stream_cli_param par, diff --git a/include/osmocom/netif/stream_private.h b/include/osmocom/netif/stream_private.h index dc7506d..7fb0de6 100644 --- a/include/osmocom/netif/stream_private.h +++ b/include/osmocom/netif/stream_private.h @@ -29,6 +29,26 @@ OSMO_STREAM_MODE_OSMO_IO, }; +struct stream_tcp_keepalive_pars { + bool enable; + bool time_present; + bool intvl_present; + bool probes_present; + int time_value; /* seconds */ + int intvl_value; /* seconds */ + int probes_value; +}; +int stream_setsockopt_tcp_keepalive(int fd, int on); +int stream_setsockopt_tcp_keepidle(int fd, int keepalive_time); +int stream_setsockopt_tcp_keepintvl(int fd, int keepalive_intvl); +int stream_setsockopt_tcp_keepcnt(int fd, int keepalive_probes); +int stream_tcp_keepalive_pars_apply(int fd, const struct stream_tcp_keepalive_pars *tkp); + +struct stream_tcp_pars { + struct stream_tcp_keepalive_pars ka; + /* Others like TCP_USER_TIMEOUT will be added here in the future. */ +}; + struct osmo_io_fd; struct msghdr; diff --git a/src/stream.c b/src/stream.c index f0902a4..a1e077a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -196,6 +196,78 @@ return rc; } +int stream_setsockopt_tcp_keepalive(int fd, int on) +{ + int ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)); + if (ret < 0) { + ret = errno; + LOGP(DLINP, LOGL_ERROR, "Failed to enable TCP keepalive on fd %d: %s\n", fd, strerror(ret)); + return -ret; + } + return 0; +} + +int stream_setsockopt_tcp_keepidle(int fd, int keepalive_time) +{ + int ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepalive_time, sizeof(keepalive_time)); + if (ret < 0) { + ret = errno; + LOGP(DLINP, LOGL_ERROR, "Failed to set TCP_KEEPIDLE on fd %d: %s\n", fd, strerror(ret)); + return -ret; + } + return 0; +} + +int stream_setsockopt_tcp_keepintvl(int fd, int keepalive_intvl) +{ + int ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepalive_intvl, sizeof(keepalive_intvl)); + if (ret < 0) { + ret = errno; + LOGP(DLINP, LOGL_ERROR, "Failed to set TCP_KEEPINTVL on fd %d: %s\n", fd, strerror(ret)); + return -ret; + } + return 0; +} + +int stream_setsockopt_tcp_keepcnt(int fd, int keepalive_probes) +{ + int ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &keepalive_probes, sizeof(keepalive_probes)); + if (ret < 0) { + ret = errno; + LOGP(DLINP, LOGL_ERROR, "Failed to set TCP_KEEPCNT on fd %d: %s\n", fd, strerror(ret)); + return -ret; + } + return 0; +} + +int stream_tcp_keepalive_pars_apply(int fd, const struct stream_tcp_keepalive_pars *tkp) +{ + int ret; + + if (!tkp->enable) + return 0; + + if ((ret = stream_setsockopt_tcp_keepalive(fd, tkp->enable)) < 0) + return ret; + + if (tkp->time_present) { + if ((ret = stream_setsockopt_tcp_keepidle(fd, tkp->time_value)) < 0) + return ret; + } + + if (tkp->intvl_present) { + if ((ret = stream_setsockopt_tcp_keepintvl(fd, tkp->intvl_value)) < 0) + return ret; + } + + if (tkp->probes_present) { + if ((ret = stream_setsockopt_tcp_keepcnt(fd, tkp->probes_value)) < 0) + return ret; + } + + return 0; +} + #ifdef HAVE_LIBSCTP static int stream_sctp_recvmsg_trailer(const char *log_pfx, struct msgb *msg, int ret, const struct sctp_sndrcvinfo *sinfo, int flags) { diff --git a/src/stream_cli.c b/src/stream_cli.c index 028ab07..4b20a61 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -122,6 +122,7 @@ int flags; int reconnect_timeout; struct osmo_sock_init2_multiaddr_pars ma_pars; + struct stream_tcp_pars tcp_pars; uint8_t in_cb_mask; /* IN_CB_MASK_* */ bool delay_free; }; @@ -1286,6 +1287,12 @@ goto error_close_socket; } + if (cli->proto == IPPROTO_TCP) { + ret = stream_tcp_keepalive_pars_apply(fd, &cli->tcp_pars.ka); + if (ret < 0) + goto error_close_socket; + } + switch (cli->mode) { case OSMO_STREAM_MODE_OSMO_FD: osmo_fd_setup(&cli->ofd, fd, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_cli_fd_cb, cli, 0); @@ -1532,6 +1539,38 @@ cli->ma_pars.sctp.sockopt_initmsg.max_init_timeo_present = true; cli->ma_pars.sctp.sockopt_initmsg.max_init_timeo_value = *(uint16_t *)val; break; + /* TCP keelapive params: */ + case OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPALIVE: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + cli->tcp_pars.ka.enable = !!*(uint8_t *)val; + if (stream_cli_is_opened(cli)) + return stream_setsockopt_tcp_keepalive(osmo_stream_cli_get_fd(cli), cli->tcp_pars.ka.enable); + break; + case OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE: + if (!val || val_len != sizeof(int)) + return -EINVAL; + cli->tcp_pars.ka.time_present = true; + cli->tcp_pars.ka.time_value = *(int *)val; + if (stream_cli_is_opened(cli)) + return stream_setsockopt_tcp_keepidle(osmo_stream_cli_get_fd(cli), cli->tcp_pars.ka.time_value); + break; + case OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL: + if (!val || val_len != sizeof(int)) + return -EINVAL; + cli->tcp_pars.ka.intvl_present = true; + cli->tcp_pars.ka.intvl_value = *(int *)val; + if (stream_cli_is_opened(cli)) + return stream_setsockopt_tcp_keepintvl(osmo_stream_cli_get_fd(cli), cli->tcp_pars.ka.intvl_value); + break; + case OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT: + if (!val || val_len != sizeof(int)) + return -EINVAL; + cli->tcp_pars.ka.probes_present = true; + cli->tcp_pars.ka.probes_value = *(int *)val; + if (stream_cli_is_opened(cli)) + return stream_setsockopt_tcp_keepcnt(osmo_stream_cli_get_fd(cli), cli->tcp_pars.ka.probes_value); + break; default: return -ENOENT; }; diff --git a/src/stream_srv.c b/src/stream_srv.c index be950ce..b7bc378 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -99,6 +99,7 @@ unsigned int tx_queue_max_length; /* Max amount of msgbs which can be enqueued */ struct msgb_alloc_info msgb_alloc; struct osmo_sock_init2_multiaddr_pars ma_pars; + struct stream_tcp_pars tcp_pars; }; static int _setsockopt_nosigpipe(struct osmo_stream_srv_link *link, int new_fd) @@ -142,11 +143,22 @@ LOGSLNK(link, LOGL_INFO, "accept()ed new link from %s\n", osmo_sockaddr_to_str(&osa)); - if (link->proto == IPPROTO_SCTP) { + switch (link->proto) { + case IPPROTO_TCP: + ret = stream_tcp_keepalive_pars_apply(sock_fd, &link->tcp_pars.ka); + if (ret < 0) { + LOGSLNK(link, LOGL_ERROR, "failed applying TCP keep-alive pars on fd %d\n", sock_fd); + goto error_close_socket; + } + break; + case IPPROTO_SCTP: _setsockopt_nosigpipe(link, sock_fd); ret = stream_sctp_sock_activate_events(sock_fd); if (ret < 0) goto error_close_socket; + break; + default: + break; } break; default: @@ -628,7 +640,7 @@ } /*! Set given parameter of stream_srv_link to given value. - * \param[in] cli stream client on which to set parameter. + * \param[in] link stream server link on which to set parameter. * \param[in] par identifier of the parameter to be set. * \param[in] val value of the parameter to be set. * \param[in] val_len length of the parameter value. @@ -670,6 +682,34 @@ link->ma_pars.sctp.sockopt_initmsg.max_instreams_present = true; link->ma_pars.sctp.sockopt_initmsg.max_instreams_value = *(uint16_t *)val; break; + /* TCP keelapive params: */ + case OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPALIVE: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + link->tcp_pars.ka.enable = !!*(uint8_t *)val; + /* Will be applied on accepted sockets */ + break; + case OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPIDLE: + if (!val || val_len != sizeof(int)) + return -EINVAL; + link->tcp_pars.ka.time_present = true; + link->tcp_pars.ka.time_value = *(int *)val; + /* Will be applied on accepted sockets */ + break; + case OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPINTVL: + if (!val || val_len != sizeof(int)) + return -EINVAL; + link->tcp_pars.ka.intvl_present = true; + link->tcp_pars.ka.intvl_value = *(int *)val; + /* Will be applied on accepted sockets */ + break; + case OSMO_STREAM_SRV_LINK_PAR_TCP_SOCKOPT_KEEPCNT: + if (!val || val_len != sizeof(int)) + return -EINVAL; + link->tcp_pars.ka.probes_present = true; + link->tcp_pars.ka.probes_value = *(int *)val; + /* Will be applied on accepted sockets */ + break; default: return -ENOENT; }; @@ -959,7 +999,10 @@ * \param[in] link Stream Server Link to which we belong * \param[in] fd system file descriptor of the new connection * \param[in] data User data to save in the new Stream Server struct - * \returns Stream Server in case of success; NULL on error */ + * \returns Stream Server in case of success; NULL on error + * + * Note: In case of error, the caller is responsible for closing the fd. + * */ struct osmo_stream_srv * osmo_stream_srv_create2(void *ctx, struct osmo_stream_srv_link *link, int fd, void *data) { @@ -1394,4 +1437,44 @@ osmo_stream_srv_destroy(conn); } +/*! Set given parameter of stream_srv to given value. + * \param[in] conn stream server conn on which to set parameter. + * \param[in] par identifier of the parameter to be set. + * \param[in] val value of the parameter to be set. + * \param[in] val_len length of the parameter value. + * \returns 0 in success; negative -errno on error. */ +int osmo_stream_srv_set_param(struct osmo_stream_srv *conn, enum osmo_stream_srv_param par, + void *val, size_t val_len) +{ + uint8_t on; + int i; + OSMO_ASSERT(conn); + + switch (par) { + /* TCP keelapive params: */ + case OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPALIVE: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + on = !!*(uint8_t *)val; + return stream_setsockopt_tcp_keepalive(osmo_stream_srv_get_fd(conn), on); + case OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE: + if (!val || val_len != sizeof(int)) + return -EINVAL; + i = *(int *)val; + return stream_setsockopt_tcp_keepidle(osmo_stream_srv_get_fd(conn), i); + case OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL: + if (!val || val_len != sizeof(int)) + return -EINVAL; + i = *(int *)val; + return stream_setsockopt_tcp_keepintvl(osmo_stream_srv_get_fd(conn), i); + case OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT: + if (!val || val_len != sizeof(int)) + return -EINVAL; + i = *(int *)val; + return stream_setsockopt_tcp_keepcnt(osmo_stream_srv_get_fd(conn), i); + default: + return -ENOENT; + }; +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Gerrit-Change-Number: 40478 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: fix ip link ls output ...................................................................... epdg/testenv/run_osmo_epdg…: fix ip link ls output In the code that waits until the tun device is available, fix the silencing of stdout and stderr. Change-Id: I8ce8824930e8841dddd7a67d178d5140e4f71b84 --- M epdg/testenv/run_osmo_epdg_with_dummy_ue.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh index 93853b8..439dccc 100755 --- a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh +++ b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh @@ -16,7 +16,7 @@ FOUND=0 for i in $(seq 1 10); do sleep 1 - if ip link ls dev "$EPDG_TUN" 2>&1 >/dev/null; then + if ip link ls dev "$EPDG_TUN" >/dev/null 2>&1; then FOUND=1 break fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40476?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ce8824930e8841dddd7a67d178d5140e4f71b84 Gerrit-Change-Number: 40476 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?usp=email ) Change subject: epdg/testenv/run_osmo_epdg…: wait up to 30s ...................................................................... epdg/testenv/run_osmo_epdg…: wait up to 30s Wait up to 30s for the tun device as waiting 10s is not enough if jenkins is under high load. Related: https://jenkins.osmocom.org/jenkins/job/ttcn3-epdg-test-net-next/29/console Change-Id: Ia7298275b92f30efc40e9d6afa1abc8d7c5536d6 --- M epdg/testenv/run_osmo_epdg_with_dummy_ue.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh index 439dccc..99d43e8 100755 --- a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh +++ b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh @@ -14,7 +14,7 @@ set +x FOUND=0 -for i in $(seq 1 10); do +for i in $(seq 1 30); do sleep 1 if ip link ls dev "$EPDG_TUN" >/dev/null 2>&1; then FOUND=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40477?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7298275b92f30efc40e9d6afa1abc8d7c5536d6 Gerrit-Change-Number: 40477 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025