January 2026 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: Add Emscripten build support and JS callback logging backend
by Timur Davydov 10 Jan '26

10 Jan '26

Attention is currently required from: Timur Davydov. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41813?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: Add Emscripten build support and JS callback logging backend ...................................................................... Add Emscripten build support and JS callback logging backend Change-Id: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 --- M configure.ac M include/osmocom/core/logging.h M src/core/Makefile.am A src/core/logging_web.c M src/core/netdev.c M src/core/osmo_io_internal.h M src/core/serial.c M src/core/socket.c M src/core/stats_tcp.c M src/core/tun.c M src/vty/Makefile.am A src/vty/telnet_interface_dummy.c 12 files changed, 229 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/41813/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41813?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: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 Gerrit-Change-Number: 41813 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[M] Change in libosmocore[master]: Add Emscripten build support and JS callback logging backend
by Jenkins Builder 10 Jan '26

10 Jan '26

Jenkins Builder has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41813?usp=email ) Change subject: Add Emscripten build support and JS callback logging backend ...................................................................... Patch Set 1: (3 comments) File include/osmocom/core/logging.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/libosmocore/+/41813/comment/6e974260_e4f9e270?… : PS1, Line 447: struct log_target *log_target_create_web(); Bad function definition - struct log_target *log_target_create_web() should probably be struct log_target *log_target_create_web(void) File src/core/logging_web.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/libosmocore/+/41813/comment/00e26cdf_df101bd5?… : PS1, Line 84: struct log_target *log_target_create_web() Bad function definition - struct log_target *log_target_create_web() should probably be struct log_target *log_target_create_web(void) File src/vty/telnet_interface_dummy.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/libosmocore/+/41813/comment/6a94b245_618be454?… : PS1, Line 74: } void function return statements are not generally useful -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41813?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: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 Gerrit-Change-Number: 41813 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 10 Jan 2026 21:14:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in libosmocore[master]: Add Emscripten build support and JS callback logging backend
by Timur Davydov 10 Jan '26

10 Jan '26

