- gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: core: guard TCP stats on availability of linux/tcp.h
by pespin 29 Jan '26

29 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email ) Change subject: core: guard TCP stats on availability of linux/tcp.h ...................................................................... core: guard TCP stats on availability of linux/tcp.h Detect availability of linux/tcp.h at configure time and build TCP statistics code conditionally based on that. This replaces platform-specific conditionals with proper feature checks and avoids build failures on systems lacking Linux TCP headers or types (e.g. non-Linux or cross-build environments). When TCP_INFO support is unavailable, the public API remains unchanged, but all related functions return -ENOTSUP. No functional changes on systems where linux/tcp.h are available. Change-Id: Ibcd00f15131b0291f0b10eca51401c518b77cc39 --- M configure.ac M src/core/stats_tcp.c 2 files changed, 35 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index ee779ea..5c10f12 100644 --- a/configure.ac +++ b/configure.ac @@ -628,6 +628,9 @@ CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports], [Runtime SIMD detection will be disabled]) +dnl Check header linux/tcp.h +AC_CHECK_HEADERS([linux/tcp.h]) + dnl There are some members in struct tcp_info that might not exist on all linux versions AC_CHECK_MEMBER([struct tcp_info.tcpi_notsent_bytes], AC_DEFINE([HAVE_TCP_INFO_TCPI_NOTSENT_BYTES], diff --git a/src/core/stats_tcp.c b/src/core/stats_tcp.c index c6459fe..282f306 100644 --- a/src/core/stats_tcp.c +++ b/src/core/stats_tcp.c @@ -24,16 +24,21 @@ #include "config.h" #if !defined(EMBEDDED) +#include <errno.h> + +#include <osmocom/core/select.h> +#include <osmocom/core/stats_tcp.h> + +#ifdef HAVE_LINUX_TCP_H + #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/ip.h> #include <linux/tcp.h> -#include <errno.h> #include <pthread.h> -#include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -41,7 +46,8 @@ #include <osmocom/core/stat_item.h> #include <osmocom/core/stats.h> #include <osmocom/core/socket.h> -#include <osmocom/core/stats_tcp.h> + +#endif /* HAVE_LINUX_TCP_H */ static struct osmo_tcp_stats_config s_tcp_stats_config = { .interval = TCP_STATS_DEFAULT_INTERVAL, @@ -49,6 +55,8 @@ struct osmo_tcp_stats_config *osmo_tcp_stats_config = &s_tcp_stats_config; +#ifdef HAVE_LINUX_TCP_H + static struct osmo_timer_list stats_tcp_poll_timer; static LLIST_HEAD(stats_tcp); @@ -160,7 +168,6 @@ #else osmo_stat_item_set(osmo_stat_item_group_get_item(stats_tcp_entry->stats_tcp, STATS_TCP_REORD_SEEN), -1); #endif - } static bool is_tcp(const struct osmo_fd *fd) @@ -322,6 +329,27 @@ osmo_timer_setup(&stats_tcp_poll_timer, stats_tcp_poll_timer_cb, NULL); } +#else + +/* Stubs for systems that do not have header <linux/tcp.h> and TCP_INFO struct */ + +int osmo_stats_tcp_osmo_fd_register(const struct osmo_fd *fd, const char *name) +{ + return -ENOTSUP; +} + +int osmo_stats_tcp_osmo_fd_unregister(const struct osmo_fd *fd) +{ + return -ENOTSUP; +} + +int osmo_stats_tcp_set_interval(int interval) +{ + return -ENOTSUP; +} + +#endif /* HAVE_LINUX_TCP_H */ + #endif /* !EMBEDDED */ /* @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcd00f15131b0291f0b10eca51401c518b77cc39 Gerrit-Change-Number: 41922 Gerrit-PatchSet: 4 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> 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 libosmocore[master]: core: always build tun.c and gate TUN support by headers
by pespin 29 Jan '26

29 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41939?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: core: always build tun.c and gate TUN support by headers ...................................................................... core: always build tun.c and gate TUN support by headers Always build tun.c and move platform-specific checks into the implementation. Guard the TUN-specific code paths based on the availability of linux/if_tun.h detected at configure time. If TUN support is not available, osmo_tundev_open() returns -ENOTSUP. This keeps the public TUN API available while disabling unsupported functionality in a capability-based way. Change-Id: I6d1ea1644d12ef59a54cf2f73b9155def58b17a9 --- M configure.ac M src/core/tun.c 2 files changed, 10 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 5c10f12..18807f8 100644 --- a/configure.ac +++ b/configure.ac @@ -628,6 +628,9 @@ CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports], [Runtime SIMD detection will be disabled]) +dnl Check header linux/if_tun.h +AC_CHECK_HEADERS([linux/if_tun.h]) + dnl Check header linux/tcp.h AC_CHECK_HEADERS([linux/tcp.h]) diff --git a/src/core/tun.c b/src/core/tun.c index 09a3f81..537caf9 100644 --- a/src/core/tun.c +++ b/src/core/tun.c @@ -84,10 +84,8 @@ #include <sys/time.h> #include <net/if.h> -#if defined(__linux__) +#ifdef HAVE_LINUX_IF_TUN_H #include <linux/if_tun.h> -#else -#error "Unknown platform!" #endif #include <osmocom/core/utils.h> @@ -265,6 +263,7 @@ talloc_free(tundev); } +#ifdef HAVE_LINUX_IF_TUN_H /*! Open and configure fd of the tunnel device. * \param[in] tundev The tundev object whose tunnel interface to open * \param[in] flags internal linux flags to pass when creating the device (not used yet) @@ -337,6 +336,7 @@ close(fd); return rc; } +#endif /* HAVE_LINUX_IF_TUN_H */ /*! Open the tunnel device owned by the tundev object. * \param[in] tundev The tundev object to open @@ -344,6 +344,7 @@ */ int osmo_tundev_open(struct osmo_tundev *tundev) { +#ifdef HAVE_LINUX_IF_TUN_H struct osmo_netns_switch_state switch_state; int rc; int netns_fd = -1; @@ -418,6 +419,9 @@ if (netns_fd >= 0) close(netns_fd); return rc; +#else + return -ENOTSUP; +#endif /* HAVE_LINUX_IF_TUN_H */ } /*! Close the tunnel device owned by the tundev object. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41939?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6d1ea1644d12ef59a54cf2f73b9155def58b17a9 Gerrit-Change-Number: 41939 Gerrit-PatchSet: 3 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: repo-install-test: debian 10: osmo-gbproxy only
by pespin 29 Jan '26

