November 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCCH_EST_REQ

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30317 ) Change subject: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCCH_EST_REQ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8db93fcdace7aaa8bc3876b14e441304349a36d5 Gerrit-Change-Number: 30317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 09:22:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: permit loop DCH transitions

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30318 ) Change subject: trxcon: trxcon_fsm: permit loop DCH transitions ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30318/comment/35c6f0cc_e1d3c80d PS1, Line 626: | S(TRXCON_ST_PACKET_DATA), I fail to see the relation of this line with the rest of the patch? Is it actually a separate patch? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3b402ec84610a5df744d9b06e5f7dab7a9a3ddad Gerrit-Change-Number: 30318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 09:20:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: Don't use lsof

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 ) Change subject: ttcn3-tcpdump-stop.sh: Don't use lsof ...................................................................... ttcn3-tcpdump-stop.sh: Don't use lsof `lsof` isn't available in the docker image, use /proc fs instead to get the shell type Related: OS#5736 Change-Id: I38e132f49b0711d611d08b61c28b3092c991a191 --- M ttcn3-tcpdump-stop.sh 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve arehbein: Looks good to me, approved Objections: msuraev: I would prefer this is not merged as is diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 0568054..b479530 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -25,7 +25,9 @@ date # -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output -if (lsof -p $$ | grep -q /usr/bin/bash); then +# SHELL environment variable doesn't always give name of current shell (e.g. for dash run inside bash...) +SHELL_NAME="$(cat /proc/$$/cmdline | tr -d '\0')" +if [ "$SHELL_NAME" = "bash" ]; then ESCAPE_OPT="-e" else ESCAPE_OPT="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38e132f49b0711d611d08b61c28b3092c991a191 Gerrit-Change-Number: 30313 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: Don't use lsof

by arehbein

Attention is currently required from: msuraev. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 ) Change subject: ttcn3-tcpdump-stop.sh: Don't use lsof ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I think it would be simpler to just add lsof to docker image - we're installing bunch of tools there […] Thanks for your input! Considering there is another +1 after your comment and that I'd rather not add 'lsof' right now, I'll just submit this patch as is. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38e132f49b0711d611d08b61c28b3092c991a191 Gerrit-Change-Number: 30313 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Nov 2022 23:42:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: Don't use lsof

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 ) Change subject: ttcn3-tcpdump-stop.sh: Don't use lsof ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38e132f49b0711d611d08b61c28b3092c991a191 Gerrit-Change-Number: 30313 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Nov 2022 23:39:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump*.sh: Fix output of special chars

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30312 ) Change subject: ttcn3-tcpdump*.sh: Fix output of special chars ...................................................................... ttcn3-tcpdump*.sh: Fix output of special chars Don't print '-e' option in non-bash shells. Related: OS#5736 Change-Id: Idac0f902d2f5eb142a3f130409451c8f77b111f6 --- M ttcn3-tcpdump-stop.sh 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 829ed2b..0568054 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -24,10 +24,17 @@ date -if [ x"$VERDICT" = x"pass" ]; then - echo -e "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" +# -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output +if (lsof -p $$ | grep -q /usr/bin/bash); then + ESCAPE_OPT="-e" else - echo -e "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" + ESCAPE_OPT="" +fi + +if [ x"$VERDICT" = x"pass" ]; then + echo $ESCAPE_OPT "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" +else + echo $ESCAPE_OPT "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" fi echo -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idac0f902d2f5eb142a3f130409451c8f77b111f6 Gerrit-Change-Number: 30312 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump*.sh: Log stderr separately to file

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30311 ) Change subject: ttcn3-tcpdump*.sh: Log stderr separately to file ...................................................................... ttcn3-tcpdump*.sh: Log stderr separately to file The old output is preserved, too, in order to ensure compatibility with expectations regarding legacy behavior. Related: OS#5736 Change-Id: Ia92ff32c8ce09ab7805c5509837ec88fa4b864c5 --- M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 2 files changed, 22 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve arehbein: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8bba72f..aa42e62 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -71,9 +71,28 @@ PID=$! echo $PID > $PIDFILE_NETCAT -$CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & +CMD_OUTFILE=$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout +CMD_OUTFILE_ERR=$TTCN3_PCAP_PATH/$TESTCASE.pcap.stderr +FIFO=/tmp/cmderr +if ! [ -e $FIFO ]; then + mkfifo $FIFO +else + echo "Warning: Named pipe already exists: $FIFO" +fi + +# Log stderr to CMD_OUTFILE and a dedicated error log file +tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & +CMD_STR="$CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +eval $CMD_STR +# $CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! echo $PID > $PIDFILE_PCAP +if [ -f $CMD_OUTFILE_ERR ] && [ $(wc -l $CMD_OUTFILE_ERR | awk '{print $1}') -ne 0 ]; then + echo "Warnings or error messages from command:" >&2 + echo " $CMD_STR" >&2 + echo "Message:" >&2 + echo "$(cat $CMD_OUTFILE_ERR)" | sed 's/^/\t/' >&2 +fi # Wait until packet dumper creates the pcap file and starts recording. # We generate some traffic until we see packet dumper catches it. diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 6796612..829ed2b 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -2,6 +2,7 @@ PIDFILE_PCAP=/tmp/pcap.pid PIDFILE_NETCAT=/tmp/netcat.pid +FIFO=/tmp/cmderr TESTCASE=$1 VERDICT="$2" @@ -68,5 +69,6 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" +rm $FIFO gzip -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia92ff32c8ce09ab7805c5509837ec88fa4b864c5 Gerrit-Change-Number: 30311 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump*.sh: Log stderr separately to file

