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

[S] Change in libosmocore[master]: gsmtap_util: Get rid of unused wq
by pespin 17 Dec '25

17 Dec '25

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41700?usp=email ) Change subject: gsmtap_util: Get rid of unused wq ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41700?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: I4f1cf168c230471a6d7be4bb065d7105a993349f Gerrit-Change-Number: 41700 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 17 Dec 2025 16:52:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmocore[master]: logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking...
by pespin 17 Dec '25

17 Dec '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41702?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: logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq) ...................................................................... logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq) The current patch adds the possibility to configure it, and leaves the previous behavior as default: blocking-io. Related: OS#6213 Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04 --- M TODO-RELEASE M include/osmocom/core/gsmtap_util.h M include/osmocom/core/socket.h M src/core/gsmtap_util.c M src/core/libosmocore.map M src/core/socket.c M src/vty/logging_vty.c 7 files changed, 87 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/41702/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04 Gerrit-Change-Number: 41702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in libosmocore[master]: logging_vty: Set 'gsmtap log nonblocking-io' as default
by pespin 17 Dec '25

17 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41703?usp=email ) Change subject: logging_vty: Set 'gsmtap log nonblocking-io' as default ...................................................................... logging_vty: Set 'gsmtap log nonblocking-io' as default Apps using a VTY are expected to be using an event loop, and hence should not be using blocking operations which would stall the event loop. If user fears losing messages (eg, when enabling a lot of DEBUG), then the taget can still be switched to "wq" at the expense of losing performance, or increasing the kernel UDP socket sndbuf by means of sysctl net.core.wmem_{default,max}. Related: OS#6213 Related: OS#6794 Change-Id: Ifca8a821e13ec1327ab2476b0db91078fcff948b --- M src/vty/logging_vty.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/41703/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 1c030b5..77b09d8 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -815,13 +815,13 @@ "log gsmtap [HOSTNAME] [(nonblocking-io|blocking-io|wq)]", LOG_STR "Logging via GSMTAP\n" "Host name to send the GSMTAP logging to (UDP port 4729)\n" - "Use non-blocking, synchronous I/O (may lose msgs if UDP sndbuf becomes full)\n" - "Use blocking, synchronous I/O (only for debug purposes or when blocking is acceptable) (default)\n" + "Use non-blocking, synchronous I/O (may lose msgs if UDP sndbuf becomes full) (default)\n" + "Use blocking, synchronous I/O (only for debug purposes or when blocking is acceptable)\n" "Use Tx workqueue, asynchronous I/O (may lose msgs if queue becomes full)\n") { const char *hostname = argc > 0 ? argv[0] : "127.0.0.1"; bool ofd_wq_mode = argc > 1 && (strcmp(argv[1], "wq") == 0); - bool nonblocking_io = argc > 1 && (strcmp(argv[1], "nonblocking-io") == 0); + bool blocking_io = argc > 1 && (strcmp(argv[1], "blocking-io") == 0); struct log_target *tgt; log_tgt_mutex_lock(); @@ -835,7 +835,7 @@ hostname, VTY_NEWLINE); RET_WITH_UNLOCK(CMD_WARNING); } - if (!ofd_wq_mode && nonblocking_io) { + if (!ofd_wq_mode && !blocking_io) { int rc = gsmtap_source_set_nonblock(tgt->tgt_gsmtap.gsmtap_inst, 1); if (rc != 0) vty_out(vty, "%% Unable to configre GSMTAP log for %s as nonblocking-io%s", @@ -850,7 +850,7 @@ } if (!ofd_wq_mode) { int fd = gsmtap_inst_fd2(tgt->tgt_gsmtap.gsmtap_inst); - if (fd > 0 && osmo_sock_get_nonblock(fd) != nonblocking_io) { + if (fd > 0 && !osmo_sock_get_nonblock(fd) != blocking_io) { vty_out(vty, "%% Remove and re-add the log gsmtap target in order to " "change between blocking and non-blocking IO%s", VTY_NEWLINE); RET_WITH_UNLOCK(CMD_WARNING); @@ -1071,8 +1071,8 @@ pars = " wq"; } else { int fd = gsmtap_inst_fd2(tgt->tgt_gsmtap.gsmtap_inst); - if (fd > 0 && osmo_sock_get_nonblock(fd)) - pars = " nonblocking-io"; + if (fd > 0 && !osmo_sock_get_nonblock(fd)) + pars = " blocking-io"; else pars = ""; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifca8a821e13ec1327ab2476b0db91078fcff948b Gerrit-Change-Number: 41703 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking...
by pespin 17 Dec '25

