<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13253">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use dumpcap for ttcn3-tcpdump-*.sh if available<br><br>Check if dumpcap is installed and use it for packet capture instead of<br>'sudo tcpdump' if available. This makes it easier to use TTCN-3<br>testsuite as regular user without altering sudoers.<br><br>Change-Id: I77df04d51a469c924cf727f0596cc33565909746<br>---<br>M ttcn3-tcpdump-start.sh<br>M ttcn3-tcpdump-stop.sh<br>2 files changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/13253/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh</span><br><span>index b8ad01a..14773d9 100755</span><br><span>--- a/ttcn3-tcpdump-start.sh</span><br><span>+++ b/ttcn3-tcpdump-start.sh</span><br><span>@@ -16,12 +16,16 @@</span><br><span>      rm $PIDFILE</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ "$(id -u)" = "0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-  CMD="$TCPDUMP -U"</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">-# NOTE: This requires you to be root or something like</span><br><span style="color: hsl(0, 100%, 40%);">-# "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file</span><br><span style="color: hsl(0, 100%, 40%);">-      CMD="sudo $TCPDUMP -U"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -x /usr/bin/dumpcap ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+   CMD=/usr/bin/dumpcap</span><br><span style="color: hsl(120, 100%, 40%);">+   else</span><br><span style="color: hsl(120, 100%, 40%);">+       if [ "$(id -u)" = "0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+           CMD="$TCPDUMP -U"</span><br><span style="color: hsl(120, 100%, 40%);">+       else</span><br><span style="color: hsl(120, 100%, 40%);">+       # NOTE: This requires you to be root or something like</span><br><span style="color: hsl(120, 100%, 40%);">+       # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file</span><br><span style="color: hsl(120, 100%, 40%);">+         CMD="sudo $TCPDUMP -U"</span><br><span style="color: hsl(120, 100%, 40%);">+       fi</span><br><span> fi</span><br><span> $CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &</span><br><span> PID=$!</span><br><span>diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh</span><br><span>index f53cf5d..2dd1e2d 100755</span><br><span>--- a/ttcn3-tcpdump-stop.sh</span><br><span>+++ b/ttcn3-tcpdump-stop.sh</span><br><span>@@ -32,7 +32,7 @@</span><br><span> done</span><br><span> </span><br><span> if [ -e $PIDFILE ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-       if [ "$(id -u)" = "0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+     if [ "$(id -u)" = "0" -o -x /usr/bin/dumpcap ]; then</span><br><span>             kill "$(cat "$PIDFILE")"</span><br><span>         else</span><br><span>         # NOTE: This requires you to be root or something like</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13253">change 13253</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13253"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I77df04d51a469c924cf727f0596cc33565909746 </div>
<div style="display:none"> Gerrit-Change-Number: 13253 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>