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

[S] Change in osmo-ttcn3-hacks[master]: testenv: enable_binary_repo: configure apt pin

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email ) Change subject: testenv: enable_binary_repo: configure apt pin ...................................................................... testenv: enable_binary_repo: configure apt pin Add an apt-pin to ensure packages from the Osmocom repositories get preferred over Debian's packages. I just ran into this with osmo-mgw, where we have 1.4.0 in osmocom:latest and Debian 13 has 1.14.0+dfsg1-2, which counts as higher version. This results in the wrong package being selected, and also in an error later on when trying to install related debug packages from our repository: The following packages have unmet dependencies: osmo-mgw-dbgsym : Depends: osmo-mgw (= 1.14.0) but 1.14.0+dfsg1-2 is to be installed Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4 --- M _testenv/testenv/podman.py 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/40948/1 diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index bc45b3a..678a0c1 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -301,16 +301,23 @@ def enable_binary_repo(): + # Add the binary repository config = "deb [signed-by=/obs.key]" config += " https://downloads.osmocom.org/packages/" config += testenv.args.binary_repo.replace(":", ":/") config += "/" config += testenv.distros_repodirs[distro] config += "/ ./" - path = "/etc/apt/sources.list.d/osmocom.list" - exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + + # Add an apt-pin to prefer its packages + config = "Package: *\n" + config += 'Pin: origin "downloads.osmocom.org"\n' + config += "Pin-Priority: 1100\n" + path = "/etc/apt/preferences.d/osmocom-apt-pin" + exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + exec_cmd(["apt-get", "-q", "update"]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4 Gerrit-Change-Number: 40948 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: use separate cache dirs per distro

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40941?usp=email ) Change subject: testenv: use separate cache dirs per distro ...................................................................... testenv: use separate cache dirs per distro Change-Id: I0f1c05bb4d8cfababc24477976abf8a0baa3daba --- M _testenv/testenv/cmd.py M _testenv/testenv/podman.py M _testenv/testenv/testsuite.py 3 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/40941/1 diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index afe9003..6f50677 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -3,6 +3,7 @@ import logging import os import os.path +import re import subprocess import testenv import testenv.testsuite @@ -14,6 +15,12 @@ make_dir_version = 3 +def distro_cache_suffix(): + if not testenv.args.podman or testenv.args.distro == "debian:bookworm": + return "" + return f"-{re.sub('[^a-zA-Z0-9]', '-', testenv.args.distro)}" + + def init_env(): """Adjust "Environment variables set by testenv" in README.md when making changes here.""" @@ -26,6 +33,7 @@ install_dir = "/" else: install_dir = os.path.join(testenv.args.cache, "podman/install") + install_dir += distro_cache_suffix() else: install_dir = os.path.join(testenv.args.cache, "host/install") @@ -58,6 +66,7 @@ make_dir += str(make_dir_version) if testenv.args.asan: make_dir += "-asan" + make_dir += distro_cache_suffix() env_extra["OSMO_DEV_MAKE_DIR"] = make_dir if testenv.args.kernel == "debian": diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 77a728f..8ce6766 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -102,8 +102,9 @@ global apt_dir_var_lib global run_shell_on_stop - apt_dir_var_cache = os.path.join(testenv.args.cache, "podman", "var-cache-apt") - apt_dir_var_lib = os.path.join(testenv.args.cache, "podman", "var-lib-apt") + suffix = testenv.cmd.distro_cache_suffix() + apt_dir_var_cache = os.path.join(testenv.args.cache, "podman", f"var-cache-apt{suffix}") + apt_dir_var_lib = os.path.join(testenv.args.cache, "podman", f"var-lib-apt{suffix}") os.makedirs(apt_dir_var_cache, exist_ok=True) os.makedirs(apt_dir_var_lib, exist_ok=True) diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 8d89ad8..0e00b0f 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -41,7 +41,8 @@ if testenv.args.podman or os.path.exists(ttcn3_dir): cache_dir = "podman" if testenv.args.podman else "host" - builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}") + suffix = testenv.cmd.distro_cache_suffix() + builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}{suffix}") path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] builddir_env = { "BUILDDIR": builddir, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0f1c05bb4d8cfababc24477976abf8a0baa3daba Gerrit-Change-Number: 40941 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: testenv: make builddir_env more readable

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40940?usp=email ) Change subject: Cosmetic: testenv: make builddir_env more readable ...................................................................... Cosmetic: testenv: make builddir_env more readable Change-Id: I7bbd14bd91c97bc37a163018217b104ace0e1a53 --- M _testenv/testenv/testsuite.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/40940/1 diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 8452a80..8d89ad8 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -43,7 +43,11 @@ cache_dir = "podman" if testenv.args.podman else "host" builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}") path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] - builddir_env = {"BUILDDIR": builddir, "TTCN3_DIR": ttcn3_dir, "PATH": f"{ttcn3_dir}/bin:{path_old}"} + builddir_env = { + "BUILDDIR": builddir, + "TTCN3_DIR": ttcn3_dir, + "PATH": f"{ttcn3_dir}/bin:{path_old}", + } prepare_testsuite_dir() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40940?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7bbd14bd91c97bc37a163018217b104ace0e1a53 Gerrit-Change-Number: 40940 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: install curl backport only for bookworm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40939?usp=email ) Change subject: testenv: install curl backport only for bookworm ...................................................................... testenv: install curl backport only for bookworm Change-Id: Ifeeea010fb13bfd65e1d3659a3c43fc4acf07795 --- M _testenv/data/podman/Dockerfile 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/40939/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index aa99337..961785b 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -99,6 +99,9 @@ # shipped with debian12 is buggy and generates wrong HTTP2 for open5gs. ENV BACKPORTS_SOURCES_LIST="/etc/apt/sources.list.d/debian-backports.sources" RUN set -x && \ + if ! grep -q VERSION_CODENAME=bookworm /etc/os-release; then \ + exit 0; \ + fi && \ echo "Types: deb deb-src" >>"$BACKPORTS_SOURCES_LIST" && \ echo "URIs: http://deb.debian.org/debian" >>"$BACKPORTS_SOURCES_LIST" && \ echo "Suites: bookworm-backports" >>"$BACKPORTS_SOURCES_LIST" && \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40939?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifeeea010fb13bfd65e1d3659a3c43fc4acf07795 Gerrit-Change-Number: 40939 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[M] Change in pysim[master]: contrib: add a tool to parse the SIMA response from an eUICC

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/40936?usp=email ) Change subject: contrib: add a tool to parse the SIMA response from an eUICC ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40936?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida4c3c5446653b283a3869c0c387f328ae51e55e Gerrit-Change-Number: 40936 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 08:35:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[M] Change in pysim[master]: contrib: add a tool to parse the SIMA response from an eUICC