17 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41702?usp=email ) Change subject: logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq) ...................................................................... logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq) The current patch adds the possibility to configure it, and leaves the previous behavior as default: blocking-io. Related: OS#6213 Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04 --- M TODO-RELEASE M include/osmocom/core/gsmtap_util.h M include/osmocom/core/socket.h M src/core/gsmtap_util.c M src/core/libosmocore.map M src/core/socket.c M src/vty/logging_vty.c 7 files changed, 87 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/41702/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 1562b38..4859444 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,5 @@ # 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 -core added osmo_sock_set_nonblock() +core added osmo_sock_set_nonblock(), osmo_sock_get_nonblock() +core added gsmtap_source_set_nonblock(), gsmtap_source_using_wq() diff --git a/include/osmocom/core/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h index d24ee95..5cad23b 100644 --- a/include/osmocom/core/gsmtap_util.h +++ b/include/osmocom/core/gsmtap_util.h @@ -1,6 +1,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/select.h> @@ -43,8 +44,11 @@ void gsmtap_source_free(struct gsmtap_inst *gti); +int gsmtap_source_set_nonblock(struct gsmtap_inst *gti, int on); int gsmtap_source_add_sink(struct gsmtap_inst *gti); +bool gsmtap_source_using_wq(const struct gsmtap_inst *gti); + int gsmtap_sendmsg(struct gsmtap_inst *gti, struct msgb *msg); int gsmtap_sendmsg_free(struct gsmtap_inst *gti, struct msgb *msg); diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 088a444..e9979f5 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -219,6 +219,7 @@ int osmo_sock_set_dscp(int fd, uint8_t dscp); int osmo_sock_set_priority(int fd, int prio); +int osmo_sock_get_nonblock(int fd); int osmo_sock_set_nonblock(int fd, int on); int osmo_sock_sctp_get_peer_addr_info(int fd, struct sctp_paddrinfo *pinfo, size_t *pinfo_cnt); diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index f1a2abf..86be341 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -419,6 +419,19 @@ signal_dbm, snr, data, len); } +/*! Set the gsmtap source socket as non-blocking (see sockopt O_NONBLOCK). + * \param[in] gti existing GSMTAP source + * \returns 0 on success; negative on error + * + * This setting is ignored when \ref gti was initialied in ofd_wq_mode=1 mode. + */ +int gsmtap_source_set_nonblock(struct gsmtap_inst *gti, int on) +{ + if (gti->osmo_io_mode) + return 0; + return osmo_sock_set_nonblock(gti->source_fd, on); +} + /*! Add a local sink to an existing GSMTAP source and return fd * \param[in] gti existing GSMTAP source * \returns file descriptor of locally bound receive socket @@ -439,6 +452,15 @@ return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti)); } +/*! Was GSMTAP source configured to use a workqueue (ofd_wq_mode=1)? + * \param[in] gti existing GSMTAP source + * \returns Whether GSMTAP source was configured to use a workqueue (ofd_wq_mode=1) + */ +bool gsmtap_source_using_wq(const struct gsmtap_inst *gti) +{ + return gti->osmo_io_mode; +} + /* Registered in Osmo IO as a no-op to set the write callback. */ static void gsmtap_ops_noop_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) { diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 166eea9..6a46f6c 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -54,6 +54,8 @@ gsmtap_source_init2; gsmtap_source_init_fd; gsmtap_source_init_fd2; +gsmtap_source_set_nonblock; +gsmtap_source_using_wq; gsmtap_type_names; log_add_target; log_category_name; @@ -453,6 +455,7 @@ osmo_sock_multiaddr_get_ip_and_port; osmo_sock_multiaddr_get_name_buf; osmo_sock_sctp_get_peer_addr_info; +osmo_sock_get_nonblock; osmo_sock_set_dscp; osmo_sock_set_nonblock; osmo_sock_set_priority; diff --git a/src/core/socket.c b/src/core/socket.c index 01093bb..bb32185 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -46,6 +46,7 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include <fcntl.h> #include <stdio.h> #include <unistd.h> #include <stdint.h> @@ -2756,6 +2757,17 @@ return ioctl(fd, FIONBIO, (unsigned char *)&on); } +/*! Find out whether the socket is configured as non-blocking or blocking. + * \param[in] fd File descriptor of the socket + * \returns 1 == nonblocking, 0 == blocking, < 0 error */ +int osmo_sock_get_nonblock(int fd) +{ + int flags = fcntl(fd, F_GETFL); + if (flags < 0) + return flags; + return (flags & O_NONBLOCK) ? 1 : 0; +} + #ifdef HAVE_LIBSCTP /*! Fill in array of struct sctp_paddrinfo with each of the remote addresses of an SCTP socket * \param[in] fd file descriptor of SCTP socket diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 678ae68..1c030b5 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -29,7 +29,9 @@ #include <osmocom/core/strrb.h> #include <osmocom/core/loggingrb.h> #include <osmocom/core/gsmtap.h> +#include <osmocom/core/gsmtap_util.h> #include <osmocom/core/application.h> +#include <osmocom/core/socket.h> #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> @@ -810,25 +812,50 @@ } DEFUN(cfg_log_gsmtap, cfg_log_gsmtap_cmd, - "log gsmtap [HOSTNAME]", + "log gsmtap [HOSTNAME] [(nonblocking-io|blocking-io|wq)]", LOG_STR "Logging via GSMTAP\n" - "Host name to send the GSMTAP logging to (UDP port 4729)\n") + "Host name to send the GSMTAP logging to (UDP port 4729)\n" + "Use non-blocking, synchronous I/O (may lose msgs if UDP sndbuf becomes full)\n" + "Use blocking, synchronous I/O (only for debug purposes or when blocking is acceptable) (default)\n" + "Use Tx workqueue, asynchronous I/O (may lose msgs if queue becomes full)\n") { - const char *hostname = argc ? argv[0] : "127.0.0.1"; + const char *hostname = argc > 0 ? argv[0] : "127.0.0.1"; + bool ofd_wq_mode = argc > 1 && (strcmp(argv[1], "wq") == 0); + bool nonblocking_io = argc > 1 && (strcmp(argv[1], "nonblocking-io") == 0); struct log_target *tgt; log_tgt_mutex_lock(); tgt = log_target_find(LOG_TGT_TYPE_GSMTAP, hostname); if (!tgt) { tgt = log_target_create_gsmtap(hostname, GSMTAP_UDP_PORT, - host.app_info->name, false, + host.app_info->name, ofd_wq_mode ? 1 : 0, true); if (!tgt) { vty_out(vty, "%% Unable to create GSMTAP log for %s%s", hostname, VTY_NEWLINE); RET_WITH_UNLOCK(CMD_WARNING); } + if (!ofd_wq_mode && nonblocking_io) { + int rc = gsmtap_source_set_nonblock(tgt->tgt_gsmtap.gsmtap_inst, 1); + if (rc != 0) + vty_out(vty, "%% Unable to configre GSMTAP log for %s as nonblocking-io%s", + hostname, VTY_NEWLINE); + } log_add_target(tgt); + } else { + if (ofd_wq_mode != gsmtap_source_using_wq(tgt->tgt_gsmtap.gsmtap_inst)) { + vty_out(vty, "%% Remove and re-add the log gsmtap target in order to " + "change between synchronous and asynchronous IO%s", VTY_NEWLINE); + RET_WITH_UNLOCK(CMD_WARNING); + } + if (!ofd_wq_mode) { + int fd = gsmtap_inst_fd2(tgt->tgt_gsmtap.gsmtap_inst); + if (fd > 0 && osmo_sock_get_nonblock(fd) != nonblocking_io) { + vty_out(vty, "%% Remove and re-add the log gsmtap target in order to " + "change between blocking and non-blocking IO%s", VTY_NEWLINE); + RET_WITH_UNLOCK(CMD_WARNING); + } + } } vty->index = tgt; @@ -1009,6 +1036,7 @@ { char level_buf[128]; int i; + char *pars; switch (tgt->type) { case LOG_TGT_TYPE_VTY: @@ -1039,8 +1067,17 @@ log_target_rb_avail_size(tgt), VTY_NEWLINE); break; case LOG_TGT_TYPE_GSMTAP: - vty_out(vty, "log gsmtap %s%s", - tgt->tgt_gsmtap.hostname, VTY_NEWLINE); + if (gsmtap_source_using_wq(tgt->tgt_gsmtap.gsmtap_inst)) { + pars = " wq"; + } else { + int fd = gsmtap_inst_fd2(tgt->tgt_gsmtap.gsmtap_inst); + if (fd > 0 && osmo_sock_get_nonblock(fd)) + pars = " nonblocking-io"; + else + pars = ""; + } + vty_out(vty, "log gsmtap %s%s%s", + tgt->tgt_gsmtap.hostname, pars, VTY_NEWLINE); break; case LOG_TGT_TYPE_SYSTEMD: vty_out(vty, "log systemd-journal%s%s", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04 Gerrit-Change-Number: 41702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: gsmtap_util: Fix fds not closed in ofd_wq_mode=0
by daniel 17 Dec '25

