tests: Replace tcpdump with wlantest file write

There is no need to run a separate tcpdump process to capture frames
from hwsim0 since wlantest is already doing that can write the results
to a file.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/tests/hwsim/README b/tests/hwsim/README
index 5db4c7d..7865c32 100644 (file)
--- a/tests/hwsim/README
+++ b/tests/hwsim/README
@@ -139,7 +139,7 @@ timestamp and a postfix to identify the specific log:
 - log2 = wpa_supplicant debug log for the third radio
 - hostapd = hostapd debug log
 - hwsim0 = wlantest debug log
-- hwsim0.dump = pcap containing all frames exchanged during the tests
+- hwsim0.pcapng = capture with all frames exchanged during the tests
 - tcpdump = tcpdump output
 - run = debug prints from the test scripts
 - trace.dat = Linux tracing record (if enabled)

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index fbd3cfe..df16753 100755 (executable)
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -56,8 +56,7 @@ if [ "$CONCURRENT" = "y" ]; then
 fi
 mkdir -p $LOGDIR
 sudo ifconfig hwsim0 up
-sudo $WLANTEST -i hwsim0 -c -d > $LOGDIR/hwsim0 &
-sudo tcpdump -ni hwsim0 -s 2500 -w $LOGDIR/hwsim0.dump > $LOGDIR/tcpdump 2>&1 &
+sudo $WLANTEST -i hwsim0 -n $LOGDIR/hwsim0.pcapng -c -d > $LOGDIR/hwsim0 &
 for i in 0 1 2; do
     sudo $(printf -- "$VALGRIND_WPAS" $i) $WPAS -g /tmp/wpas-wlan$i -G$GROUP -Dnl80211 -iwlan$i -c $DIR/p2p$i.conf \
          $(printf -- "$CONCURRENT_ARGS" $i) -ddKt$TRACE > $LOGDIR/log$i &
@@ -65,7 +64,7 @@ done
 sudo $VALGRIND_HAPD $HAPD -ddKt$TRACE -g /var/run/hostapd-global -G $GROUP -ddKt > $LOGDIR/hostapd &
 
 sleep 1
-sudo chown -f $USER $LOGDIR/hwsim0.dump
+sudo chown -f $USER $LOGDIR/hwsim0.pcapng
 if [ "x$VALGRIND" = "xy" ]; then
     sudo chown -f $USER $LOGDIR/*valgrind*
 fi