Add a sanity check on packet header length

The packet length must be <= MAXIMUM_SNAPLEN.

Currently, there is no D-Bus printer, thus no need for a bigger length.

Now a pachet is valid if:
capture length != 0,
packet length != 0,
capture length <= MAXIMUM_SNAPLEN,
packet length <= MAXIMUM_SNAPLEN,
packet length >= capture length.

Moreover:
Fix the packet header lengths of some fuzzed pcap files:
If the lengths are > MAXIMUM_SNAPLEN, set them to MAXIMUM_SNAPLEN.
Thus they will be always usable with this new sanity check.

print.c

@@ -346,6 +346,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 			ND_PRINT(",");
 		ND_PRINT(" caplen(%u) > %u", h->caplen, MAXIMUM_SNAPLEN);
 	}
+	if (h->len > MAXIMUM_SNAPLEN) {
+		if (!invalid_header) {
+			invalid_header = 1;
+			ND_PRINT("[Invalid header:");
+		} else
+			ND_PRINT(",");
+		ND_PRINT(" len(%u) > %u", h->len, MAXIMUM_SNAPLEN);
+	}
 	if (invalid_header) {
 		ND_PRINT("]\n");
 		return;
@@ -356,7 +364,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 *   capture length != 0,
 	 *   packet length != 0,
 	 *   capture length <= MAXIMUM_SNAPLEN,
+	 *   packet length <= MAXIMUM_SNAPLEN,
 	 *   packet length >= capture length.
+	 *
+	 * Currently, there is no D-Bus printer, thus no need for
+	 * bigger lengths.
 	 */
 
 	ts_print(ndo, &h->ts);

tests/arp-too-long-tha.out

@@ -1 +1 @@
-ARP, Unknown Hardware (12336) (len 14), IPv4 (len 4), Request who-has 48.48.48.48 (30:30:30:30:30:30:30:30:30:30:30:30:30:30) tell 48.48.48.48, length 808464414
+ARP, Unknown Hardware (12336) (len 14), IPv4 (len 4), Request who-has 48.48.48.48 (30:30:30:30:30:30:30:30:30:30:30:30:30:30) tell 48.48.48.48, length 262126

tests/decnet-oobr.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030                                0000
 MEDSA 16.6:48: [|decnet]

tests/decnet-shorthdr-oobr.out

@@ -1,29 +1,29 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030                                0000
 [|decnet]

tests/esis_opt_prot-oobr.out

@@ -1,4 +1,4 @@
-ES-IS, length 33559803
+ES-IS, length 262139
 	redirect (6), v: 1, checksum: 0x00c6 (unverified), holding time: 2303s, length indicator: 54
 	  00.8e
 	  SNPA (length: 0): <empty>

tests/esis_snpa_asan-3.out

@@ -1,7 +1,7 @@
 UI 22! ES-IS, length 65565
 	unknown type: 0 (0), v: 1, checksum: 0x00a1 (incorrect should be 0x859d), holding time: 0s, length indicator: 17
 	  0x0000:  0200 04ec ff00 0000
-UI 22! ES-IS, length 2650865693
+UI 22! ES-IS, length 262139
 	redirect (6), v: 1, checksum: 0x0300 (incorrect should be 0xbce5), holding time: 21480s, length indicator: 17
 	  ec.ff00.00
 	  SNPA (length: 0): <empty>[|esis]

tests/esis_snpa_asan-4.out

@@ -13,7 +13,7 @@ UI 32! ES-IS, length 65565
 	  Number of Source Addresses: 2
 	  NET (length: 0): isonsap_string: illegal length
 	  NET (length: 4): ec.ff00.00, bad opts/li
-UI 22! ES-IS, length 4244701213
+UI 22! ES-IS, length 262139
 	redirect (6), v: 1, checksum: 0x7034 (incorrect should be 0x36fe), holding time: 21315s, length indicator: 17
 	  isonsap_string: illegal length
 	  SNPA (length: 0): <empty>

tests/gre-heapoverflow-1.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000

tests/gre-heapoverflow-2.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030                                     00

tests/heapoverflow-ip_print_demux.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030                                     00

tests/heapoverflow-q933_printq.out

@@ -1,2 +1,2 @@
-Q.933, CCITT, codeset 0, unknown message (0x30), length 808464430
+Q.933, CCITT, codeset 0, unknown message (0x30), length 262142
 	unknown IE (0x30), length 48: [|q.933]

tests/hoobr_juniper.out

@@ -1 +1 @@
-[|juniper_hdr], length 808464432
+[|juniper_hdr], length 262144

tests/hoobr_juniper4.out

@@ -1 +1 @@
-[|juniper_hdr], length 808464432
+[|juniper_hdr], length 262144

tests/hoobr_lookup_nsap.out

@@ -1,23 +1,23 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-CLNP, 30.0000.0000.0000 > 30.3030, unknown (16), length 808464417
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+CLNP, 30.0000.0000.0000 > 30.3030, unknown (16), length 262129
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030                           000000
-CLNP, 30.0000.0000.0000 > 30.3030, unknown (16), length 808464417
+CLNP, 30.0000.0000.0000 > 30.3030, unknown (16), length 262129

tests/hoobr_nfs_printfh.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -13,11 +13,11 @@
 	0x00b0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00c0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00d0:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -31,7 +31,7 @@
 	0x00a0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00b0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00c0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -46,7 +46,7 @@
 	0x00b0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00c0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00d0:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -60,7 +60,7 @@
 	0x00a0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00b0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00c0:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -72,7 +72,7 @@
 	0x0080:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0090:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00a0:  3030 3030                                0000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
@@ -86,7 +86,7 @@
 	0x00a0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00b0:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x00c0:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000

tests/hoobr_nfs_xid_map_enter.out

@@ -1,39 +1,39 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0030:  30                                       0
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000

tests/hoobr_parse_field.out

@@ -1,4 +1,4 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0020:  3030                                     00

tests/hoobr_pimv1.out

@@ -1,25 +1,25 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030                      00000000
 IP 48.48.48.48 > 48.48.48.48: igmp pimv1 [type 48][|pim]

tests/hoobr_safeputs.out

@@ -1,2 +1,2 @@
-LLDP, length 808464418: 0000000000
+LLDP, length 262130: 0000000000
 	[|LLDP]

tests/isakmp-rfc3948-oobr.out

@@ -1,67 +1,67 @@
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
-30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 808464432: 
+30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
 	0x0000:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
 	0x0010:  3030 3030 3030 3030 3030 3030            000000000000
 IP 48.48.48.48.4500 > 48.48.48.48.12336: [|isakmp]

tests/isis-extd-isreach-oobr.out

@@ -1,11 +1,11 @@
-OSI NLPID 0xfe unknown, length: 33554428
+OSI NLPID 0xfe unknown, length: 262140
 	0x0000:  fe7f 4a01 0066 0002 00ff ffff f200 0000
 	0x0010:  00c6 0000 007f e6ff 00e6 6800 0000
 unknown CHDLC protocol (0xfafe)
-OSI NLPID 0xfe unknown, length: 33554428
+OSI NLPID 0xfe unknown, length: 262140
 	0x0000:  fe7f 4a01 f165 0002 0000 0000 0000 0000
 	0x0010:  00c6 0000 007f e6ff 00e6 6800 0000
-IS-IS, length 33554427
+IS-IS, length 262139
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 3 (0)
 	  source-id: 3801.0101.0101,  holding time: 257s, Flags: [unknown circuit type 0x00]
 	  lan-id:    0101.0101.0100.00, Priority: 1, PDU length: 257

tests/isis_stlv_asan-2.out

@@ -1,4 +1,4 @@
-UI 22! IS-IS, length 469869187
+UI 22! IS-IS, length 262139
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 224 (224)
 	  source-id: fed0.f90f.58af,  holding time: 34047s, Flags: [unknown circuit type 0x00]
 	  lan-id:    0100.0088.a201.1c, Priority: 65, PDU length: 4096

tests/isis_stlv_asan-3.out

@@ -1,4 +1,4 @@
-UI 22! IS-IS, length 469869187
+UI 22! IS-IS, length 262139
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 224 (224)
 	  source-id: fed0.f90f.58af,  holding time: 34047s, Flags: [unknown circuit type 0x00]
 	  lan-id:    0100.0088.a201.1c, Priority: 65, PDU length: 4096

tests/isis_stlv_asan-4.out

@@ -1,4 +1,4 @@
-UI 22! Pad! IS-IS, length 1644274306
+UI 22! Pad! IS-IS, length 262138
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 224 (224)
 	  source-id: fe02.0000.d0f9,  holding time: 3928s, Flags: [unknown circuit type 0x00]
 	  lan-id:    1000.4101.0000.88, Priority: 127, PDU length: 44959

tests/isis_stlv_asan.out

@@ -1,4 +1,4 @@
-UI 22! IS-IS, length 469869187
+UI 22! IS-IS, length 262139
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 224 (224)
 	  source-id: fed0.f90f.58af,  holding time: 34047s, Flags: [unknown circuit type 0x00]
 	  lan-id:    0105.0088.a201.00, Priority: 65, PDU length: 4096

tests/isis_sysid_asan.out

@@ -1,4 +1,4 @@
-UI 22! IS-IS, length 469869187
+UI 22! IS-IS, length 262139
 	L2 Lan IIH, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 224 (224)
 	  source-id: fed0.f90f.58af,  holding time: 34047s, Flags: [unknown circuit type 0x00]
 	  lan-id:    0105.0088.a204.00, Priority: 65, PDU length: 4096

tests/isoclns-heapoverflow-2.out

@@ -1 +1 @@
-fe:fe:fe:fe:fe:fe > 30:30:da:fe:fe:fe, ethertype OSI (0xfefe), length 808464432: OSI NLPID CLNP (0x81): [|clnp]
+fe:fe:fe:fe:fe:fe > 30:30:da:fe:fe:fe, ethertype OSI (0xfefe), length 262144: OSI NLPID CLNP (0x81): [|clnp]

tests/isoclns-heapoverflow-3.out

@@ -1 +1 @@
-fe:fe:fe:fe:fe:fe > 30:30:da:fe:fe:fe, ethertype OSI (0xfefe), length 808464432: OSI NLPID CLNP (0x81): 00 > e8.3030, Echo Request, length 808464417
+fe:fe:fe:fe:fe:fe > 30:30:da:fe:fe:fe, ethertype OSI (0xfefe), length 262144: OSI NLPID CLNP (0x81): 00 > e8.3030, Echo Request, length 262129