by dexter

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40936?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: contrib: add a tool to parse the SIMA response from an eUICC ...................................................................... contrib: add a tool to parse the SIMA response from an eUICC When an eUICC performs a profile installation it returns a (concatenated) series of ASN.1 encoded strings as "simaResponse". In case the profile installation fails for some reason the simaResponse contains diagnostic information to diagnose why the profile installation failed. Unfortunately there are currently no practical tools available to decode and display the information in the simaResponse. Let's add a tool for that. Related SYS#7617 Change-Id: Ida4c3c5446653b283a3869c0c387f328ae51e55e --- A contrib/sima-response-tool.py 1 file changed, 112 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/40936/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40936?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: Ida4c3c5446653b283a3869c0c387f328ae51e55e Gerrit-Change-Number: 40936 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[M] Change in pysim[master]: contrib: add a tool to parse the SIMA response from an eUICC

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/40936?usp=email ) Change subject: contrib: add a tool to parse the SIMA response from an eUICC ...................................................................... Patch Set 2: (4 comments) File contrib/sima-response-tool.py: https://gerrit.osmocom.org/c/pysim/+/40936/comment/3dff30b4_35c571d5?usp=em… : PS1, Line 57: 8 : 'template-not-supported', : 9 : 'feature-not-supported', > ```suggestion […] Thanks. (I have tried to get those constants from asn1tools using introspection, but I couldn't figure this out. Unlike the ServicesList (see saip-tool.py), this is just a plain integer type.) https://gerrit.osmocom.org/c/pysim/+/40936/comment/7e0745d2_0a71f0ee?usp=em… : PS1, Line 74: propritary > ```suggestion […] Done https://gerrit.osmocom.org/c/pysim/+/40936/comment/5f0461b4_d757dbfb?usp=em… : PS1, Line 77: return "%d (unknown, propritary?)" % (status, status) > contrib/sima-response-tool. […] Done https://gerrit.osmocom.org/c/pysim/+/40936/comment/0361bb31_74aee998?usp=em… : PS1, Line 93: if euicc_response_decoded.get('profileInstallationAborted', False) is None: > Is comparing against `is None` correct here? I wonder if it should be compared against `is True` as […] I agree, this is confusing. The type is defined as profileInstallationAborted NULL OPTIONAL. This means, that when it is present it has the value None, so None effectively means True then. False is when profileInstallationAborted is not present at all. Unfortunately the confusion already starts with the ASN.1 definition. I have added a comment to make it more clear. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40936?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida4c3c5446653b283a3869c0c387f328ae51e55e Gerrit-Change-Number: 40936 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 08:31:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-sgsn[master]: debug.h: Remove unused log category DIUCS

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40935?usp=email ) Change subject: debug.h: Remove unused log category DIUCS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40935?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0f7c6bedaf3b7f909c3e27175ca99967492ab7c3 Gerrit-Change-Number: 40935 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 08:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: msc: also execute evil USSD tests for -latest

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40938?usp=email ) Change subject: msc: also execute evil USSD tests for -latest ...................................................................... msc: also execute evil USSD tests for -latest osmo-msc v1.14.0 is out, so we can safely execute these tests. Change-Id: Ia603bcf434a4092c5fc347300b755be92820ed3e --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/40938/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 675fc55..47b2c5e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7920,11 +7920,8 @@ execute( TC_proc_ss_for_unknown_session() ); execute( TC_proc_ss_paging_fail() ); execute( TC_proc_ss_abort() ); - - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_lu_and_ussd_notify_during_mt_call() ); /* XXX: crashes osmo-msc */ - execute( TC_mo_ussd_evil_ms() ); /* XXX: crashes osmo-msc */ - } + execute( TC_lu_and_ussd_notify_during_mt_call() ); + execute( TC_mo_ussd_evil_ms() ); execute( TC_multi_lu_and_mo_ussd() ); execute( TC_multi_lu_and_mt_ussd() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40938?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia603bcf434a4092c5fc347300b755be92820ed3e Gerrit-Change-Number: 40938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[S] Change in libosmo-netif[osmith/1.6.1]: Fix time_t prints for debian 13 armv7l

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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: merged 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> 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-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025