- gerrit-log - lists.osmocom.org

Change in osmo-dev[master]: net: run.sh: support tmux as terminal
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27036 ) Change subject: net: run.sh: support tmux as terminal ...................................................................... net: run.sh: support tmux as terminal Create one tmux session, with each Osmocom program in one window, if tmux is chosen as "terminal". This allows using osmo-dev's run.sh over ssh without X forwarding. Also the existing supported terminals automatically scroll to the bottom as soon as there is new output, making it hard to read logs. Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974 --- M net/config_2g3g M net/templates/run.sh 2 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/36/27036/1 diff --git a/net/config_2g3g b/net/config_2g3g index ab6c2a2..95d8290 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -1,5 +1,5 @@ # Terminal for launching Osmocom programs -# Supported: auto, urxvt, xterm +# Supported: auto, urxvt, xterm, tmux TERMINAL="auto" ETH_DEV=eth0 diff --git a/net/templates/run.sh b/net/templates/run.sh index 19e7e9b..a611926 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash +# tmux: start this script inside a new session +tmux_session="CN" +if [ "${TERMINAL}" = "tmux" ] && [ "$1" != "inside-tmux" ]; then + echo "Starting tmux session '$tmux_session'" + unset TMUX + exec tmux new-session -s "$tmux_session" -n "RUN" "$0" "inside-tmux" +fi + if ! ../fill_config.py --check-stale; then echo echo "WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on!" @@ -46,7 +54,7 @@ find_term() { # Find a terminal program and write to the global "terminal" variable - local programs="urxvt xterm" + local programs="urxvt xterm tmux" if [ -n "${TERMINAL}" ] && [ "${TERMINAL}" != "auto" ]; then case " $programs " in @@ -122,12 +130,19 @@ EOF chmod +x "$wrapper" - $terminal \ - -title "CN:$title" \ - -e sh -c "$wrapper" \ - & + case "$terminal" in + tmux) + tmux new-window -d -n "$title" "$wrapper &; echo \$! > $pidfile_term; fg; wait" + ;; + *) + $terminal \ + -title "CN:$title" \ + -e sh -c "$wrapper" \ + & - echo "$!" > "$pidfile_term" + echo "$!" > "$pidfile_term" + ;; + esac } kill_pids() { -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974 Gerrit-Change-Number: 27036 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net: run.sh: tweak quit logic
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 ) Change subject: net: run.sh: tweak quit logic ...................................................................... net: run.sh: tweak quit logic In some cases, the shell doesn't wait for the read to complete and just keeps on printing "q Enter to close" in an infinite loop, making it impossible to read the logs above. This happens with all terminals. I'm not sure about the exact cause, work around it by only printing the message once and sleeping inside the while true loop. Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b --- M net/templates/run.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/27037/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index a611926..3690b39 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -120,12 +120,14 @@ echo +echo '---' +echo 'q Enter / ^C to close' while true; do - echo 'q Enter to close' read q_to_close if [ "x\$q_to_close" = xq ]; then break fi + sleep 0.1 done EOF chmod +x "$wrapper" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b Gerrit-Change-Number: 27037 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net: make terminal configurable in config file
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27033 ) Change subject: net: make terminal configurable in config file ...................................................................... net: make terminal configurable in config file Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc --- M net/config_2g3g M net/templates/run.sh 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/27033/1 diff --git a/net/config_2g3g b/net/config_2g3g index c1498be..ab6c2a2 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -1,3 +1,7 @@ +# Terminal for launching Osmocom programs +# Supported: auto, urxvt, xterm +TERMINAL="auto" + ETH_DEV=eth0 APN_DEV=apn0 diff --git a/net/templates/run.sh b/net/templates/run.sh index 311cdd9..af7bc36 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -44,10 +44,27 @@ find_term() { # Find a terminal program and write to the global "terminal" variable local programs="urxvt xterm" + + if [ -n "${TERMINAL}" ] && [ "${TERMINAL}" != "auto" ]; then + case " $programs " in + *" ${TERMINAL} "*) + echo "Terminal: ${TERMINAL} (from config)" + terminal="${TERMINAL}" + return + ;; + esac + + echo "ERROR: Terminal '${TERMINAL}' is not in list of supported terminals ($programs)" + exit 1 + fi + local program for program in $programs; do terminal="$(which $program)" - [ -n "$terminal" ] && return + if [ -n "$terminal" ]; then + echo "Terminal: $program (auto)" + return + fi done # No terminal found -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc Gerrit-Change-Number: 27033 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net: run.sh: write wrapper command to shell script
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27035 ) Change subject: net: run.sh: write wrapper command to shell script ...................................................................... net: run.sh: write wrapper command to shell script Instead of passing a whole script to the terminal via command-line argument, write it to a file. This is in preparation to use the same script with tmux, see next patch. Change-Id: I15760d706b20628421c10a16514120f442d5477f --- M net/templates/run.sh 1 file changed, 27 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/35/27035/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 7b36101..19e7e9b 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -40,7 +40,9 @@ logdir="current_log" piddir="pids" -mkdir -p "$logdir" "$piddir" +wrapperdir="wrappers" +rm -rf "$wrapperdir" +mkdir -p "$logdir" "$piddir" "$wrapperdir" find_term() { # Find a terminal program and write to the global "terminal" variable @@ -97,20 +99,32 @@ local pidfile_term="$piddir/$title.term.pid" pidfiles_must_not_exist "$pidfile" "$pidfile_term" + local wrapper="$wrapperdir/$title.sh" + + cat << EOF > "$wrapper" +#!/bin/sh + +export LD_LIBRARY_PATH='/usr/local/lib' + +$1 & +echo \$! > $pidfile +wait + +echo + +while true; do + echo 'q Enter to close' + read q_to_close + if [ "x\$q_to_close" = xq ]; then + break + fi +done +EOF + chmod +x "$wrapper" + $terminal \ -title "CN:$title" \ - -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib' - $1 & - echo \$! > $pidfile - wait - echo - while true; do - echo 'q Enter to close' - read q_to_close - if [ \"x\$q_to_close\" = xq ]; then - break - fi - done" \ + -e sh -c "$wrapper" \ & echo "$!" > "$pidfile_term" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f Gerrit-Change-Number: 27035 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net: run.sh: store all spawned pids in files
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27034 ) Change subject: net: run.sh: store all spawned pids in files ...................................................................... net: run.sh: store all spawned pids in files Replace the previous approach of only storing the PIDs of the spawned terminals, and then attempting to kill all other processes (the ones running inside the spawned terminals and tcpdump) with "killall". Instead, store PIDs of all spawned programs: * Terminals * Osmocom programs (new) * Tcpdump (new) Kill old processes at the start of run.sh as well, so even if run.sh was killed before it could clean up, the Osmocom programs don't fail to start anymore (as it was the case before). Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9 --- M net/templates/run.sh 1 file changed, 79 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/34/27034/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index af7bc36..7b36101 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -39,7 +39,8 @@ fi logdir="current_log" -mkdir -p "$logdir" +piddir="pids" +mkdir -p "$logdir" "$piddir" find_term() { # Find a terminal program and write to the global "terminal" variable @@ -72,15 +73,68 @@ exit 1 } +pidfiles_must_not_exist() { + local pidfile + + for pidfile in "$@"; do + if [ -e "$pidfile" ]; then + echo + echo "ERROR: pidfile exists: $pidfile" + echo + kill_pids + exit 1 + fi + done +} + term() { title="$2" if [ -z "$title" ]; then title="$(basename $@)" fi - exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done" + + local pidfile="$piddir/$title.pid" + local pidfile_term="$piddir/$title.term.pid" + pidfiles_must_not_exist "$pidfile" "$pidfile_term" + + $terminal \ + -title "CN:$title" \ + -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib' + $1 & + echo \$! > $pidfile + wait + echo + while true; do + echo 'q Enter to close' + read q_to_close + if [ \"x\$q_to_close\" = xq ]; then + break + fi + done" \ + & + + echo "$!" > "$pidfile_term" +} + +kill_pids() { + local pidfile + local pid + + for pidfile in "$piddir"/*.pid; do + if ! [ -e "$pidfile" ]; then + continue + fi + + pid="$(cat "$pidfile")" + + echo "killing $(basename "$pidfile") ($pid)" + sudo kill "$pid" + rm "$pidfile" + done } find_term +kill_pids hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" @@ -134,78 +188,66 @@ esac fi +PIDFILE_TCPDUMP_DEV="$piddir/tcpdump.$dev.pid" +PIDFILE_TCPDUMP_LO="$piddir/tcpdump.lo.pid" +pidfiles_must_not_exist "$PIDFILE_TCPDUMP_DEV" "$PIDFILE_TCPDUMP_LO" + sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & +echo "$!" > "$PIDFILE_TCPDUMP_DEV" sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & +echo "$!" > "$PIDFILE_TCPDUMP_LO" -PIDS="" - -term "$ggsn" GGSN & -PIDS="$PIDS $!" +term "$ggsn" GGSN if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then sleep .2 - term "$stp4cn" STP & - PIDS="$PIDS $!" + term "$stp4cn" STP else sleep .2 - term "$stp4cn" STP4CN & - PIDS="$PIDS $!" + term "$stp4cn" STP4CN sleep .2 - term "$stp4ran" STP4RAN & - PIDS="$PIDS $!" + term "$stp4ran" STP4RAN sleep .2 - term "$bscnat" BSCNAT & - PIDS="$PIDS $!" + term "$bscnat" BSCNAT fi sleep .2 -term "$hlr" HLR & -PIDS="$PIDS $!" +term "$hlr" HLR sleep .2 -term "$sgsn" SGSN & -PIDS="$PIDS $!" +term "$sgsn" SGSN sleep .2 -term "$gbproxy" GBPROXY & -PIDS="$PIDS $!" +term "$gbproxy" GBPROXY sleep .2 -term "$mgw4msc" MGW4MSC & -PIDS="$PIDS $!" +term "$mgw4msc" MGW4MSC sleep .2 -term "$mgw4bsc" MGW4BSC & -PIDS="$PIDS $!" +term "$mgw4bsc" MGW4BSC sleep .2 -term "$msc" MSC & -PIDS="$PIDS $!" +term "$msc" MSC sleep 2 -term "$hnbgw" HNBGW & -PIDS="$PIDS $!" +term "$hnbgw" HNBGW sleep .2 -term "$bsc" BSC & -PIDS="$PIDS $!" +term "$bsc" BSC if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 - term "$sipcon" SIPCON & - PIDS="$PIDS $!" + term "$sipcon" SIPCON sleep .2 case "${PBX_SERVER}" in "kamailio") - term "$kamailio" KAMAILIO & - PIDS="$PIDS $!" + term "$kamailio" KAMAILIO ;; "freeswitch") - term "./freeswitch/freeswitch.sh" FREESWITCH & - PIDS="$PIDS $!" + term "./freeswitch/freeswitch.sh" FREESWITCH ;; esac fi @@ -219,27 +261,7 @@ #ssh bts neels/stop_remote.sh -for i in $PIDS; do - kill "$i" -done -killall osmo-msc -killall osmo-bsc -killall osmo-gbproxy -killall osmo-sgsn -#killall osmo-hnbgw -killall osmo-mgw -killall osmo-hlr -killall -9 osmo-stp -sudo killall tcpdump -killall osmo-ggsn -killall osmo-bsc-nat - -if [ "x${MSC_MNCC}" != "xinternal" ]; then - # 'killall' seems to work only with the shortened name - killall osmo-sip-connec - killall "${PBX_SERVER}" -fi - +kill_pids set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9 Gerrit-Change-Number: 27034 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net/templates/.editorconfig: new file
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 ) Change subject: net/templates/.editorconfig: new file ...................................................................... net/templates/.editorconfig: new file Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 --- A net/templates/.editorconfig 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/32/27032/1 diff --git a/net/templates/.editorconfig b/net/templates/.editorconfig new file mode 100644 index 0000000..71944b2 --- /dev/null +++ b/net/templates/.editorconfig @@ -0,0 +1,7 @@ +[run.sh] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 Gerrit-Change-Number: 27032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: add addressbooks
by osmith 01 Feb '22

01 Feb '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27031 ) Change subject: net/templates/osmo-bsc-nat.cfg: add addressbooks ...................................................................... net/templates/osmo-bsc-nat.cfg: add addressbooks Add MSC and BSC point-codes, as it is currently needed in the initial message forwarding implementation. Related: SYS#5560 Related: osmo-bsc-nat I4af398bb433341a98f818822e6c3af28b6d9dacd Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 --- M net/templates/osmo-bsc-nat.cfg 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/31/27031/1 diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg index c9a71da..f049d7b 100644 --- a/net/templates/osmo-bsc-nat.cfg +++ b/net/templates/osmo-bsc-nat.cfg @@ -4,12 +4,20 @@ asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua remote-ip ${STP_CN_IP} local-ip ${BSCNAT_CN_IP} + sccp-address msc + routing-indicator PC + point-code ${MSC_PC} + subsystem-number 254 cs7 instance 1 point-code ${BSCNAT_RAN_PC} asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip ${STP_RAN_IP} local-ip ${BSCNAT_RAN_IP} + sccp-address bsc + routing-indicator PC + point-code ${BSC_PC} + subsystem-number 254 bsc-nat cs7-instance-cn 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 Gerrit-Change-Number: 27031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: tests/logging: merge both logging_test_{stream,wqueue}.err
by fixeria 01 Feb '22

01 Feb '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27013 ) Change subject: tests/logging: merge both logging_test_{stream,wqueue}.err ...................................................................... tests/logging: merge both logging_test_{stream,wqueue}.err Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 --- M tests/Makefile.am R tests/logging/logging_test.err D tests/logging/logging_test_wqueue.err M tests/testsuite.at 4 files changed, 5 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index 3375c45..f54ce18 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -363,9 +363,7 @@ gb/gprs_ns2_test.ok \ gprs/gprs_test.ok kasumi/kasumi_test.ok \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ - logging/logging_test.ok \ - logging/logging_test_stream.err \ - logging/logging_test_wqueue.err \ + logging/logging_test.ok logging/logging_test.err \ logging/logging_vty_test.vty \ fr/fr_test.ok loggingrb/logging_test.ok \ loggingrb/logging_test.err strrb/strrb_test.ok \ @@ -503,12 +501,9 @@ >$(srcdir)/gsm48/rest_octets_test.ok gprs/gprs_test \ >$(srcdir)/gprs/gprs_test.ok - logging/logging_test wqueue \ + logging/logging_test \ >$(srcdir)/logging/logging_test.ok \ - 2>$(srcdir)/logging/logging_test_wqueue.err - logging/logging_test stream \ - >$(srcdir)/logging/logging_test.ok \ - 2>$(srcdir)/logging/logging_test_stream.err + 2>$(srcdir)/logging/logging_test.err codec/codec_test \ >$(srcdir)/codec/codec_test.ok codec/codec_ecu_fr_test \ diff --git a/tests/logging/logging_test_stream.err b/tests/logging/logging_test.err similarity index 100% rename from tests/logging/logging_test_stream.err rename to tests/logging/logging_test.err diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err deleted file mode 100644 index 01ab878..0000000 --- a/tests/logging/logging_test_wqueue.err +++ /dev/null @@ -1,11 +0,0 @@ -DRLL You should see this -DCC You should see this -DRLL You should see this -DLGLOBAL You should see this on DLGLOBAL (a) -DLGLOBAL You should see this on DLGLOBAL (b) -DLGLOBAL You should see this on DLGLOBAL (c) -DLGLOBAL You should see this on DLGLOBAL (d) -DLGLOBAL You should see this on DLGLOBAL (e) -DLGLOBAL You should see this (DLGLOBAL on DEBUG) -DLGLOBAL logging_test.c:137 A message with source info printed first -DLGLOBAL A message with source info printed last (logging_test.c:139) diff --git a/tests/testsuite.at b/tests/testsuite.at index 5da08e5..ca133bb 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -171,14 +171,14 @@ AT_SETUP([logging_stream]) AT_KEYWORDS([logging_stream]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test_stream.err > experr +cat $abs_srcdir/logging/logging_test.err > experr AT_CHECK([$abs_top_builddir/tests/logging/logging_test stream], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([logging_wqueue]) AT_KEYWORDS([logging_wqueue]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test_wqueue.err > experr +cat $abs_srcdir/logging/logging_test.err > experr AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr]) AT_CLEANUP 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 Gerrit-Change-Number: 27013 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: logging: fix printing of '\0' when filename printed last
by fixeria 01 Feb '22

01 Feb '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27012 ) Change subject: logging: fix printing of '\0' when filename printed last ...................................................................... logging: fix printing of '\0' when filename printed last As was demonstrated in I54bf5e5c036efb1908232fe3d8e8e2989715fbb3, when the logging is configured to print the filename *after* the logging message, each logging line contains an artifact - '\0'. The problem is that the 'len' variable is not updated. Fix this. Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Fixes: I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M src/logging.c M tests/logging/logging_test_wqueue.err 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/logging.c b/src/logging.c index 5336e53..1a0abc2 100644 --- a/src/logging.c +++ b/src/logging.c @@ -586,6 +586,7 @@ break; case LOG_FILENAME_PATH: offset--; + len--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); if (ret < 0) goto err; @@ -593,6 +594,7 @@ break; case LOG_FILENAME_BASENAME: offset--; + len--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); if (ret < 0) goto err; diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err index 3e2008b..01ab878 100644 --- a/tests/logging/logging_test_wqueue.err +++ b/tests/logging/logging_test_wqueue.err Binary files differ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Gerrit-Change-Number: 27012 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: logging: fix printing of '\0' when filename printed last
by pespin 01 Feb '22

01 Feb '22

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27012 ) Change subject: logging: fix printing of '\0' when filename printed last ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Gerrit-Change-Number: 27012 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jan 2022 16:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log