ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

ttcn3-tcpdump*.sh: Fix scripts hanging on sudo prompt 

Related: OS#5736

Change-Id: I05687f9bc0bb87c6f1d5c42ba235dbb90a49aeb6
This commit is contained in:
arehbein 2022-11-13 17:52:48 +01:00
parent 94e60c851c
commit cf8c450ed5
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ttcn3-tcpdump-start.sh
View File

@ -10,9 +10,19 @@ GSMTAP_PORT=4729
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 @@ fi
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"

18
ttcn3-tcpdump-stop.sh
View File

@ -5,18 +5,20 @@ PIDFILE_NETCAT=/tmp/netcat.pid
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