- gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[osmith/1.6.1]: Use %zu for size_t
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40924?usp=email ) Change subject: Use %zu for size_t ...................................................................... Use %zu for size_t Fix that this doesn't build for debian 13 armv7l with errors like: osmo-amr-inspect.c:138:53: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'size_t' {aka 'unsigned int'} [-Werror=format=] 138 | printf(" Payload has no padding (%lu bits with offset 10)\n", ft_bits); | ~~^ ~~~~~~~ | | | | long unsigned int size_t {aka unsigned int} Related: OS#6828 Change-Id: I81f6d26623544c259199099beb54d14f5788a9e4 (cherry picked from commit c49977d48bc9f18d4124caae3e65f860ebc28136) --- M tests/stream/stream_test.c M utils/osmo-amr-inspect.c 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/40924/1 diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index f23bb5b..cc3f0c2 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -745,7 +745,7 @@ fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - LOGSRV(conn, "Received message from stream (total len including stripped headers = %lu)\n", + LOGSRV(conn, "Received message from stream (total len including stripped headers = %zu)\n", osmo_ntohs(h->len) + sizeof(*h)); if (5 < ipa_msg_type) { fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipa_msg_type); diff --git a/utils/osmo-amr-inspect.c b/utils/osmo-amr-inspect.c index dbf612d..b550f50 100644 --- a/utils/osmo-amr-inspect.c +++ b/utils/osmo-amr-inspect.c @@ -73,7 +73,7 @@ printf(" F: %u\n", hdr->f); printf(" FT: %u (%s)\n", hdr->ft, osmo_amr_type_name(hdr->ft)); printf(" Q: %u\n", hdr->q); - printf(" Payload (%lu bytes): %s\n", + printf(" Payload (%zu bytes): %s\n", buf_len - sizeof(*hdr), osmo_hexdump_nospc(payload, payload_len)); if (hdr->f) @@ -88,11 +88,11 @@ println_orange(" WARN: PAD2=0x%x not zero!", hdr->pad2); ft_bytes = osmo_amr_bytes(hdr->ft); if (payload_len != ft_bytes) { - println_red(" ERROR: Wrong payload byte-length %lu != exp %lu!", payload_len, ft_bytes); + println_red(" ERROR: Wrong payload byte-length %zu != exp %zu!", payload_len, ft_bytes); } else { ft_bits = osmo_amr_bits(hdr->ft); if (ft_bits/8 == ft_bytes) { - printf(" Payload has no padding (%lu bits)\n", ft_bits); + printf(" Payload has no padding (%zu bits)\n", ft_bits); } else { uint8_t last_byte = payload[payload_len - 1]; uint8_t padding = last_byte & (0xff >> (ft_bits & 3)); @@ -117,7 +117,7 @@ printf(" FT: %u (%s)\n", ft, osmo_amr_type_name(ft)); printf(" Q: %u\n", hdr->q); printf(" Payload first 6 bits: 0x%02x\n", hdr->data_start); - printf(" Payload continuation (%lu bytes): %s\n", buf_len - sizeof(*hdr), + printf(" Payload continuation (%zu bytes): %s\n", buf_len - sizeof(*hdr), osmo_hexdump_nospc(buf + sizeof(*hdr), buf_len - sizeof(*hdr))); if (hdr->f) @@ -130,12 +130,12 @@ } ft_bits = osmo_amr_bits(ft); if (ft_bits != payload_len_bits) { - println_red(" ERROR: Wrong payload bits-length %lu != exp %lu! (FT=%u)\n", payload_len_bits, ft_bits, ft); + println_red(" ERROR: Wrong payload bits-length %zu != exp %zu! (FT=%u)\n", payload_len_bits, ft_bits, ft); return; } if (!((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03)) { - printf(" Payload has no padding (%lu bits with offset 10)\n", ft_bits); + printf(" Payload has no padding (%zu bits with offset 10)\n", ft_bits); } else { uint8_t last_byte = buf[buf_len - 1]; uint8_t padding = last_byte & (0xff >> ((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03)); @@ -156,7 +156,7 @@ static void inspect_amr(unsigned int i, const uint8_t *buf, size_t buf_len) { bool is_oa; - printf("[%u] Buffer (%lu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len)); + printf("[%u] Buffer (%zu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len)); is_oa = osmo_amr_is_oa(buf, buf_len); switch (force_fmt) { case FORCE_AMR_INPUT_FMT_AUTO: @@ -253,7 +253,7 @@ hex_buf[hex_buflen] = '\0'; if (hex_buflen == sizeof(hex_buf) - 1) { - fprintf(stderr, "Failed parsing (input too long > %lu): %s\n", hex_buflen, hex_buf); + fprintf(stderr, "Failed parsing (input too long > %zu): %s\n", hex_buflen, hex_buf); return -ENOMEM; } @@ -263,7 +263,7 @@ return -1; } if (rc < 2) { - fprintf(stderr, "Too short to be an AMR buffer (%ld bytes): %s\n", rc, hex_buf); + fprintf(stderr, "Too short to be an AMR buffer (%zu bytes): %s\n", rc, hex_buf); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40924?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: osmith/1.6.1 Gerrit-Change-Id: I81f6d26623544c259199099beb54d14f5788a9e4 Gerrit-Change-Number: 40924 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in libosmo-netif[osmith/1.6.1]: Fix time_t prints for debian 13 armv7l
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40923?usp=email ) Change subject: Fix time_t prints for debian 13 armv7l ...................................................................... Fix time_t prints for debian 13 armv7l In Debian 13 armv7l, time_t and suseconds_t are "long long int" instead of "long unsigned int" as seen on x86_64 and aarch64. Fix it by casting to "long unsigned int". Related: OS#6828 Change-Id: I0b29930a8797fbf0c9d8bfde40bcef9702629834 (cherry picked from commit 7dd8ca5e4b4b82498af6981af4a0fcad8980df30) --- M examples/ipa-stream-client.c M src/jibuf.c M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_tool.c M tests/osmo-pcap-test/pcap.c M tests/osmux/osmux_input_test.c M tests/osmux/osmux_output_test.c M tests/osmux/osmux_test.c M tests/stream/stream_test.c 9 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/40923/1 diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index 2604266..cd2e936 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -131,8 +131,8 @@ gettimeofday(&tv, NULL); timersub(&tv, &found->tv, &diff); - LOGP(DLINP, LOGL_NOTICE, "message %d replied " - "in %lu.%.6lu\n", num, diff.tv_sec, diff.tv_usec); + LOGP(DLINP, LOGL_NOTICE, "message %d replied in %lu.%.6lu\n", num, + (unsigned int long) diff.tv_sec, (unsigned int long) diff.tv_usec); talloc_free(found); } else { LOGP(DLINP, LOGL_ERROR, diff --git a/src/jibuf.c b/src/jibuf.c index a351248..4f93cda 100644 --- a/src/jibuf.c +++ b/src/jibuf.c @@ -388,8 +388,9 @@ LOGP(DLJIBUF, LOGL_DEBUG, "enqueuing packet seq=%"PRIu16" rel=%d delay=%d" \ " skew=%d thres=%d {%lu.%06lu -> %lu.%06lu} %s\n", msg_get_sequence(msg), rel_delay, delay, jb->skew_us, jb->threshold_delay, - jb->last_enqueue_time.tv_sec, jb->last_enqueue_time.tv_usec, - sched_ts.tv_sec, sched_ts.tv_usec, msg_get_marker(msg)? "M" : ""); + (unsigned int long) jb->last_enqueue_time.tv_sec, (unsigned int long) jb->last_enqueue_time.tv_usec, + (unsigned int long) sched_ts.tv_sec, (unsigned int long) sched_ts.tv_usec, + msg_get_marker(msg) ? "M" : ""); /* Add scheduled dequeue time in msg->cb so we can check it later */ unsigned long *old_cb = talloc_memdup(jb->talloc_ctx, msg->cb, sizeof(msg->cb)); diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index 7643797..9a19d9a 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -106,7 +106,8 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &ts); osmo_gettimeofday(&tv, NULL); printf("sys={%lu.%06lu}, mono={%lu.%06lu}: %s\n", - tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, str); + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, + (unsigned int long) ts.tv_sec, ts.tv_nsec/1000, str); } static void clock_override_enable(bool enable) diff --git a/tests/jibuf/jibuf_tool.c b/tests/jibuf/jibuf_tool.c index 0502a98..875f0d5 100644 --- a/tests/jibuf/jibuf_tool.c +++ b/tests/jibuf/jibuf_tool.c @@ -168,7 +168,7 @@ LOGP(DLJIBUF, LOGL_DEBUG, "%s: seq=%"PRIu16" ts=%"PRIu32" (%ld.%06ld) tx_delay=%"PRIu32 \ " end_delay=%"PRIu32" pre_trans=%d pre_jitter=%f post_trans=%d post_jitter=%f skew=%"PRId32"\n", info, ntohs(rtph->sequence), ntohl(rtph->timestamp), - pinfo->tx_time.tv_sec, pinfo->tx_time.tv_usec, + (unsigned int long) pinfo->tx_time.tv_sec, (unsigned int long) pinfo->tx_time.tv_usec, pinfo->tx_delay, total_delay_ms, pinfo->prequeue.transit, pinfo->prequeue.jitter, pinfo->postqueue.transit, pinfo->postqueue.jitter, pinfo->skew_us); @@ -179,7 +179,7 @@ " pre_trans=%d pre_jitter=%f post_trans=%d post_jitter=%f dropped=%"PRIu32 \ " buffer=%"PRIu32"\n", ntohs(rtph->sequence), ntohl(rtph->timestamp), - pinfo->tx_time.tv_sec, pinfo->tx_time.tv_usec, + (unsigned int long) pinfo->tx_time.tv_sec, (unsigned int long) pinfo->tx_time.tv_usec, pinfo->tx_delay, total_delay_ms, pinfo->prequeue.transit, pinfo->prequeue.jitter, pinfo->postqueue.transit, pinfo->postqueue.jitter, diff --git a/tests/osmo-pcap-test/pcap.c b/tests/osmo-pcap-test/pcap.c index a67b121..2c18687 100644 --- a/tests/osmo-pcap-test/pcap.c +++ b/tests/osmo-pcap-test/pcap.c @@ -181,7 +181,7 @@ timersub(&elapsed_pcap, &elapsed_sys, &res); } printf("next packet comes in %lu.%.6lu seconds\n", - res.tv_sec, res.tv_usec); + (unsigned int long) res.tv_sec, (unsigned int long) res.tv_usec); osmo_timer_schedule(&p->timer, res.tv_sec, res.tv_usec); return 0; diff --git a/tests/osmux/osmux_input_test.c b/tests/osmux/osmux_input_test.c index df02423..327d174 100644 --- a/tests/osmux/osmux_input_test.c +++ b/tests/osmux/osmux_input_test.c @@ -116,7 +116,8 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \ osmo_gettimeofday(&tv, NULL); \ fprintf(stdout, "sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt "\n", \ - tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \ + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \ + (unsigned int long) ts.tv_sec, ts.tv_nsec/1000, ##args); \ } while (0) static void clock_override_enable(bool enable) diff --git a/tests/osmux/osmux_output_test.c b/tests/osmux/osmux_output_test.c index 94d6a5b..a492379 100644 --- a/tests/osmux/osmux_output_test.c +++ b/tests/osmux/osmux_output_test.c @@ -101,7 +101,8 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &ts); osmo_gettimeofday(&tv, NULL); printf("sys={%lu.%06lu}, mono={%lu.%06lu}: %s\n", - tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, str); + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, + (unsigned int long) ts.tv_sec, ts.tv_nsec/1000, str); } static void clock_override_enable(bool enable) diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c index f80902d..426ecb2 100644 --- a/tests/osmux/osmux_test.c +++ b/tests/osmux/osmux_test.c @@ -63,7 +63,8 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \ osmo_gettimeofday(&tv, NULL); \ fprintf(stderr, "sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt, \ - tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \ + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \ + (unsigned int long) ts.tv_sec, ts.tv_nsec/1000, ##args); \ } while(0) static void clock_override_enable(bool enable) diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index f2f1d4f..f23bb5b 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -65,7 +65,8 @@ #define LOGCLI(cli, fmt, args...) do { \ struct timeval tv; \ osmo_gettimeofday(&tv, NULL); \ - printf("{%lu.%06lu} [%s] Client's %s(): " fmt, tv.tv_sec, tv.tv_usec, \ + printf("{%lu.%06lu} [%s] Client's %s(): " fmt, \ + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \ osmo_stream_cli_get_data(cli) ? "OK" : "NA", __func__, ##args); \ } while (0) @@ -243,7 +244,8 @@ #define LOGSRV(srv, fmt, args...) do { \ struct timeval tv; \ osmo_gettimeofday(&tv, NULL); \ - printf("{%lu.%06lu} [%s|%s] Server's %s(): " fmt, tv.tv_sec, tv.tv_usec, \ + printf("{%lu.%06lu} [%s|%s] Server's %s(): " fmt, \ + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \ osmo_stream_srv_get_data(srv) ? "OK" : "NA", \ osmo_stream_srv_link_get_data(osmo_stream_srv_get_master(srv)) ? "OK" : "NA", \ __func__, ##args); \ @@ -364,21 +366,24 @@ osmo_select_main(0); osmo_gettimeofday(&tv, NULL); fprintf(stderr, "\n{%lu.%06lu} %s test step %u [client %s, server %s], FD reg %u\n", - tv.tv_sec, tv.tv_usec, ASTR(autoreconnect), steps, + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, + ASTR(autoreconnect), steps, osmo_stream_cli_get_data(cli) ? "OK" : "NA", osmo_stream_srv_link_get_data(lnk) ? "OK" : "NA", osmo_fd_is_registered(osmo_stream_cli_get_ofd(cli))); if (test_stop_requested(lnk)) { printf("{%lu.%06lu} Server requested test termination\n", - tv.tv_sec, tv.tv_usec); + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec); steps = 0; } } osmo_stream_cli_destroy(cli); osmo_stream_srv_link_close(lnk); - printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec, ASTR(autoreconnect)); + printf("{%lu.%06lu} %s test complete.\n\n", + (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, + ASTR(autoreconnect)); } /* Segmentation test code (using IPA) */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40923?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: osmith/1.6.1 Gerrit-Change-Id: I0b29930a8797fbf0c9d8bfde40bcef9702629834 Gerrit-Change-Number: 40923 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[osmith/1.11.2]: VTY: Initialize fields of struct cmd_element in order of declaration
by osmith 26 Aug '25