Timur Davydov has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41813?usp=email ) Change subject: Add Emscripten build support and JS callback logging backend ...................................................................... Add Emscripten build support and JS callback logging backend Change-Id: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 --- M configure.ac M include/osmocom/core/logging.h M src/core/Makefile.am A src/core/logging_web.c M src/core/netdev.c M src/core/osmo_io_internal.h M src/core/serial.c M src/core/socket.c M src/core/stats_tcp.c M src/core/tun.c M src/vty/Makefile.am A src/vty/telnet_interface_dummy.c 12 files changed, 230 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/41813/1 diff --git a/configure.ac b/configure.ac index 6a5f0c0..b678237 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,18 @@ AC_PROG_INSTALL LT_INIT([pic-only disable-static]) +dnl Detect emscripten compiler +case "$CC" in +*emcc*) + emscripten=yes + ;; +*) + emscripten=no + ;; +esac +AM_CONDITIONAL(HAVE_EMSCRIPTEN, test "x$emscripten" = "xyes") +AC_SUBST([HAVE_EMSCRIPTEN], [$emscripten]) + AC_CONFIG_MACRO_DIR([m4]) dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 44263fb..5aa7f9b 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -282,6 +282,7 @@ LOG_TGT_TYPE_STRRB, /*!< osmo_strrb-backed logging */ LOG_TGT_TYPE_GSMTAP, /*!< GSMTAP network logging */ LOG_TGT_TYPE_SYSTEMD, /*!< systemd journal logging */ + LOG_TGT_TYPE_WEB, /*!< Web logging */ }; /*! Whether/how to log the source filename (and line number). */ @@ -443,6 +444,7 @@ bool ofd_wq_mode, bool add_sink); struct log_target *log_target_create_systemd(bool raw); +struct log_target *log_target_create_web(); void log_target_systemd_set_raw(struct log_target *target, bool raw); int log_target_file_reopen(struct log_target *tgt); int log_target_file_switch_to_stream(struct log_target *tgt); diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 0b756da..338e6fa 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -46,6 +46,7 @@ logging.c \ logging_syslog.c \ logging_gsmtap.c \ + logging_web.c \ loggingrb.c \ macaddr.c \ msgb.c \ diff --git a/src/core/logging_web.c b/src/core/logging_web.c new file mode 100644 index 0000000..859cbe8 --- /dev/null +++ b/src/core/logging_web.c @@ -0,0 +1,98 @@ +/*! \file logging_web.c + * Logging support code using a JS callback. This module sends log + * messages to a JavaScript callback named `on_log`. + * */ +/* + * (C) 2026 by Timur Davydov <dtv.comp(a)gmail.com> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +/*! \addtogroup logging + * @{ + * \file logging_web.c */ + +#include "config.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdbool.h> +#include <unistd.h> + +#ifdef HAVE_STRINGS_H +#include <strings.h> +#endif + +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/byteswap.h> + +#if defined(__EMSCRIPTEN__) + +#include <emscripten.h> + +EM_JS(void, on_log_wrapper, (const char *subsys, int level, const char *msg), { + return on_log(subsys, level, msg); +}); +#else +void on_log_wrapper(const char *subsys, int level, const char *msg) +{ +} +#endif + +static void _web_raw_output(struct log_target *target, int subsys, + unsigned int level, const char *file, + int line, int cont, const char *format, + va_list ap) +{ + const int msgLen = 4096; + char msg[msgLen + 1]; + const char *subsys_name = log_category_name(subsys); + char subsys_buf[16]; + int rc; + + if (subsys_name) + OSMO_STRLCPY_ARRAY(subsys_buf, subsys_name + 1); + else + subsys_buf[0] = '\0'; + + rc = vsnprintf(msg, msgLen, format, ap); + if (rc > 0) { + if (msg[rc - 1] == '\n') msg[rc - 1] = '\0'; + on_log_wrapper(subsys_buf, level, msg); + } +} + +/*! Create a new logging target for JS callback logging (uses `on_log`) + * \returns Log target in case of success, NULL in case of error + */ +struct log_target *log_target_create_web() +{ + struct log_target *target; + + target = log_target_create(); + if (!target) + return NULL; + + target->type = LOG_TGT_TYPE_WEB; + target->raw_output = _web_raw_output; + + return target; +} + +/* @} */ diff --git a/src/core/netdev.c b/src/core/netdev.c index 1e886f9..4abc30a 100644 --- a/src/core/netdev.c +++ b/src/core/netdev.c @@ -64,7 +64,7 @@ * osmo_netdev_free(netdev); */ -#if (!EMBEDDED) +#if (!EMBEDDED) && !defined(__EMSCRIPTEN__) #include <stdio.h> #include <stdlib.h> @@ -1018,6 +1018,6 @@ return rc; } -#endif /* (!EMBEDDED) */ +#endif /* (!EMBEDDED) && !defined(__EMSCRIPTEN__) */ /*! @} */ diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index f425da2..03ec70a 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -4,7 +4,9 @@ #include <unistd.h> #include <stdbool.h> +#ifdef HAVE_LIBSCTP #include <netinet/sctp.h> +#endif #include <osmocom/core/osmo_io.h> #include <osmocom/core/linuxlist.h> diff --git a/src/core/serial.c b/src/core/serial.c index 117c049..5ed1b34 100644 --- a/src/core/serial.c +++ b/src/core/serial.c @@ -24,6 +24,8 @@ * * \file serial.c */ +#if !defined(__EMSCRIPTEN__) + #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -277,3 +279,5 @@ } /*! @} */ + +#endif /* if !defined(__EMSCRIPTEN__) */ diff --git a/src/core/socket.c b/src/core/socket.c index bb32185..1379bb6 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1695,7 +1695,7 @@ static unsigned int in6_addr_netmask_to_prefixlen(const struct in6_addr *netmask) { - #if defined(__linux__) + #if defined(__linux__) || defined(__EMSCRIPTEN__) #define ADDRFIELD(i) s6_addr32[i] #else #define ADDRFIELD(i) __u6_addr.__u6_addr32[i] @@ -1895,7 +1895,6 @@ return 0; } -#ifdef HAVE_LIBSCTP /*! Get multiple IP addresses and/or port number on socket in separate string buffers * \param[in] fd file descriptor of socket. * \param[out] ip_proto IPPROTO of the socket, eg: IPPROTO_SCTP. @@ -1943,6 +1942,7 @@ return osmo_sock_get_ip_and_port(fd, ip, ip_len, port, port_len, local); } +#ifdef HAVE_LIBSCTP rc = local ? sctp_getladdrs(fd, 0, &addrs) : sctp_getpaddrs(fd, 0, &addrs); if (rc < 0) return rc; @@ -1983,8 +1983,10 @@ free_addrs_ret: local ? sctp_freeladdrs(addrs) : sctp_freepaddrs(addrs); return rc; -} +#else + return -ENOTSUP; #endif +} /*! Get local IP address on socket * \param[in] fd file descriptor of socket @@ -2047,7 +2049,6 @@ return talloc_asprintf(ctx, "(%s)", str); } -#ifdef HAVE_LIBSCTP /*! Format multiple IP addresses and/or port number into a combined string buffer * \param[out] str Destination string buffer. * \param[in] str_len sizeof(str), usually OSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN. @@ -2153,7 +2154,6 @@ return sb.chars_needed; } -#endif /*! Get address/port information on socket in provided string buffer, like "r=1.2.3.4:5<->l=6.7.8.9:10". * This does not include braces like osmo_sock_get_name(). diff --git a/src/core/stats_tcp.c b/src/core/stats_tcp.c index c6459fe..8341979 100644 --- a/src/core/stats_tcp.c +++ b/src/core/stats_tcp.c @@ -24,6 +24,7 @@ #include "config.h" #if !defined(EMBEDDED) +#if !defined(__EMSCRIPTEN__) #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> @@ -186,6 +187,7 @@ return false; } +#endif /* !defined(__EMSCRIPTEN__) */ /*! Register an osmo_fd for TCP stats monitoring. * \param[in] fd osmocom file descriptor to be registered. @@ -193,6 +195,7 @@ * \returns 0 on success; negative in case of error. */ int osmo_stats_tcp_osmo_fd_register(const struct osmo_fd *fd, const char *name) { +#if !defined(__EMSCRIPTEN__) struct stats_tcp_entry *stats_tcp_entry; /* Only TCP sockets can be registered for monitoring, anything else will fall through. */ @@ -212,10 +215,12 @@ pthread_mutex_lock(&stats_tcp_lock); llist_add_tail(&stats_tcp_entry->entry, &stats_tcp); pthread_mutex_unlock(&stats_tcp_lock); +#endif /* !defined(__EMSCRIPTEN__) */ return 0; } +#if !defined(__EMSCRIPTEN__) static void next_stats_tcp_entry(void) { struct stats_tcp_entry *last; @@ -235,12 +240,14 @@ (struct stats_tcp_entry *)llist_entry(stats_tcp_entry_cur->entry.next, struct stats_tcp_entry, entry); } +#endif /* !defined(__EMSCRIPTEN__) */ /*! Register an osmo_fd for TCP stats monitoring. * \param[in] fd osmocom file descriptor to be unregistered. * \returns 0 on success; negative in case of error. */ int osmo_stats_tcp_osmo_fd_unregister(const struct osmo_fd *fd) { +#if !defined(__EMSCRIPTEN__) struct stats_tcp_entry *stats_tcp_entry; int rc = -EINVAL; @@ -269,8 +276,12 @@ pthread_mutex_unlock(&stats_tcp_lock); return rc; +#else + return 0; +#endif /* !defined(__EMSCRIPTEN__) */ } +#if !defined(__EMSCRIPTEN__) static void stats_tcp_poll_timer_cb(void *data) { int i; @@ -298,18 +309,22 @@ if (osmo_tcp_stats_config->interval > 0) osmo_timer_schedule(&stats_tcp_poll_timer, osmo_tcp_stats_config->interval, 0); } +#endif /* !defined(__EMSCRIPTEN__) */ /*! Set the polling interval (common for all sockets) * \param[in] interval Poll interval in seconds * \returns 0 on success; negative on error */ int osmo_stats_tcp_set_interval(int interval) { +#if !defined(__EMSCRIPTEN__) osmo_tcp_stats_config->interval = interval; if (osmo_tcp_stats_config->interval > 0) osmo_timer_schedule(&stats_tcp_poll_timer, osmo_tcp_stats_config->interval, 0); +#endif /* !defined(__EMSCRIPTEN__) */ return 0; } +#if !defined(__EMSCRIPTEN__) static __attribute__((constructor)) void on_dso_load_stats_tcp(void) { @@ -321,7 +336,8 @@ osmo_timer_setup(&stats_tcp_poll_timer, stats_tcp_poll_timer_cb, NULL); } +#endif /* !defined(__EMSCRIPTEN__) */ -#endif /* !EMBEDDED */ +#endif /* !defined(EMBEDDED) */ /* @} */ diff --git a/src/core/tun.c b/src/core/tun.c index 09a3f81..97475ad 100644 --- a/src/core/tun.c +++ b/src/core/tun.c @@ -67,7 +67,7 @@ * osmo_tundev_free(tundev); */ -#if (!EMBEDDED) +#if (!EMBEDDED) && !defined(__EMSCRIPTEN__) #include <stdio.h> #include <stdlib.h> @@ -584,6 +584,6 @@ } -#endif /* (!EMBEDDED) */ +#endif /* (!EMBEDDED) && !defined(__EMSCRIPTEN__) */ /*! @} */ diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index ecdd050..25735da 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -27,12 +27,17 @@ stats_vty.c \ talloc_ctx_vty.c \ tdef_vty.c \ - telnet_interface.c \ utils.c \ vector.c \ vty.c \ $(NULL) +if HAVE_EMSCRIPTEN +libosmovty_la_SOURCES += telnet_interface_dummy.c +else +libosmovty_la_SOURCES += telnet_interface.c +endif + libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmovty_la_LIBADD = \ $(top_builddir)/src/core/libosmocore.la \ diff --git a/src/vty/telnet_interface_dummy.c b/src/vty/telnet_interface_dummy.c new file mode 100644 index 0000000..714cc30 --- /dev/null +++ b/src/vty/telnet_interface_dummy.c @@ -0,0 +1,79 @@ +/* (C) 2026 by Timur Davydov <dtv.comp(a)gmail.com> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <sys/socket.h> +#include <netinet/in.h> +#include <errno.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/signal.h> + +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/buffer.h> +#include <osmocom/vty/command.h> + +/*! \file telnet_interface_dummy.c + * Telnet interface towards Osmocom VTY + * + * This module contains the dummy code implementing a telnet server for VTY + * access. + */ + +int telnet_init(void *tall_ctx, void *priv, int port) +{ + return 0; +} + +int telnet_init_dynif(void *tall_ctx, void *priv, const char *ip, int port) +{ + return 0; +} + +int telnet_init_default(void *tall_ctx, void *priv, int default_port) +{ + return 0; +} + + +/*! close a telnet connection */ +int telnet_close_client(struct osmo_fd *fd) +{ + return 0; +} + +bool vty_is_active(struct vty *vty) +{ + return false; +} + +/*! callback from core VTY code about VTY related events */ +void vty_event(enum event event, int sock, struct vty *vty) +{ + return; +} + +/*! Close all telnet connections and release the telnet socket */ +void telnet_exit(void) +{ +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41813?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: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 Gerrit-Change-Number: 41813 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[S] Change in pysim[master]: Print SMSC in read mode
by phcoder 09 Jan '26

