adjustment to output file, and added relevant stderr file

45 files changed, 54 insertions, 8 deletions

diff --git a/tests/cve2015-0261-ipv6.out b/tests/cve2015-0261-ipv6.out
index 3658c198..3c8da0f8 100644
--- a/tests/cve2015-0261-ipv6.out
+++ b/tests/cve2015-0261-ipv6.out
@@ -1,3 +1,4 @@
 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]
 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
index 00000000..7b04defa
--- /dev/null
+++ b/tests/cve2015-0261-ipv6.out.stderr
@@ -0,0 +1,2 @@
+reading from file cve2015-0261-ipv6.pcap, link-type SLIP (SLIP)
+tcpdump: pcap_loop: invalid packet capture length 268463617, bigger than snaplen of 65535
diff --git a/tests/kday1.out b/tests/kday1.out
index e8c3e25a..a1a28fca 100644
--- a/tests/kday1.out
+++ b/tests/kday1.out
@@ -1,2 +1,3 @@
 IP6, wrong link-layer encapsulation 
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kday2.out b/tests/kday2.out
index e0979b85..df791fed 100644
--- a/tests/kday2.out
+++ b/tests/kday2.out
@@ -19,4 +19,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kday3.out b/tests/kday3.out
index 7d2c2db4..386315de 100644
--- a/tests/kday3.out
+++ b/tests/kday3.out
@@ -17,4 +17,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kday4.out b/tests/kday4.out
index d034fcc1..92146ff8 100644
--- a/tests/kday4.out
+++ b/tests/kday4.out
@@ -30,4 +30,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kday5.out b/tests/kday5.out
index 88249ef6..4caaca07 100644
--- a/tests/kday5.out
+++ b/tests/kday5.out
@@ -19,4 +19,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kday6.out b/tests/kday6.out
index cc78c191..25210dbf 100644
--- a/tests/kday6.out
+++ b/tests/kday6.out
@@ -347,4 +347,5 @@ FRF.16 Frag, seq 693, Flags [Begin], UI e8! IS-IS, length 301989913
 	    unknown TLV #58, length: 58
 		0x0000:  3a3a 3a3a 3a3a 3a3a 3a3a 3a3a 3a3a 3a3a
 		0x0010:  3a3a 3a [|isis]
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kday7.out b/tests/kday7.out
index 48028727..c7701b99 100644
--- a/tests/kday7.out
+++ b/tests/kday7.out
@@ -30,4 +30,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kday8.out b/tests/kday8.out
index 0eb0dabb..8ae0fd2b 100644
--- a/tests/kday8.out
+++ b/tests/kday8.out
@@ -19,4 +19,5 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, b
 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: dump:0 code: 1
diff --git a/tests/kh-addrfail-001.out b/tests/kh-addrfail-001.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-001.out
+++ b/tests/kh-addrfail-001.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-001.out.stderr b/tests/kh-addrfail-001.out.stderr
new file mode 100644
index 00000000..b73633e9
--- /dev/null
+++ b/tests/kh-addrfail-001.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 3929026596 bytes, only got 0
diff --git a/tests/kh-addrfail-002.out b/tests/kh-addrfail-002.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-002.out
+++ b/tests/kh-addrfail-002.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-002.out.stderr b/tests/kh-addrfail-002.out.stderr
new file mode 100644
index 00000000..c59d7fd1
--- /dev/null
+++ b/tests/kh-addrfail-002.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 4281348132 bytes, only got 0
diff --git a/tests/kh-addrfail-003.out b/tests/kh-addrfail-003.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-003.out
+++ b/tests/kh-addrfail-003.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-003.out.stderr b/tests/kh-addrfail-003.out.stderr
new file mode 100644
index 00000000..a654069f
--- /dev/null
+++ b/tests/kh-addrfail-003.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 3794808868 bytes, only got 0
diff --git a/tests/kh-addrfail-004.out b/tests/kh-addrfail-004.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-004.out
+++ b/tests/kh-addrfail-004.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-004.out.stderr b/tests/kh-addrfail-004.out.stderr
new file mode 100644
index 00000000..f725d42c
--- /dev/null
+++ b/tests/kh-addrfail-004.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 2150641700 bytes, only got 0
diff --git a/tests/kh-addrfail-005.out b/tests/kh-addrfail-005.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-005.out
+++ b/tests/kh-addrfail-005.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-005.out.stderr b/tests/kh-addrfail-005.out.stderr
new file mode 100644
index 00000000..cb4ee0bf
--- /dev/null
+++ b/tests/kh-addrfail-005.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 1680879652 bytes, only got 0
diff --git a/tests/kh-addrfail-006.out b/tests/kh-addrfail-006.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-006.out
+++ b/tests/kh-addrfail-006.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-006.out.stderr b/tests/kh-addrfail-006.out.stderr
new file mode 100644
index 00000000..bebfb27a
--- /dev/null
+++ b/tests/kh-addrfail-006.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 2905616420 bytes, only got 0
diff --git a/tests/kh-addrfail-007.out b/tests/kh-addrfail-007.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-007.out
+++ b/tests/kh-addrfail-007.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-007.out.stderr b/tests/kh-addrfail-007.out.stderr
new file mode 100644
index 00000000..6b146657
--- /dev/null
+++ b/tests/kh-addrfail-007.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 3710922788 bytes, only got 0
diff --git a/tests/kh-addrfail-008.out b/tests/kh-addrfail-008.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-008.out
+++ b/tests/kh-addrfail-008.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-008.out.stderr b/tests/kh-addrfail-008.out.stderr
new file mode 100644
index 00000000..e3873eb0
--- /dev/null
+++ b/tests/kh-addrfail-008.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 808464420 bytes, only got 0
diff --git a/tests/kh-addrfail-009.out b/tests/kh-addrfail-009.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-009.out
+++ b/tests/kh-addrfail-009.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-009.out.stderr b/tests/kh-addrfail-009.out.stderr
new file mode 100644
index 00000000..249bc8a6
--- /dev/null
+++ b/tests/kh-addrfail-009.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 1932537892 bytes, only got 0
diff --git a/tests/kh-addrfail-010.out b/tests/kh-addrfail-010.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-010.out
+++ b/tests/kh-addrfail-010.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-010.out.stderr b/tests/kh-addrfail-010.out.stderr
new file mode 100644
index 00000000..6fdad5aa
--- /dev/null
+++ b/tests/kh-addrfail-010.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 1915760676 bytes, only got 0
diff --git a/tests/kh-addrfail-011.out b/tests/kh-addrfail-011.out
index c8370f94..562d0bca 100644
--- a/tests/kh-addrfail-011.out
+++ b/tests/kh-addrfail-011.out
@@ -1 +1,2 @@
+
 EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/kh-addrfail-011.out.stderr b/tests/kh-addrfail-011.out.stderr