26 Aug '25

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/40920?usp=email ) Change subject: VTY: Initialize fields of struct cmd_element in order of declaration ...................................................................... Patch Set 1: Verified+1 (3 comments) Patchset: PS1: Removed V-1 for liniting failures, as this patch is cherry-picked from master. other tests passed, so setting V+1. File include/osmocom/vty/command.h: https://gerrit.osmocom.org/c/libosmocore/+/40920/comment/df1ef35d_568717f8?… : PS1, Line 222: .attr = attrs, \ cherry-picked from master, keeping the patch as-is. https://gerrit.osmocom.org/c/libosmocore/+/40920/comment/3a9a3087_341940cd?… : PS1, Line 233: .attr = attrs, \ cherry-picked from master, keeping the patch as-is. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40920?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: osmith/1.11.2 Gerrit-Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 Gerrit-Change-Number: 40920 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 26 Aug 2025 13:42:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[osmith/1.11.2]: VTY: Initialize fields of struct cmd_element in order of declaration
by osmith 26 Aug '25

26 Aug '25

Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40920?usp=email ) Change subject: VTY: Initialize fields of struct cmd_element in order of declaration ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40920?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: deleteVote Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.11.2 Gerrit-Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 Gerrit-Change-Number: 40920 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[osmith/1.11.2]: VTY: Initialize fields of struct cmd_element in order of declaration
by Jenkins Builder 26 Aug '25