09 Jan '26

Attention is currently required from: laforge, phcoder. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41786?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Print SMSC in read mode ...................................................................... Print SMSC in read mode Change-Id: I17067b68086316d51fd71ba77049874605594e3f --- M pySim-read.py M pySim/legacy/utils.py M tests/pySim-prog_test/Fairwaves-SIM.ok M tests/pySim-prog_test/Wavemobile-SIM.ok M tests/pySim-prog_test/fakemagicsim.ok M tests/pySim-prog_test/sysmoISIM-SJA2.ok M tests/pySim-prog_test/sysmoISIM-SJA5.ok M tests/pySim-prog_test/sysmoUSIM-SJS1.ok M tests/pySim-prog_test/sysmosim-gr1.ok 9 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/41786/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I17067b68086316d51fd71ba77049874605594e3f Gerrit-Change-Number: 41786 Gerrit-PatchSet: 4 Gerrit-Owner: phcoder <phcoder(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: phcoder <phcoder(a)gmail.com> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: Print SMSC in read mode
by phcoder 09 Jan '26

09 Jan '26

Attention is currently required from: laforge, phcoder. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41786?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by laforge, Verified-1 by Jenkins Builder Change subject: Print SMSC in read mode ...................................................................... Print SMSC in read mode Change-Id: I17067b68086316d51fd71ba77049874605594e3f --- M pySim-read.py M pySim/legacy/utils.py M tests/pySim-prog_test/Fairwaves-SIM.ok M tests/pySim-prog_test/Wavemobile-SIM.ok M tests/pySim-prog_test/fakemagicsim.ok M tests/pySim-prog_test/sysmoISIM-SJA2.ok M tests/pySim-prog_test/sysmoISIM-SJA5.ok M tests/pySim-prog_test/sysmoUSIM-SJS1.ok M tests/pySim-prog_test/sysmosim-gr1.ok 9 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/41786/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I17067b68086316d51fd71ba77049874605594e3f Gerrit-Change-Number: 41786 Gerrit-PatchSet: 3 Gerrit-Owner: phcoder <phcoder(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: phcoder <phcoder(a)gmail.com> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-bts[master]: ta_control: Fix skip_block_num not reset when switching TS to PDCH
by pespin 09 Jan '26

09 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email ) Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH ...................................................................... ta_control: Fix skip_block_num not reset when switching TS to PDCH Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d --- M include/osmo-bts/ta_control.h M src/common/rsl.c M src/common/ta_control.c 3 files changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/ta_control.h b/include/osmo-bts/ta_control.h index bf99331..e003245 100644 --- a/include/osmo-bts/ta_control.h +++ b/include/osmo-bts/ta_control.h @@ -2,4 +2,6 @@ #include <osmo-bts/gsm_data.h> +void lchan_ms_ta_ctrl_reset(struct gsm_lchan *lchan); + void lchan_ms_ta_ctrl(struct gsm_lchan *lchan, uint8_t ms_tx_ta, int16_t toa256); diff --git a/src/common/rsl.c b/src/common/rsl.c index f16fe7c..ba403bc 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -58,6 +58,7 @@ #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/notification.h> #include <osmo-bts/asci.h> +#include <osmo-bts/ta_control.h> //#define FAKE_CIPH_MODE_COMPL @@ -1765,7 +1766,7 @@ memset(&lchan->ho, 0, sizeof(lchan->ho)); memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl)); memset(&lchan->bs_power_ctrl, 0, sizeof(lchan->bs_power_ctrl)); - lchan->ta_ctrl.current = 0; + lchan_ms_ta_ctrl_reset(lchan); copy_sacch_si_to_lchan(lchan); memset(&lchan->tch, 0, sizeof(lchan->tch)); } diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 64c44be..b5d9cb2 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -42,6 +42,12 @@ #define TA_MAX_INC_STEP 2 #define TA_MAX_DEC_STEP 2 +void lchan_ms_ta_ctrl_reset(struct gsm_lchan *lchan) +{ + /* Trigger loop on first TA input: */ + lchan->ta_ctrl.skip_block_num = 0; + lchan->ta_ctrl.current = 0; +} /* Shall we skip current block based on configured interval? */ static bool ctrl_interval_skip_block(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d Gerrit-Change-Number: 41790 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: ta_control: Move variable declaration to the top of the function
by pespin 09 Jan '26

09 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41788?usp=email ) Change subject: ta_control: Move variable declaration to the top of the function ...................................................................... ta_control: Move variable declaration to the top of the function Change-Id: Ia5ada61d74f5b17c4d1479123462104650a6ed0f --- M src/common/ta_control.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/src/common/ta_control.c b/src/common/ta_control.c index c3e4d67..10b04a9 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -65,13 +65,13 @@ */ void lchan_ms_ta_ctrl(struct gsm_lchan *lchan, uint8_t ms_tx_ta, int16_t toa256) { - int16_t new_ta; + int16_t new_ta, delta_ta; /* Shall we skip current block based on configured interval? */ if (ctrl_interval_skip_block(lchan)) return; - int16_t delta_ta = toa256/256; + delta_ta = toa256/256; if (toa256 >= 0) { if ((toa256 - (256 * delta_ta)) > TOA256_THRESH) delta_ta++; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia5ada61d74f5b17c4d1479123462104650a6ed0f Gerrit-Change-Number: 41788 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: ta_control: Move skip_block logic to helper function
by pespin 09 Jan '26

09 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41787?usp=email ) Change subject: ta_control: Move skip_block logic to helper function ...................................................................... ta_control: Move skip_block logic to helper function This makes it more similar to code in power_control.c. Change-Id: I174f2f941fbedbe0793cc0b93d01e53e23328cf2 --- M src/common/ta_control.c 1 file changed, 21 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 6fe409a..c3e4d67 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -22,6 +22,9 @@ /* Related specs: 3GPP TS 45.010 sections 5.5, 5.6 */ +#include <stdint.h> +#include <stdbool.h> + #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_trx.h> #include <osmo-bts/logging.h> @@ -39,6 +42,22 @@ #define TA_MAX_DEC_STEP 2 +/* Shall we skip current block based on configured interval? */ +static bool ctrl_interval_skip_block(struct gsm_lchan *lchan) +{ + /* TA control interval: how many blocks do we skip? */ + if (lchan->ta_ctrl.skip_block_num-- > 0) + return true; + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1; + return false; +} + /*! compute the new "Ordered Timing Advance" communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in which to store) new power value. * \param[in] ms_tx_ta The TA used by the MS and reported in L1SACCH, see struct gsm_sacch_l1_hdr field "ta". @@ -47,19 +66,11 @@ void lchan_ms_ta_ctrl(struct gsm_lchan *lchan, uint8_t ms_tx_ta, int16_t toa256) { int16_t new_ta; + /* Shall we skip current block based on configured interval? */ - - /* TA control interval: how many blocks do we skip? */ - if (lchan->ta_ctrl.skip_block_num-- > 0) + if (ctrl_interval_skip_block(lchan)) return; - /* Reset the number of SACCH blocks to be skipped: - * ctrl_interval=0 => 0 blocks to skip, - * ctrl_interval=1 => 1 blocks to skip, - * ctrl_interval=2 => 3 blocks to skip, - * so basically ctrl_interval * 2 - 1. */ - lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1; - int16_t delta_ta = toa256/256; if (toa256 >= 0) { if ((toa256 - (256 * delta_ta)) > TOA256_THRESH) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I174f2f941fbedbe0793cc0b93d01e53e23328cf2 Gerrit-Change-Number: 41787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: ta_control: Add missing include for lchan.h
by pespin 09 Jan '26

09 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41789?usp=email ) Change subject: ta_control: Add missing include for lchan.h ...................................................................... ta_control: Add missing include for lchan.h Change-Id: Iea1f7ed303ebd0c12a48bb3edf73a494b8736a39 --- M src/common/ta_control.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 10b04a9..64c44be 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -27,6 +27,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_trx.h> +#include <osmo-bts/lchan.h> #include <osmo-bts/logging.h> /* 3GPP TS 45.010 sec 5.6.3 Delay assessment error: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iea1f7ed303ebd0c12a48bb3edf73a494b8736a39 Gerrit-Change-Number: 41789 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: ta_control: Fix skip_block_num not reset when switching TS to PDCH
by pespin 09 Jan '26

09 Jan '26

Attention is currently required from: dexter, jolly, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email ) Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File include/osmo-bts/ta_control.h: https://gerrit.osmocom.org/c/osmo-bts/+/41790/comment/1a62dacf_03d38021?usp… : PS2, Line 6: > maybe remove the line break? That's fine I say, it's not like there's tons of lines to compress 😊 File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/41790/comment/1f6315b1_dba9cc09?usp… : PS2, Line 47: /* Trigger loop on first TA input: */ > Maybe put this comment above the function? (I guess both assignments are required for the trigger) No, only the one exactly below. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d Gerrit-Change-Number: 41790 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Jan 2026 20:03:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026