summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2023-04-10 00:46:57 -0700
committerGuy Harris <gharris@sonic.net>2023-04-10 00:46:57 -0700
commitb81d83a1bdaef105fb27df928d0451c4690e1835 (patch)
treee77486989c369788180f9e7c218add63a4ad69bc
parent0a31117de8448684b86408fbe639aa398fe7316c (diff)
downloadtcpdump-b81d83a1bdaef105fb27df928d0451c4690e1835.tar.gz
tests: wccp_redirect_gre.pcap contains SMB, so it needs two tests.
Have separate .out files for dissection of wccp_redirect_gre.pcap with, and without, SMB dissection enabled in tcpdump.
-rw-r--r--tests/TESTLIST3
-rw-r--r--tests/smb.tests17
-rw-r--r--tests/wccp_redirect_gre-nosmb.out4
-rw-r--r--tests/wccp_redirect_gre.out2
4 files changed, 22 insertions, 4 deletions
diff --git a/tests/TESTLIST b/tests/TESTLIST
index ab96c8db..1e115b6c 100644
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -904,6 +904,3 @@ gquic gquic.pcap gquic.out -v
# GRE keepalives, CDP over GRE
various_gre various_gre.pcap various_gre.out -v
-
-# WCCP redirect over GRE
-wccp_redirect_gre wccp_redirect_gre.pcap wccp_redirect_gre.out -v
diff --git a/tests/smb.tests b/tests/smb.tests
index a3a948c1..41e4ea51 100644
--- a/tests/smb.tests
+++ b/tests/smb.tests
@@ -135,6 +135,23 @@ $testlist = [
args => '-vv',
},
+# WCCP redirect over GRE
+ {
+ config_set => 'ENABLE_SMB',
+ name => 'wccp_redirect_gre',
+ input => 'wccp_redirect_gre.pcap',
+ output => 'wccp_redirect_gre.out',
+ args => '-v',
+ },
+
+ {
+ config_unset => 'ENABLE_SMB',
+ name => 'wccp_redirect_gre-nosmb',
+ input => 'wccp_redirect_gre.pcap',
+ output => 'wccp_redirect_gre-nosmb.out',
+ args => '-v',
+ },
+
];
1;
diff --git a/tests/wccp_redirect_gre-nosmb.out b/tests/wccp_redirect_gre-nosmb.out
new file mode 100644
index 00000000..b9b65ea1
--- /dev/null
+++ b/tests/wccp_redirect_gre-nosmb.out
@@ -0,0 +1,4 @@
+ 1 08:50:26.794117 IP (tos 0x0, ttl 253, id 44163, offset 0, flags [none], proto GRE (47), length 268)
+ 10.254.127.194 > 10.254.214.82: GREv0, Flags [none], length 248
+ wccp T:0 A:0 U:0 SId:89 Alt:0 Pri:72: IP (tos 0x0, ttl 64, id 37140, offset 0, flags [DF], proto TCP (6), length 240)
+ 10.254.127.195.1291 > 10.254.108.228.445: Flags [P.], cksum 0x2909 (correct), seq 2206441866:2206442054, ack 1426770077, win 63887, options [nop,nop,TS val 40478 ecr 28035935], length 188
diff --git a/tests/wccp_redirect_gre.out b/tests/wccp_redirect_gre.out
index b9b65ea1..b5f7b377 100644
--- a/tests/wccp_redirect_gre.out
+++ b/tests/wccp_redirect_gre.out
@@ -1,4 +1,4 @@
1 08:50:26.794117 IP (tos 0x0, ttl 253, id 44163, offset 0, flags [none], proto GRE (47), length 268)
10.254.127.194 > 10.254.214.82: GREv0, Flags [none], length 248
wccp T:0 A:0 U:0 SId:89 Alt:0 Pri:72: IP (tos 0x0, ttl 64, id 37140, offset 0, flags [DF], proto TCP (6), length 240)
- 10.254.127.195.1291 > 10.254.108.228.445: Flags [P.], cksum 0x2909 (correct), seq 2206441866:2206442054, ack 1426770077, win 63887, options [nop,nop,TS val 40478 ecr 28035935], length 188
+ 10.254.127.195.1291 > 10.254.108.228.445: Flags [P.], cksum 0x2909 (correct), seq 2206441866:2206442054, ack 1426770077, win 63887, options [nop,nop,TS val 40478 ecr 28035935], length 188 SMB PACKET: SMBtrans (REQUEST)