26 Aug '25

Jenkins Builder has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/40920?usp=email ) Change subject: VTY: Initialize fields of struct cmd_element in order of declaration ...................................................................... Patch Set 1: (2 comments) File include/osmocom/vty/command.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/libosmocore/+/40920/comment/58a0fc9a_e901a17f?… : PS1, Line 222: .attr = attrs, \ please, no spaces at the start of a line Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/libosmocore/+/40920/comment/365b2f76_3ce6e4f2?… : PS1, Line 233: .attr = attrs, \ please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40920?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: osmith/1.11.2 Gerrit-Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 Gerrit-Change-Number: 40920 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 26 Aug 2025 13:40:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in libosmocore[osmith/1.11.2]: Makefile: fix doc/vty race condition
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40919?usp=email ) Change subject: Makefile: fix doc/vty race condition ...................................................................... Makefile: fix doc/vty race condition It is possible that doxygen is unable to create the "doc/vty" directory, as we have seen in jenkins. Create it before running doxygen as it is done for other doc dirs above, e.g.: rm -rf $(top_builddir)/doc/isdn; mkdir -p $(top_builddir)/doc/isdn Note that the doc/vty dir is expected to exist already inside the source tree, as it contains versioned failes. As I understand it, the error happens when building out-of-tree. Fix for: error: tag OUTPUT_DIRECTORY: Output directory 'doc/vty' does not exist and cannot be created Doxygen version used: 1.9.4 Exiting... touch "doc/libosmovty.tag.prep" make[2]: [Makefile:1357: doc/libosmovty.tag.prep] Error 1 (ignored) touch: cannot touch 'doc/libosmovty.tag.prep': No such file or directory Related: https://gerrit.osmocom.org/c/libosmocore/+/39827/1#message-02393b0dc4323a19… Change-Id: If9029059ac60060bdb14f5629f50836166e3afd7 (cherry picked from commit 219f3d0392344b11a8f24a264572fd8e2e4dee12) --- M Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/40919/1 diff --git a/Makefile.am b/Makefile.am index 8a8f963..7adb00b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ $(top_srcdir)/src/vty/*.c rm -rf $(top_builddir)/doc/vty/html $(top_builddir)/doc/vty/latex rm -rf $(top_builddir)/doc/libosmovty.map + mkdir -p $(top_builddir)/doc/vty -$(DOXYGEN) $(top_builddir)/Doxyfile.vty touch "$@" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40919?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: osmith/1.11.2 Gerrit-Change-Id: If9029059ac60060bdb14f5629f50836166e3afd7 Gerrit-Change-Number: 40919 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[osmith/1.11.2]: tests: fix for debian 13 armv7l
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40921?usp=email ) Change subject: tests: fix for debian 13 armv7l ...................................................................... tests: fix for debian 13 armv7l In Debian 13 armv7l, time_t and suseconds_t are "long long int" instead of "long unsigned int" as seen on x86_64 and aarch64. This causes the the tdef, time_cc and iuup tests to fail. Example: -sys={0.000000}, clock_override_set +sys={4206924.000000}, (null) _tinit_timeout_retrans_transport_prim_cb() Transport: DL len=22: e0 00 df 99 16 00 51 67 3c 01 27 00 00 82 00 00 00 17 10 00 01 00 -sys={1.000000}, clock_override_set +sys={4206924.000001}, (null) _tinit_timeout_retrans_transport_prim_cb() Transport: DL len=22: e0 00 df 99 16 00 51 67 3c 01 27 00 00 82 00 00 00 17 10 00 01 00 -sys={2.000000}, clock_override_set +sys={4206924.000002}, (null) … Furthermore it causes compiler warnings such as: iuup/iuup_test.c: In function 'clock_override_set': iuup/iuup_test.c:169:24: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type '__time64_t' {aka 'long long int'} [-Wformat=] 169 | printf("sys={%lu.%06lu}, %s\n", osmo_gettimeofday_override_time.tv_sec, | ~~^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | | long unsigned int __time64_t {aka long long int} | %llu iuup/iuup_test.c:169:30: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type '__suseconds64_t' {aka 'long long int'} [-Wformat=] 169 | printf("sys={%lu.%06lu}, %s\n", osmo_gettimeofday_override_time.tv_sec, | ~~~~^ | | | long unsigned int | %06llu 170 | osmo_gettimeofday_override_time.tv_usec, __func__); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | __suseconds64_t {aka long long int} CCLD iuup/iuup_test Fix it by casting to "long unsigned int". Related: OS#6828 Change-Id: I9580606d66bb0f891c0ef0179f99e2b901a8cf1c (cherry picked from commit 33cb4d460e9b9ef320c6c281f1157883cdec4279) --- M tests/iuup/iuup_test.c M tests/tdef/tdef_test.c M tests/time_cc/time_cc_test.c 3 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/40921/1 diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index 7798aa2..725a7d9 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -163,8 +163,8 @@ { osmo_gettimeofday_override_time.tv_sec = sec + usec / (1000*1000); osmo_gettimeofday_override_time.tv_usec = usec % (1000*1000); - printf("sys={%lu.%06lu}, %s\n", osmo_gettimeofday_override_time.tv_sec, - osmo_gettimeofday_override_time.tv_usec, __func__); + printf("sys={%lu.%06lu}, %s\n", (unsigned int long) osmo_gettimeofday_override_time.tv_sec, + (unsigned int long) osmo_gettimeofday_override_time.tv_usec, __func__); } void test_crc(void) diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c index 710a4aa..1c2b04d 100644 --- a/tests/tdef/tdef_test.c +++ b/tests/tdef/tdef_test.c @@ -335,7 +335,8 @@ } osmo_timer_remaining(&fi->timer, &osmo_gettimeofday_override_time, &remaining); - printf(", %lu.%06lu s remaining\n", remaining.tv_sec, remaining.tv_usec); + printf(", %lu.%06lu s remaining\n", (unsigned int long) remaining.tv_sec, + (unsigned int long) remaining.tv_usec); } diff --git a/tests/time_cc/time_cc_test.c b/tests/time_cc/time_cc_test.c index e4a5aaf..9d1ab5c 100644 --- a/tests/time_cc/time_cc_test.c +++ b/tests/time_cc/time_cc_test.c @@ -165,7 +165,7 @@ osmo_clock_override_add(CLOCK_MONOTONIC, ms / 1000, (uint64_t)(ms % 1000) * 1000000); \ osmo_gettimeofday_override_add(ms / 1000, (uint64_t)(ms % 1000) * 1000); \ printf("%d ADD_MILLISECS(" #ms ") --> %ld.%03ld", my_obj.flag_cc_round.flag_state, \ - now->tv_sec, now->tv_nsec/1000000); \ + (unsigned int long) now->tv_sec, now->tv_nsec/1000000); \ printf("\n"); \ } while (0) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40921?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: osmith/1.11.2 Gerrit-Change-Id: I9580606d66bb0f891c0ef0179f99e2b901a8cf1c Gerrit-Change-Number: 40921 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[osmith/1.11.2]: VTY: Initialize fields of struct cmd_element in order of declaration
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40920?usp=email ) Change subject: VTY: Initialize fields of struct cmd_element in order of declaration ...................................................................... VTY: Initialize fields of struct cmd_element in order of declaration gpp requires designated initialisers to be initialized in the order their fields were declared. With this patch it is possible to include VTY's command.h within C++ code. Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 (cherry picked from commit c59d99352c1903adcc84fbd54c2a60c410a6ad31) --- M include/osmocom/vty/command.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/40920/1 diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 61b5881..667e9ab 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -218,8 +218,8 @@ .string = cmdstr, \ .func = funcname, \ .doc = helpstr, \ - .attr = attrs, \ .daemon = dnum, \ + .attr = attrs, \ }; /* global (non static) cmd_element */ @@ -229,8 +229,8 @@ .string = cmdstr, \ .func = funcname, \ .doc = helpstr, \ - .attr = attrs, \ .daemon = dnum, \ + .attr = attrs, \ }; #define DEFUN_CMD_ELEMENT_ATTR_USRATTR(funcname, cmdname, cmdstr, helpstr, attrs, usrattrs) \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40920?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: osmith/1.11.2 Gerrit-Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 Gerrit-Change-Number: 40920 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in libosmocore[osmith/1.11.2]: Bump version: 1.11.1.3-bd63 → 1.11.2
by osmith 26 Aug '25