by arehbein

arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30311 ) Change subject: ttcn3-tcpdump*.sh: Log stderr separately to file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia92ff32c8ce09ab7805c5509837ec88fa4b864c5 Gerrit-Change-Number: 30311 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Nov 2022 23:38:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump*.sh: Fix scripts hanging on sudo prompt

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30310 ) Change subject: ttcn3-tcpdump*.sh: Fix scripts hanging on sudo prompt ...................................................................... ttcn3-tcpdump*.sh: Fix scripts hanging on sudo prompt Related: OS#5736 Change-Id: I05687f9bc0bb87c6f1d5c42ba235dbb90a49aeb6 --- M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 2 files changed, 23 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8433c80..8bba72f 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -10,9 +10,19 @@ TESTCASE=$1 + +SUDOSTR="" +if ! [ "$(id -u)" = "0" ]; then + SUDOSTR="sudo -n" + # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, + # and this script will hang indefinitely +fi + kill_rm_pidfile() { - if [ -e $1 ]; then - kill "$(cat "$1")" + # NOTE: This requires you to be root or something like + # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file + if ! [ -e "$1" ] && [ -s "$1" ]; then + $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" rm $1 fi } @@ -27,13 +37,7 @@ kill_rm_pidfile $PIDFILE_NETCAT kill_rm_pidfile $PIDFILE_PCAP -if [ "$(id -u)" = "0" ]; then - CMD="$TCPDUMP -U" -else -# NOTE: This requires you to be root or something like -# "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file - CMD="sudo $TCPDUMP -U" -fi +CMD="$SUDOSTR $TCPDUMP -U" if [ -x "$DUMPCAP" ]; then CAP_ERR="1" diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index faf5b2b..6796612 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -5,18 +5,20 @@ TESTCASE=$1 VERDICT="$2" +SUDOSTR="" +if ! [ "$(id -u)" = "0" ]; then + SUDOSTR="sudo -n" + # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, + # and this script will hang indefinitely +fi + kill_rm_pidfile() { -if [ -e $1 ]; then - PSNAME="$(ps -q "$(cat "$1")" -o comm=)" - if [ "$PSNAME" != "sudo" ]; then - kill "$(cat "$1")" - else # NOTE: This requires you to be root or something like # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file - sudo kill "$(cat "$1")" + if ! [ -e "$1" ] && [ -s "$1" ]; then + $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" + rm $1 fi - rm $1 -fi } date -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I05687f9bc0bb87c6f1d5c42ba235dbb90a49aeb6 Gerrit-Change-Number: 30310 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: rate_ctr: convert to timerfd

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30302 ) Change subject: rate_ctr: convert to timerfd ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2525fd691caa380a862d305cfcb4fa3cc50b70d0 Gerrit-Change-Number: 30302 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 Nov 2022 18:35:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022