jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Replace tcpdump with wlantest file write

Browse source 
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>
This commit is contained in:
Jouni Malinen 2013-10-31 11:35:02 +02:00 committed by Jouni Malinen
parent 79b16a5c0d
commit d05159ccc5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/hwsim/README
View file

@ -139,7 +139,7 @@ timestamp and a postfix to identify the specific log:
- log2 = wpa_supplicant debug log for the third radio - log2 = wpa_supplicant debug log for the third radio
- hostapd = hostapd debug log - hostapd = hostapd debug log
- hwsim0 = wlantest 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 - tcpdump = tcpdump output
- run = debug prints from the test scripts - run = debug prints from the test scripts
- trace.dat = Linux tracing record (if enabled) - trace.dat = Linux tracing record (if enabled)

5
tests/hwsim/start.sh
View file

@ -56,8 +56,7 @@ if [ "$CONCURRENT" = "y" ]; then
fi fi
mkdir -p $LOGDIR mkdir -p $LOGDIR
sudo ifconfig hwsim0 up sudo ifconfig hwsim0 up
sudo $WLANTEST -i hwsim0 -c -d > $LOGDIR/hwsim0 & sudo $WLANTEST -i hwsim0 -n $LOGDIR/hwsim0.pcapng -c -d > $LOGDIR/hwsim0 &
sudo tcpdump -ni hwsim0 -s 2500 -w $LOGDIR/hwsim0.dump > $LOGDIR/tcpdump 2>&1 &
for i in 0 1 2; do 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 \ 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 & $(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 & sudo $VALGRIND_HAPD $HAPD -ddKt$TRACE -g /var/run/hostapd-global -G $GROUP -ddKt > $LOGDIR/hostapd &
sleep 1 sleep 1
sudo chown -f $USER $LOGDIR/hwsim0.dump sudo chown -f $USER $LOGDIR/hwsim0.pcapng
if [ "x$VALGRIND" = "xy" ]; then if [ "x$VALGRIND" = "xy" ]; then
sudo chown -f $USER $LOGDIR/*valgrind* sudo chown -f $USER $LOGDIR/*valgrind*
fi fi