diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-12-11 16:30:39 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-12-12 01:52:54 +0000 |
commit | 4454fb02c7d37803d99c9a1228db35b2c8f75220 (patch) | |
tree | 9514c1598c843e2485bc77c7ef58d38885a8a822 | |
parent | b8b77aecc38f8ada88de78939e4d35d0fa535bd4 (diff) |
Ping on Windows isn't necessarily IPv4-only.
The default prefix policy on modern versions of Windows prefers IPv6.
This in combination with the fact that our ping target (www.wireshark.org)
currently has both A and AAAA records might result in ICMPv6 traffic
instead of ICMPv4. Update the capture test suite accordingly.
Change-Id: I5c88f24fb9458526ffd44c5003f09247b6999ce7
Reviewed-on: https://code.wireshark.org/review/12553
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rwxr-xr-x | test/suite-capture.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh index 5720fdd7f7..f4ed96f9f7 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -89,7 +89,7 @@ capture_step_10packets() { -w ./testout.pcap \ -c 10 \ -a duration:$TRAFFIC_CAPTURE_DURATION \ - -f icmp \ + -f "icmp || icmp6" \ >> ./testout.txt 2>&1 RETURNVALUE=$? date >> ./testout.txt @@ -140,7 +140,7 @@ capture_step_10packets_stdout() { -c 10 \ -a duration:$TRAFFIC_CAPTURE_DURATION \ -w - \ - -f icmp \ + -f "icmp || icmp6" \ > ./testout.pcap 2>>./testout.txt RETURNVALUE=$? date >> ./testout.txt @@ -274,7 +274,7 @@ capture_step_2multi_10packets() { -w ./testout.pcap \ -c 10 \ -a duration:$TRAFFIC_CAPTURE_DURATION \ - -f icmp \ + -f "icmp || icmp6" \ >> ./testout.txt 2>&1 RETURNVALUE=$? @@ -323,7 +323,7 @@ capture_step_read_filter() { -a duration:$TRAFFIC_CAPTURE_DURATION \ -2 -R 'dcerpc.cn_call_id==123456' \ -c 10 \ - -f icmp \ + -f "icmp || icmp6" \ >> ./testout.txt 2>&1 RETURNVALUE=$? date >> ./testout.txt @@ -372,7 +372,7 @@ capture_step_snapshot() { -w ./testout.pcap \ -s 68 \ -a duration:$TRAFFIC_CAPTURE_DURATION \ - -f icmp \ + -f "icmp || icmp6" \ >> ./testout.txt 2>&1 RETURNVALUE=$? date >> ./testout.txt |