29 Jan '26

Attention is currently required from: daniel, fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email ) Change subject: repo-install-test: debian 10: osmo-gbproxy only ...................................................................... Patch Set 2: (1 comment) File scripts/repo-install-test/run-inside.sh: https://gerrit.osmocom.org/c/osmo-ci/+/41977/comment/526006fa_63978f5a?usp=… : PS2, Line 366: # Get a list of all packages from the repository. Reference: Can't you leave the generic path for debian10 too here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8d8cda8e399719f06aeb1843eb8f5ab12a90e8f Gerrit-Change-Number: 41977 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Jan 2026 10:57:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in libosmocore[master]: logging: Avoid infinite loop logging inside logging path
by osmith 29 Jan '26

29 Jan '26

Attention is currently required from: daniel, fixeria, jolly, laforge, osmith, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41978?usp=email ) Change subject: logging: Avoid infinite loop logging inside logging path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41978?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: If3b8c0ee97537242162558fdd1c99f03b32af811 Gerrit-Change-Number: 41978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-CC: Jenkins Builder Gerrit-Attention: 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: Thu, 29 Jan 2026 10:56:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: repo-install-test: test osmo-pfcp-tool in latest
by pespin 29 Jan '26

29 Jan '26

Attention is currently required from: daniel, fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email ) Change subject: repo-install-test: test osmo-pfcp-tool in latest ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icca5a31270bca03596be8ed0104bfb7143fb1ede Gerrit-Change-Number: 41976 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Jan 2026 10:55:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in libosmocore[master]: Implement log file target using osmo_io
by pespin 29 Jan '26

