updated a few test cases to include stderr failure output

diff --git a/tests/cve2015-0261-ipv6.out b/tests/cve2015-0261-ipv6.out
index e86ba0237c9425a20d94ea39355aff690e1a28cd..4186c7acfd701b0c5a8f7a4c0a21005c300f46e0 100644 (file)
--- a/tests/cve2015-0261-ipv6.out
+++ b/tests/cve2015-0261-ipv6.out
@@ -1,3 +1,3 @@
     1  13:55:31.300000 IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:6767:6767:6767:6767:6767:6705: mobility: BU seq#=26471 HL lifetime=105884(type-0x67: len=103) [|mobility]
     2  15:21:11.300000 IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:4f67:6767:6767:6767:6767:6767: (header length 8 is too small for type 6) [|mobility]
     1  13:55:31.300000 IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:6767:6767:6767:6767:6767:6705: mobility: BU seq#=26471 HL lifetime=105884(type-0x67: len=103) [|mobility]
     2  15:21:11.300000 IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:4f67:6767:6767:6767:6767:6767: (header length 8 is too small for type 6) [|mobility]

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/cve2015-0261-ipv6.out.stderr b/tests/cve2015-0261-ipv6.out.stderr
new file mode 100644 (file)
index 0000000..b43e7cc
--- /dev/null
+++ b/tests/cve2015-0261-ipv6.out.stderr
@@ -0,0 +1,2 @@
+reading from file cve2015-0261-ipv6.pcap, link-type SLIP (SLIP), snapshot length 65535
+tcpdump: pcap_loop: invalid packet capture length 268463617, bigger than snaplen of 65535

diff --git a/tests/dsa-e.out.stderr b/tests/dsa-e.out.stderr
new file mode 100644 (file)
index 0000000..8f3253f
--- /dev/null
+++ b/tests/dsa-e.out.stderr
@@ -0,0 +1 @@
+reading from file dsa.pcap, link-type DSA_TAG_DSA (Marvell DSA), snapshot length 262144

diff --git a/tests/edsa-e.out.stderr b/tests/edsa-e.out.stderr
new file mode 100644 (file)
index 0000000..6fa5856
--- /dev/null
+++ b/tests/edsa-e.out.stderr
@@ -0,0 +1 @@
+reading from file edsa.pcap, link-type DSA_TAG_EDSA (Marvell EDSA), snapshot length 262144

diff --git a/tests/edsa.out.stderr b/tests/edsa.out.stderr
new file mode 100644 (file)
index 0000000..6fa5856
--- /dev/null
+++ b/tests/edsa.out.stderr
@@ -0,0 +1 @@
+reading from file edsa.pcap, link-type DSA_TAG_EDSA (Marvell EDSA), snapshot length 262144

diff --git a/tests/kday1.out b/tests/kday1.out
index 2ce02ba9efbfc9f0671be85fdc8cc982f6aa4f1c..b9884d5e59d35bbab2271caaa956d0222a0aeb53 100644 (file)
--- a/tests/kday1.out
+++ b/tests/kday1.out
@@ -1,2 +1,2 @@
     1  10:23:33.663606 IP6, wrong link-layer encapsulation (invalid)
     1  10:23:33.663606 IP6, wrong link-layer encapsulation (invalid)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday1.out.stderr b/tests/kday1.out.stderr
new file mode 100644 (file)
index 0000000..12a5471
--- /dev/null
+++ b/tests/kday1.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday1.pcap, link-type EN10MB (Ethernet), snapshot length 65535
+tcpdump: pcap_loop: invalid packet capture length 138952731, bigger than snaplen of 65535

diff --git a/tests/kday2.out b/tests/kday2.out
index 19561b982c7dcde683fcb226b3d022517068e741..436959ec60cb898e4ff03217d22aa596da4daf03 100644 (file)
--- a/tests/kday2.out
+++ b/tests/kday2.out
@@ -19,4 +19,4 @@
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday2.out.stderr b/tests/kday2.out.stderr
new file mode 100644 (file)
index 0000000..adf29cd
--- /dev/null
+++ b/tests/kday2.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday2.pcap, link-type EN10MB (Ethernet), snapshot length 65535
+tcpdump: pcap_loop: truncated dump file; tried to read 16 header bytes, only got 3

diff --git a/tests/kday3.out b/tests/kday3.out
index e87f4d2a43c1cdcd74196480001de7c6db562b5d..124cd7e9d8994d8f6cb141fe19fca0024bee9081 100644 (file)
--- a/tests/kday3.out
+++ b/tests/kday3.out
@@ -17,4 +17,4 @@
     9  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
     9  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday3.out.stderr b/tests/kday3.out.stderr
new file mode 100644 (file)
index 0000000..f457753
--- /dev/null
+++ b/tests/kday3.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday3.pcap, link-type EN10MB (Ethernet), snapshot length 65535
+tcpdump: pcap_loop: invalid packet capture length 1817495761, bigger than snaplen of 65535

diff --git a/tests/kday4.out b/tests/kday4.out
index b42d4f3b2b233bece3c6809b9739277f30770eab..08d5af5bd34a7bc3828615235229db32f6424d33 100644 (file)
--- a/tests/kday4.out
+++ b/tests/kday4.out
@@ -30,4 +30,4 @@
    13  17:19:33.703113 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
    13  17:19:33.703113 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday4.out.stderr b/tests/kday4.out.stderr
new file mode 100644 (file)
index 0000000..3e7e5d8
--- /dev/null
+++ b/tests/kday4.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday4.pcap, link-type EN10MB (Ethernet), snapshot length 511
+tcpdump: pcap_loop: truncated dump file; tried to read 16 header bytes, only got 1

