summaryrefslogtreecommitdiffstats
path: root/ttcn3-tcpdump-stop.sh
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2019-03-14 18:15:27 +0100
committerMax <msuraev@sysmocom.de>2019-03-14 20:46:51 +0000
commite521445fee7bb06b4b802cfd04e039555df10ed3 (patch)
treed83b60306c45abe22b298a9f1cf488dee6a23c50 /ttcn3-tcpdump-stop.sh
parent6e05304843620f8aa92258a2e76239bc5b36dc2d (diff)
Generalize ttcn3-tcpdump-*.sh
Prepare for supporting alternative packet dumpers: * reword comments * rename pidfile * move tcpdump-specific option inside if * move comment about sudo closer to actual sudo invocation Those are cosmetic changes which do not affect how packet dump is made but makes it easier to support alternative packet dumpers in follow-up commit. Change-Id: Ib2528db65348c0422fe8b7c7c53656fbce4f6405
Diffstat (limited to 'ttcn3-tcpdump-stop.sh')
-rwxr-xr-xttcn3-tcpdump-stop.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh
index baabefe..f53cf5d 100755
--- a/ttcn3-tcpdump-stop.sh
+++ b/ttcn3-tcpdump-stop.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-PIDFILE=/tmp/tcpdump.pid
+PIDFILE=/tmp/dumper.pid
TESTCASE=$1
VERDICT="$2"
@@ -17,14 +17,14 @@ if [ "z$TTCN3_PCAP_PATH" = "z" ]; then
TTCN3_PCAP_PATH=/tmp
fi
-# Wait for up to 2 seconds if we keep receiving traffinc from tcpdump,
+# Wait for up to 2 seconds if we keep receiving traffinc from packet dumper,
# otherwise we might lose last packets from test.
i=0
prev_count=-1
count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
while [ $count -gt $prev_count ] && [ $i -lt 2 ]
do
- echo "Waiting for tcpdump to finish... $i (prev_count=$prev_count, count=$count)"
+ echo "Waiting for packet dumper to finish... $i (prev_count=$prev_count, count=$count)"
sleep 1
prev_count=$count
count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
@@ -32,11 +32,11 @@ do
done
if [ -e $PIDFILE ]; then
- # NOTE: This requires you to be root or something like
- # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file
if [ "$(id -u)" = "0" ]; then
kill "$(cat "$PIDFILE")"
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 "$PIDFILE")"
fi
rm $PIDFILE