29 Jan '26

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41925?usp=email ) Change subject: Implement log file target using osmo_io ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41925?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: Ieb6420246454ef59442b1fd7b1d14e2c00fa69a5 Gerrit-Change-Number: 41925 Gerrit-PatchSet: 11 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Jan 2026 10:53:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in libosmocore[master]: logging: Avoid infinite loop logging inside logging path
by pespin 29 Jan '26

29 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41978?usp=email ) Change subject: logging: Avoid infinite loop logging inside logging path ...................................................................... logging: Avoid infinite loop logging inside logging path If eg. gsmtap_log target is requested to log a message but the iofd wqueue is full, it may try to log an error message, which will create an infinite stack loop. Change-Id: If3b8c0ee97537242162558fdd1c99f03b32af811 --- M include/osmocom/core/logging_internal.h M src/core/logging.c 2 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/41978/1 diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 68d4c4b..0cc82a4 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -4,16 +4,25 @@ * @{ * \file logging_internal.h */ +#include <stdbool.h> #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> /* maximum length of the log string of a single log event (typically line) */ #define MAX_LOG_SIZE 4096 +struct log_thread_state { + /* Whether we are inside a code path to generate logging output: */ + bool logging_active; + /* Cache TID: */ + long int tid; +}; + extern void *tall_log_ctx; extern struct log_info *osmo_log_info; extern const struct value_string loglevel_strs[]; extern struct llist_head osmo_log_target_list; +extern __thread struct log_thread_state log_thread_state; void assert_loginfo(const char *src); diff --git a/src/core/logging.c b/src/core/logging.c index af5698a..72c24bb 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -84,7 +84,7 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); -static __thread long int logging_tid; +__thread struct log_thread_state log_thread_state; #if (!EMBEDDED) /*! One global copy that contains the union of log levels for all targets @@ -606,9 +606,9 @@ OSMO_STRBUF_PRINTF(sb, " "); } if (target->print_tid) { - if (logging_tid == 0) - logging_tid = (long int)osmo_gettid(); - OSMO_STRBUF_PRINTF(sb, "%ld ", logging_tid); + if (log_thread_state.tid == 0) + log_thread_state.tid = (long int)osmo_gettid(); + OSMO_STRBUF_PRINTF(sb, "%ld ", log_thread_state.tid); } if (target->print_category) OSMO_STRBUF_PRINTF(sb, "%s%s%s%s ", @@ -743,6 +743,14 @@ { struct log_target *tar; + if (OSMO_UNLIKELY(log_thread_state.logging_active)) { + /* Avoid re-entrant logging: If logging to log target generates + * extra logging (eg. an error log line duet o some wqueue being full), + * we may end up in an infinite loop. */ + return; + } + log_thread_state.logging_active = true; + subsys = map_subsys(subsys); #if !defined(EMBEDDED) @@ -776,6 +784,7 @@ } log_tgt_mutex_unlock(); + log_thread_state.logging_active = false; } /*! logging function used by DEBUGP() macro -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41978?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: If3b8c0ee97537242162558fdd1c99f03b32af811 Gerrit-Change-Number: 41978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: logging_file: Clean log_target_file_reopen()
by osmith 29 Jan '26

29 Jan '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41971?usp=email ) Change subject: logging_file: Clean log_target_file_reopen() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41971?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: Ibcb50320ad80b034115cccc3b7ab90501ac1d091 Gerrit-Change-Number: 41971 Gerrit-PatchSet: 2 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: Thu, 29 Jan 2026 10:51:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: logging_file: Fix log_target_file_switch_to_stream on stderr
by osmith 29 Jan '26

29 Jan '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41975?usp=email ) Change subject: logging_file: Fix log_target_file_switch_to_stream on stderr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41975?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: I1c0d833fb8ae82d1dd54e44cc2fc8be80d5e1b4b Gerrit-Change-Number: 41975 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: Thu, 29 Jan 2026 10:50:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: logging_file: Avoid reopning file for stderr
by osmith 29 Jan '26

29 Jan '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41970?usp=email ) Change subject: logging_file: Avoid reopning file for stderr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41970?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: I4a551b0c434c480e78852a0a4873700eac2f5853 Gerrit-Change-Number: 41970 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: Thu, 29 Jan 2026 10:49:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log