diff --git a/tests/kday5.out b/tests/kday5.out
index 5891f47e74880362ac5537cb1f77ccb3afafc894..781877960c7cdd81d924e6e509c612eb972e5c77 100644 (file)
--- a/tests/kday5.out
+++ b/tests/kday5.out
@@ -19,4 +19,4 @@
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday5.out.stderr b/tests/kday5.out.stderr
new file mode 100644 (file)
index 0000000..af4f4c9
--- /dev/null
+++ b/tests/kday5.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday5.pcap, link-type EN10MB (Ethernet), snapshot length 65535
+tcpdump: pcap_loop: invalid packet capture length 168430090, bigger than snaplen of 65535

diff --git a/tests/kday7.out b/tests/kday7.out
index 8570abd1f34de6edbf3aa17aefcde23213d4d7cd..dda23419a7356801395d09761416c83f47682576 100644 (file)
--- a/tests/kday7.out
+++ b/tests/kday7.out
@@ -30,4 +30,4 @@
    13  17:19:33.703113 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x4ba9), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
    13  17:19:33.703113 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x4ba9), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday7.out.stderr b/tests/kday7.out.stderr
new file mode 100644 (file)
index 0000000..d98f264
--- /dev/null
+++ b/tests/kday7.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday7.pcap, link-type EN10MB (Ethernet), snapshot length 511
+tcpdump: pcap_loop: invalid packet capture length 138948798, bigger than snaplen of 511

diff --git a/tests/kday8.out b/tests/kday8.out
index 65a4e6dadaecaff4902586f400322fb57bad42d4..1aab4b128439dec8a0de3d32742522849aaa8a17 100644 (file)
--- a/tests/kday8.out
+++ b/tests/kday8.out
@@ -19,4 +19,4 @@
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xed9b), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)
     5  17:19:33.703625 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
     204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xed9b), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
        RPKI-RTRv177 (unknown)

-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/kday8.out.stderr b/tests/kday8.out.stderr
new file mode 100644 (file)
index 0000000..d7a880f
--- /dev/null
+++ b/tests/kday8.out.stderr
@@ -0,0 +1,2 @@
+reading from file kday8.pcap, link-type EN10MB (Ethernet), snapshot length 65535
+tcpdump: pcap_loop: truncated dump file; tried to read 16 header bytes, only got 3

diff --git a/tests/pcap-invalid-version-1.out b/tests/pcap-invalid-version-1.out
index 5edcddacaf741b95b9b17a64189663cb227cc60a..c8370f9416f4bb2e15b94989bcc8087842d6acfe 100644 (file)
--- a/tests/pcap-invalid-version-1.out
+++ b/tests/pcap-invalid-version-1.out
@@ -1 +1 @@
-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/pcap-invalid-version-1.out.stderr b/tests/pcap-invalid-version-1.out.stderr
new file mode 100644 (file)
index 0000000..1036edb
--- /dev/null
+++ b/tests/pcap-invalid-version-1.out.stderr
@@ -0,0 +1 @@
+tcpdump: archaic pcap savefile format

diff --git a/tests/pcap-invalid-version-2.out b/tests/pcap-invalid-version-2.out
index 5edcddacaf741b95b9b17a64189663cb227cc60a..c8370f9416f4bb2e15b94989bcc8087842d6acfe 100644 (file)
--- a/tests/pcap-invalid-version-2.out
+++ b/tests/pcap-invalid-version-2.out
@@ -1 +1 @@
-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/pcap-invalid-version-2.out.stderr b/tests/pcap-invalid-version-2.out.stderr
new file mode 100644 (file)
index 0000000..4171b8e
--- /dev/null
+++ b/tests/pcap-invalid-version-2.out.stderr
@@ -0,0 +1 @@
+tcpdump: unsupported pcap savefile version 2.5

diff --git a/tests/pcapng-invalid-vers-1.out b/tests/pcapng-invalid-vers-1.out
index 5edcddacaf741b95b9b17a64189663cb227cc60a..c8370f9416f4bb2e15b94989bcc8087842d6acfe 100644 (file)
--- a/tests/pcapng-invalid-vers-1.out
+++ b/tests/pcapng-invalid-vers-1.out
@@ -1 +1 @@
-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/pcapng-invalid-vers-1.out.stderr b/tests/pcapng-invalid-vers-1.out.stderr
new file mode 100644 (file)
index 0000000..4213849
--- /dev/null
+++ b/tests/pcapng-invalid-vers-1.out.stderr
@@ -0,0 +1 @@
+tcpdump: unsupported pcapng savefile version 0.1

diff --git a/tests/pcapng-invalid-vers-2.out b/tests/pcapng-invalid-vers-2.out
index 5edcddacaf741b95b9b17a64189663cb227cc60a..c8370f9416f4bb2e15b94989bcc8087842d6acfe 100644 (file)
--- a/tests/pcapng-invalid-vers-2.out
+++ b/tests/pcapng-invalid-vers-2.out
@@ -1 +1 @@
-EXIT CODE 00000100
+EXIT CODE 00000100: dump:0 code: 1

diff --git a/tests/pcapng-invalid-vers-2.out.stderr b/tests/pcapng-invalid-vers-2.out.stderr
new file mode 100644 (file)
index 0000000..4845652
--- /dev/null
+++ b/tests/pcapng-invalid-vers-2.out.stderr
@@ -0,0 +1 @@
+tcpdump: unsupported pcapng savefile version 1.1