17 Dec '25

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41701?usp=email ) Change subject: gsmtap_util: Fix fds not closed in ofd_wq_mode=0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41701?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: I55fd51066d22261cf89fbf9501bec3af743a641d Gerrit-Change-Number: 41701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 Dec 2025 15:58:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: gsmtap_util: Get rid of unused wq
by daniel 17 Dec '25

17 Dec '25

Attention is currently required from: laforge, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41700?usp=email ) Change subject: gsmtap_util: Get rid of unused wq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41700?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: I4f1cf168c230471a6d7be4bb065d7105a993349f Gerrit-Change-Number: 41700 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-Comment-Date: Wed, 17 Dec 2025 15:53:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: gsmtap_util: Fix fds not closed in ofd_wq_mode=0
by pespin 17 Dec '25

17 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41701?usp=email ) Change subject: gsmtap_util: Fix fds not closed in ofd_wq_mode=0 ...................................................................... gsmtap_util: Fix fds not closed in ofd_wq_mode=0 Change-Id: I55fd51066d22261cf89fbf9501bec3af743a641d --- M src/core/gsmtap_util.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/41701/1 diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index d6a9752..f1a2abf 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -514,14 +514,15 @@ if (!gti) return; - if (gti->osmo_io_mode) { + if (gti->osmo_io_mode) osmo_iofd_free(gti->out); + else + close(gti->source_fd); - if (gti->sink_fd != -1) { - close(gti->sink_fd); - gti->sink_fd = -1; - } + if (gti->sink_fd != -1) { + close(gti->sink_fd); + gti->sink_fd = -1; } talloc_free(gti); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I55fd51066d22261cf89fbf9501bec3af743a641d Gerrit-Change-Number: 41701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit: UDPLink: catch and ignore BlockingIOError
by fixeria 17 Dec '25

17 Dec '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41694?usp=email ) Change subject: trx_toolkit: UDPLink: catch and ignore BlockingIOError ...................................................................... trx_toolkit: UDPLink: catch and ignore BlockingIOError We should not crash when failing to send a datagram due to blocking. Print an error, drop the data, and keep going. Change-Id: If2248d4a670f893848c44e0fcbd2089371532207 Related: OS#6904 --- M src/target/trx_toolkit/udp_link.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/udp_link.py b/src/target/trx_toolkit/udp_link.py index 4db7283..f0a8224 100644 --- a/src/target/trx_toolkit/udp_link.py +++ b/src/target/trx_toolkit/udp_link.py @@ -17,6 +17,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +import logging as log import socket class UDPLink: @@ -45,5 +46,10 @@ def sendto(self, data, remote): if type(data) not in [bytearray, bytes]: data = data.encode() - - self.sock.sendto(data, remote) + try: + self.sock.sendto(data, remote) + except BlockingIOError: + # When the message does not fit into the send buffer of the socket, send() + # normally blocks, unless the socket has been placed in nonblocking I/O mode. + # In nonblocking mode it would fail with the BlockingIOError in this case. + log.error('(%s) BlockingIOError: dropping Tx data', self.desc_link()) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If2248d4a670f893848c44e0fcbd2089371532207 Gerrit-Change-Number: 41694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit: UDPLink: reduce code duplication
by fixeria 17 Dec '25

17 Dec '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41693?usp=email ) Change subject: trx_toolkit: UDPLink: reduce code duplication ...................................................................... trx_toolkit: UDPLink: reduce code duplication Change-Id: I84557e2eb2e603f21e6c4d136e022ae269ced62d --- M src/target/trx_toolkit/udp_link.py 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/target/trx_toolkit/udp_link.py b/src/target/trx_toolkit/udp_link.py index c3f1476..4db7283 100644 --- a/src/target/trx_toolkit/udp_link.py +++ b/src/target/trx_toolkit/udp_link.py @@ -40,10 +40,7 @@ % (bind_addr, bind_port, self.remote_addr, self.remote_port) def send(self, data): - if type(data) not in [bytearray, bytes]: - data = data.encode() - - self.sock.sendto(data, (self.remote_addr, self.remote_port)) + self.sendto(data, (self.remote_addr, self.remote_port)) def sendto(self, data, remote): if type(data) not in [bytearray, bytes]: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I84557e2eb2e603f21e6c4d136e022ae269ced62d Gerrit-Change-Number: 41693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit: UDPLink: catch and ignore BlockingIOError
by osmith 17 Dec '25

17 Dec '25

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41694?usp=email ) Change subject: trx_toolkit: UDPLink: catch and ignore BlockingIOError ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If2248d4a670f893848c44e0fcbd2089371532207 Gerrit-Change-Number: 41694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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, 17 Dec 2025 12:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0