new file mode 100644
index 00000000..ea3214ee
--- /dev/null
+++ b/tests/kh-addrfail-011.out.stderr
@@ -0,0 +1 @@
+tcpdump: truncated dump file; tried to read 4046467108 bytes, only got 0
diff --git a/tests/kh-tcpdump-003.out b/tests/kh-tcpdump-003.out
deleted file mode 100644
index 5edcddac..00000000
--- a/tests/kh-tcpdump-003.out
+++ /dev/null
@@ -1 +0,0 @@
-EXIT CODE 00000100
diff --git a/tests/l2tp-avp-overflow.out b/tests/l2tp-avp-overflow.out
index a3b1db2d..5b80d989 100644
--- a/tests/l2tp-avp-overflow.out
+++ b/tests/l2tp-avp-overflow.out
@@ -36,4 +36,5 @@ IP (tos 0x30, ttl 48, id 12331, offset 0, flags [none], proto UDP (17), length 8
     127.0.0.229.12416 > 127.236.0.1.1701:  l2tp:[TL](560/2056) VENDOR0001:ATTR0023(0530) |...
 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 1f51 (->2a8b)!)
     127.0.0.229.12416 > 127.236.0.1.1701:  l2tp:[TL](560/2056) VENDOR0080:ATTR06a5(19e8) |...
-EXIT CODE 00000100
+
+EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/l2tp-avp-overflow.out.stderr b/tests/l2tp-avp-overflow.out.stderr
new file mode 100644
index 00000000..4c7db916
--- /dev/null
+++ b/tests/l2tp-avp-overflow.out.stderr
@@ -0,0 +1,2 @@
+reading from file l2tp-avp-overflow.pcap, link-type EN10MB (Ethernet)
+tcpdump: pcap_loop: invalid packet capture length 2147430448, bigger than snaplen of 58
diff --git a/tests/pcap-invalid-version-1.out b/tests/pcap-invalid-version-1.out
index 5edcddac..562d0bca 100644
--- a/tests/pcap-invalid-version-1.out
+++ b/tests/pcap-invalid-version-1.out
@@ -1 +1,2 @@
-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
index 00000000..1036edb5
--- /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 5edcddac..562d0bca 100644
--- a/tests/pcap-invalid-version-2.out
+++ b/tests/pcap-invalid-version-2.out
@@ -1 +1,2 @@
-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
index 00000000..4171b8ee
--- /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 5edcddac..562d0bca 100644
--- a/tests/pcapng-invalid-vers-1.out
+++ b/tests/pcapng-invalid-vers-1.out
@@ -1 +1,2 @@
-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
index 00000000..42138492
--- /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 5edcddac..562d0bca 100644
--- a/tests/pcapng-invalid-vers-2.out
+++ b/tests/pcapng-invalid-vers-2.out
@@ -1 +1,2 @@
-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
index 00000000..48456521
--- /dev/null
+++ b/tests/pcapng-invalid-vers-2.out.stderr
@@ -0,0 +1 @@
+tcpdump: unsupported pcapng savefile version 1.1
diff --git a/tests/pktap-heap-overflow.out b/tests/pktap-heap-overflow.out
index e23ed919..d3a600e0 100644
--- a/tests/pktap-heap-overflow.out
+++ b/tests/pktap-heap-overflow.out
@@ -1,3 +1,4 @@
 [|pktap]
 [|ppp]
-EXIT CODE 00000100
+
+EXIT CODE 00000100: dump:0 code: 1
diff --git a/tests/pktap-heap-overflow.out.stderr b/tests/pktap-heap-overflow.out.stderr
new file mode 100644
index 00000000..38f484cb
--- /dev/null
+++ b/tests/pktap-heap-overflow.out.stderr
@@ -0,0 +1,2 @@
+reading from file pktap-heap-overflow.pcap, link-type 149
+tcpdump: pcap_loop: invalid packet capture length 4076008178, bigger than snaplen of 1024