26 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40922?usp=email ) Change subject: Bump version: 1.11.1.3-bd63 → 1.11.2 ...................................................................... Bump version: 1.11.1.3-bd63 → 1.11.2 Change-Id: Ib952b0034b2f345152e4f17a57f4c846fd5da664 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/40922/1 diff --git a/debian/changelog b/debian/changelog index c3e7931..a6d79a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libosmocore (1.11.2) unstable; urgency=medium + + [ Oliver Smith ] + * Makefile: fix doc/vty race condition + * tests: fix for debian 13 armv7l + + [ Andreas Eversberg ] + * VTY: Initialize fields of struct cmd_element in order of declaration + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 26 Aug 2025 15:31:46 +0200 + libosmocore (1.11.1) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40922?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: osmith/1.11.2 Gerrit-Change-Id: Ib952b0034b2f345152e4f17a57f4c846fd5da664 Gerrit-Change-Number: 40922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by pespin 26 Aug '25

26 Aug '25

Attention is currently required from: falconia, fixeria, jolly, laforge. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 6: (2 comments) File include/osmocom/netif/twjit.h: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/23fdb85b_284f0da… : PS6, Line 50: struct osmo_twjit_config { > The only struct that poses truly serious ABI issues is `osmo_twjit_config`. […] @falcon@freecalypso.org my preferred solution would be to actually remove the osmo_twjit_config from public space and instead have setter API for each param one wants to configure on the twjit. Only pass the really required ones during osmo_twjit_alloc(), and for the others set a sane default plus the mentioned setters to configure/tweak it afterwards. I know at first hand it looks like more work and more function calls to be made, but in the end this allows good maintainability, extensibility, etc. I'm saying this based on experience, for instance see the osmo_stream (stream.h) API which follows this approach and proved to cope well with extensions over time. Your proposal would work and I could accept it, but it I really dislike the idea of having to allocate an extra twjit_config struct. Let me know if my proposal is good for you. File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/9c3f6c13_183cabc… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); > Can this issue be marked as resolved - is M bit handled to your satisfaction now? Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 6 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder 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: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Aug 2025 10:15:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log