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.

diff --git a/tests/TESTLIST b/tests/TESTLIST
index ab96c8dbf98f3329928d683865c5d53ff3c1f7a1..1e115b6c46978f6963917a49f68641384d341544 100644 (file)
--- 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 a3a948c1e1bc169787ab0f8ac01e2f494d0abaa0..41e4ea51d3fe6bce9f130e3531ce74b692c7053f 100644 (file)
--- 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 (file)
index 0000000..b9b65ea
--- /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 b9b65ea1ec126196e9ed589badc1f96096857867..b5f7b37779dde6109650f4ac7b5a6588a1cf878c 100644 (file)
--- 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)