November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: osmo_io: Increase default queue max_length from 32 to 1024

by osmith

Attention is currently required from: daniel, fixeria, jolly, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/38886?usp=email ) Change subject: osmo_io: Increase default queue max_length from 32 to 1024 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I92d5369af523f6297d45d4b534bb0f349ae74485 Gerrit-Change-Number: 38886 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: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> 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: Fri, 22 Nov 2024 15:02:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in libosmocore[master]: ctrl: logging improvements

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email ) Change subject: ctrl: logging improvements ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id555fe0dc27e49af3c931ffb33124a15784ccfb3 Gerrit-Change-Number: 38885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:01:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream_srv: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/38894?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: stream_srv: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs ...................................................................... stream_srv: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs Change-Id: Iacb6b72a05055820253eaaa04850637dd2fc20e9 --- M TODO-RELEASE M include/osmocom/netif/stream.h M src/stream_srv.c 3 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/94/38894/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iacb6b72a05055820253eaaa04850637dd2fc20e9 Gerrit-Change-Number: 38894 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38894?usp=email ) Change subject: stream_cli: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs ...................................................................... stream_cli: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs Change-Id: Iacb6b72a05055820253eaaa04850637dd2fc20e9 --- M TODO-RELEASE M include/osmocom/netif/stream.h M src/stream_srv.c 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/94/38894/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 15f995e..4f59788 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +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 add API osmo_stream_cli_set_{ip_dscp,priority}() +libosmo-netif add API osmo_stream_cli_set_{ip_dscp,priority}(), osmo_stream_srv_link_set_{ip_dscp,priority}() diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 96d8bbf..6edf915 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -70,6 +70,8 @@ void osmo_stream_srv_link_set_name(struct osmo_stream_srv_link *link, const char *name); const char *osmo_stream_srv_link_get_name(const struct osmo_stream_srv_link *link); void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay); +int osmo_stream_srv_link_set_priority(struct osmo_stream_srv_link *link, int sk_prio); +int osmo_stream_srv_link_set_ip_dscp(struct osmo_stream_srv_link *link, uint8_t ip_dscp); void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr); int osmo_stream_srv_link_set_addrs(struct osmo_stream_srv_link *link, const char **addr, size_t addrcnt); void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port); diff --git a/src/stream_srv.c b/src/stream_srv.c index a600ad9..ced0e05 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -148,6 +148,24 @@ goto error_close_socket; } + if (link->ip_dscp > 0) { + ret = osmo_sock_set_dscp(sock_fd, link->ip_dscp); + if (ret < 0) { + LOGSLNK(link, LOGL_ERROR, "set_ip_dscp(%u): failed setsockopt err=%d\n", + link->ip_dscp, errno); + goto error_close_socket; + } + } + + if (link->sk_prio > 0) { + ret = osmo_sock_set_priority(sock_fd, link->sk_prio); + if (ret < 0) { + LOGSLNK(link, LOGL_ERROR, "set_priority(%u): failed setsockopt err=%d\n", + link->sk_prio, errno); + goto error_close_socket; + } + } + if (!link->accept_cb) { ret = -ENOTSUP; goto error_close_socket; @@ -224,6 +242,33 @@ link->flags &= ~OSMO_STREAM_SRV_F_NODELAY; } +/*! Set the priority value of the stream socket. + * Setting this will automatically set the socket priority + * option on any socket established via this server link, before + * calling the accept_cb(). + * \param[in] link server link whose sockets are to be configured + * \param[in] sk_prio priority value. Values outside 0..6 require CAP_NET_ADMIN. + * \return negative on error, 0 on success + */ +int osmo_stream_srv_link_set_priority(struct osmo_stream_srv_link *link, int sk_prio) +{ + link->sk_prio = sk_prio; + return 0; +} + +/*! Set the DSCP (differentiated services code point) of the stream socket. + * Setting this will automatically set the IP DSCP option on any socket on any + * socket established via this server link, before calling the accept_cb(). + * \param[in] link server link whose sockets are to be configured + * \param[in] ip_dscp DSCP value. Value range 0..63. + * \return negative on error, 0 on success + */ +int osmo_stream_srv_link_set_ip_dscp(struct osmo_stream_srv_link *link, uint8_t ip_dscp) +{ + link->ip_dscp = ip_dscp; + return 0; +} + /*! Set the local address to which we bind. * Any changes to this setting will only become active upon next (re)connect. * \param[in] link Stream Server Link to modify -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38894?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: Iacb6b72a05055820253eaaa04850637dd2fc20e9 Gerrit-Change-Number: 38894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: Announce failed connect() if reconnect is disabled

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38893?usp=email ) Change subject: stream_cli: Announce failed connect() if reconnect is disabled ...................................................................... stream_cli: Announce failed connect() if reconnect is disabled One of the use cases of disabling reconnect in osmo_stream_cli is because the user of the stream wants to control the reconnect based on upper layer contexts. In this case, though, if there's a failure during connect() time, the user won't get any notification and hence stay disconnected forever. Instead, inform the user through the disconnect_cb(). Change-Id: I69a5f7c3c7cea97d31e2fa03e8c32ce806285eb6 --- M src/stream_cli.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/93/38893/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 25dda4f..807f062 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -207,7 +207,10 @@ cli->state = STREAM_CLI_STATE_CLOSED; - if (old_state == STREAM_CLI_STATE_CONNECTED) { + /* If conn was established, notify the disconnection to the user: + * Also, if reconnect is disabled by user, notify the user that connect() failed: */ + if (old_state == STREAM_CLI_STATE_CONNECTED || + (old_state == STREAM_CLI_STATE_CONNECTING && cli->reconnect_timeout < 0)) { LOGSCLI(cli, LOGL_DEBUG, "connection closed\n"); if (cli->disconnect_cb) cli->disconnect_cb(cli); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38893?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: I69a5f7c3c7cea97d31e2fa03e8c32ce806285eb6 Gerrit-Change-Number: 38893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: Log all code paths ending up in close/reconnect

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38892?usp=email ) Change subject: stream_cli: Log all code paths ending up in close/reconnect ...................................................................... stream_cli: Log all code paths ending up in close/reconnect This way it's possible to track why a connection was closed od/and reconnected (depending on reconnect config set by user). Change-Id: I6debc5de193d99919fe858befd905223ef965d81 --- M src/stream_cli.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/92/38892/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 757de1c..25dda4f 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -353,11 +353,13 @@ OSMO_ASSERT(fd >= 0); if (ret < 0) { + LOGSCLI(cli, LOGL_ERROR, "connect failed (%d)\n", res); osmo_stream_cli_reconnect(cli); return; } ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len); if (ret >= 0 && error > 0) { + LOGSCLI(cli, LOGL_ERROR, "connect so_error (%d)\n", error); osmo_stream_cli_reconnect(cli); return; } @@ -895,6 +897,7 @@ } if (ret < 0) { + LOGSCLI(cli, LOGL_ERROR, "connect: socket creation error (%d)\n", ret); if (reconnect) osmo_stream_cli_reconnect(cli); return ret; @@ -1001,6 +1004,7 @@ } if (ret < 0) { + LOGSCLI(cli, LOGL_ERROR, "connect: socket creation error (%d)\n", ret); osmo_stream_cli_reconnect(cli); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38892?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: I6debc5de193d99919fe858befd905223ef965d81 Gerrit-Change-Number: 38892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Improve logging around recv() failure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38891?usp=email ) Change subject: stream: Improve logging around recv() failure ...................................................................... stream: Improve logging around recv() failure Change-Id: Ic050e7141b029d984fbbcc76ffc175f8e6b01664 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/91/38891/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index b0dac09..757de1c 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -1162,7 +1162,9 @@ if (ret == -EAGAIN) /* Received MSG_NOTIFICATION from stream_sctp_recvmsg_wrapper() */ return ret; if (errno == EPIPE || errno == ECONNRESET) - LOGSCLI(cli, LOGL_ERROR, "lost connection with srv\n"); + LOGSCLI(cli, LOGL_ERROR, "lost connection with srv (%d)\n", errno); + else + LOGSCLI(cli, LOGL_ERROR, "recv failed (%d)\n", errno); osmo_stream_cli_reconnect(cli); return ret; } else if (ret == 0) { diff --git a/src/stream_srv.c b/src/stream_srv.c index 9b39bdc..a600ad9 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -1184,7 +1184,9 @@ if (ret == -EAGAIN) /* Received MSG_NOTIFICATION from stream_sctp_recvmsg_wrapper() */ return ret; if (errno == EPIPE || errno == ECONNRESET) - LOGSSRV(conn, LOGL_ERROR, "lost connection with client\n"); + LOGSSRV(conn, LOGL_ERROR, "lost connection with client (%d)\n", errno); + else + LOGSSRV(conn, LOGL_ERROR, "recv failed (%d)\n", errno); return ret; } else if (ret == 0) { LOGSSRV(conn, LOGL_ERROR, "connection closed with client\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38891?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: Ic050e7141b029d984fbbcc76ffc175f8e6b01664 Gerrit-Change-Number: 38891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Explicitly document MSG_NOTIFICATION case in recv() API

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38890?usp=email ) Change subject: stream: Explicitly document MSG_NOTIFICATION case in recv() API ...................................................................... stream: Explicitly document MSG_NOTIFICATION case in recv() API Change-Id: I4fa70ae3f704d2379982153b5630009c13a6f316 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/90/38890/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 5d8a2c2..b0dac09 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -1159,7 +1159,7 @@ } if (ret < 0) { - if (ret == -EAGAIN) + if (ret == -EAGAIN) /* Received MSG_NOTIFICATION from stream_sctp_recvmsg_wrapper() */ return ret; if (errno == EPIPE || errno == ECONNRESET) LOGSCLI(cli, LOGL_ERROR, "lost connection with srv\n"); diff --git a/src/stream_srv.c b/src/stream_srv.c index dad6b7a..9b39bdc 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -1181,6 +1181,8 @@ } if (ret < 0) { + if (ret == -EAGAIN) /* Received MSG_NOTIFICATION from stream_sctp_recvmsg_wrapper() */ + return ret; if (errno == EPIPE || errno == ECONNRESET) LOGSSRV(conn, LOGL_ERROR, "lost connection with client\n"); return ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38890?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: I4fa70ae3f704d2379982153b5630009c13a6f316 Gerrit-Change-Number: 38890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-remsim[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... contrib/jenkins: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I72837fbde099f410eff69362155cb62e8a83c2c6 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 37a779c..2aa56a4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,8 +29,8 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif osmo-build-dep.sh simtrace2 # Additional configure options and depends -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I72837fbde099f410eff69362155cb62e8a83c2c6 Gerrit-Change-Number: 38889 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-remsim[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I72837fbde099f410eff69362155cb62e8a83c2c6 Gerrit-Change-Number: 38889 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 13:02:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024