- gerrit-log - lists.osmocom.org

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

by pespin

Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review-1 by fixeria, Verified-1 by Jenkins Builder 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, 202 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40481/3 -- 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: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

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

by pespin

Attention is currently required from: fixeria. pespin 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 2: (2 comments) File src/ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481/comment/6b071c95_fb2cb… : PS2, Line 800: rc = > You're assigning a value to `rc`, but then after the `switch` it gets overwritten. I did that on purpose, I don't want failure to set this make all fail, specially regarding SCTP INIT params applied on kernels which may have bad support for it, etc. There's already error logging happening in the lower layers btw. I'll add some explicit lines stating so. File src/ss7_asp_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481/comment/d8c0eb22_f9144… : PS2, Line 512: "num-ostreams" > Acknowledged Done -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 14:50:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

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

by pespin

pespin 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 3: (1 comment) File include/osmocom/netif/stream_private.h: https://gerrit.osmocom.org/c/libosmo-netif/+/40479/comment/9a500e46_cd1985d… : PS2, Line 52: stream_setsockopt_tcp_user_timeout > No, imho it belongs here below the tcp_pars struct. Done -- 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: 3 Gerrit-Owner: pespin <pespin(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> Gerrit-Comment-Date: Wed, 18 Jun 2025 14:15:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved 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 1a2a768..c623fff 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 e80d5e4..2e80909 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; }; @@ -1451,6 +1463,7 @@ { uint8_t on; int i; + unsigned int u; OSMO_ASSERT(conn); switch (par) { @@ -1475,6 +1488,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: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22c7df92b463cf4ca82854a12ec24337d53e8b20 Gerrit-Change-Number: 40479 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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>

5 days, 8 hours

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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, 232 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified 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..1a2a768 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 keepalive 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 5ffb28b..e80d5e4 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: @@ -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 keepalive 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; }; @@ -1400,4 +1440,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 keepalive 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: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Gerrit-Change-Number: 40478 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Improve API documentation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40485?usp=email ) Change subject: stream_srv: Improve API documentation ...................................................................... stream_srv: Improve API documentation Change-Id: Ib41eeef3a21ec55a175b6bbb818d05c091b46df5 --- M src/stream_srv.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream_srv.c b/src/stream_srv.c index be950ce..5ffb28b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -628,7 +628,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. @@ -916,7 +916,10 @@ * \param[in] read_cb Call-back to call when the socket is readable * \param[in] closed_cb Call-back to call when the connection is closed * \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_create(void *ctx, struct osmo_stream_srv_link *link, int fd, osmo_stream_srv_read_cb_t read_cb, @@ -959,7 +962,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) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib41eeef3a21ec55a175b6bbb818d05c091b46df5 Gerrit-Change-Number: 40485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

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

by pespin

Attention is currently required from: fixeria. pespin 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 3: Code-Review+2 -- 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: 3 Gerrit-Owner: pespin <pespin(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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 14:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 8 hours

1
0
0 0

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

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-netif/+/40478?usp=email ) Change subject: stream: Support configuring TCP keep-alive pars ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/407a4c09_dc9bf63… : PS2, Line 1004: Note: In case of error, the caller is responsible for closing the fd. > looks unrelated I moved it to a prior commit. -- 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: 3 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-Reviewer: pespin <pespin(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: Wed, 18 Jun 2025 14:14:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Improve API documentation

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40485?usp=email ) Change subject: stream_srv: Improve API documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40485?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: Ib41eeef3a21ec55a175b6bbb818d05c091b46df5 Gerrit-Change-Number: 40485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 14:14:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 8 hours

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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..120f165 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 applying %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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I013c51efd03a3f5561bf9849c8841b1c7e66c172 Gerrit-Change-Number: 40480 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de>

5 days, 8 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log