diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-10-08 22:24:46 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-10-08 22:24:46 +0000 |
| commit | e70c6303e12c69a2b339aa8d17811bcf5512da72 (patch) | |
| tree | 16aa471340a868731023445f8479bf26f1bf264f | |
| parent | ed0cf1e0bb1f9b5bd617547e0381b1b11f482d1c (diff) | |
change the binary path to current windows debug dir: wireshark-gtk2
don't use promiscuous mode as default (my Win32 WLAN card won't capture any packets with it - might probably be better for other users as well)
svn path=/trunk/; revision=19455
| -rw-r--r-- | test/config.sh | 7 | ||||
| -rw-r--r-- | test/suite-capture.sh | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/test/config.sh b/test/config.sh index b103d2829c..8881c7d7fb 100644 --- a/test/config.sh +++ b/test/config.sh @@ -24,7 +24,7 @@ # # path to the Wireshark binaries, only used for the settings below -ETH_BIN_PATH=../Debug_GTK2 +ETH_BIN_PATH=../wireshark-gtk2 # Tweak the following to your liking. WIRESHARK=$ETH_BIN_PATH/wireshark @@ -40,3 +40,8 @@ TRAFFIC_CAPTURE_IFACE=2 # time to capture some traffic (in seconds) # (you may increase this if you get errors caused by very low traffic) TRAFFIC_CAPTURE_DURATION=3 + +# the default is to not capture in promiscuous mode +# (this makes known trouble with some Windows WLAN adapters) +# if you need promiscuous mode, comment this line out +TRAFFIC_CAPTURE_PROMISC=-p
\ No newline at end of file diff --git a/test/suite-capture.sh b/test/suite-capture.sh index 0fc4d9fe90..e91e439942 100644 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -32,7 +32,7 @@ EXIT_ERROR=2 # capture exactly 10 packets capture_step_10packets() { - $DUT -i $TRAFFIC_CAPTURE_IFACE -w ./testout.pcap -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 + $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC -w ./testout.pcap -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "exit status of $DUT: $RETURNVALUE" @@ -65,7 +65,7 @@ capture_step_10packets() { # capture exactly 10 packets using "-w -" (piping to stdout) capture_step_10packets_stdout() { - $DUT -i $TRAFFIC_CAPTURE_IFACE -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION -w - > ./testout.pcap 2>./testout.txt + $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION -w - > ./testout.pcap 2>./testout.txt RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "exit status of $DUT: $RETURNVALUE" @@ -95,7 +95,7 @@ capture_step_10packets_stdout() { # capture exactly 2 times 10 packets (multiple files) capture_step_2multi_10packets() { - $DUT -i $TRAFFIC_CAPTURE_IFACE -w ./testout.pcap -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 + $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC -w ./testout.pcap -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "exit status of $DUT: $RETURNVALUE" @@ -126,7 +126,7 @@ capture_step_2multi_10packets() { # capture with a very unlikely read filter, packets must be zero afterwards capture_step_read_filter() { # valid, but very unlikely filter - $DUT -i $TRAFFIC_CAPTURE_IFACE -w ./testout.pcap -a duration:$TRAFFIC_CAPTURE_DURATION -R 'dcerpc.cn_call_id==123456' -c 10 > ./testout.txt 2>&1 + $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC -w ./testout.pcap -a duration:$TRAFFIC_CAPTURE_DURATION -R 'dcerpc.cn_call_id==123456' -c 10 > ./testout.txt 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "exit status: $RETURNVALUE" @@ -156,7 +156,7 @@ capture_step_read_filter() { capture_step_snapshot() { # capture with a snapshot length of 68 bytes for $TRAFFIC_CAPTURE_DURATION seconds # this should result in no packets - $DUT -i $TRAFFIC_CAPTURE_IFACE -w ./testout.pcap -s 68 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 + $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC -w ./testout.pcap -s 68 -a duration:$TRAFFIC_CAPTURE_DURATION > ./testout.txt 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "exit status: $RETURNVALUE" |