Add more nd_print_trunc() calls

Update the output of some tests accordingly.

Moreover:
Add a ndo_protocol field assignment.

52 files changed, 95 insertions, 94 deletions

diff --git a/print-ap1394.c b/print-ap1394.c
index 4326707f..d401153c 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -96,7 +96,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 
 	ndo->ndo_protocol = "ap1394_if";
 	if (caplen < FIREWIRE_HDRLEN) {
-		ND_PRINT("[|ap1394]");
+		nd_print_trunc(ndo);
 		return FIREWIRE_HDRLEN;
 	}
 
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 64f4b780..45bb5cc7 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -64,6 +64,6 @@ calm_fast_print(netdissect_options *ndo, const u_char *bp, u_int length, const s
 	return;
 
 trunc:
-	ND_PRINT("[|calm fast]");
+	nd_print_trunc(ndo);
 	return;
 }
diff --git a/print-carp.c b/print-carp.c
index 0a505238..4d46c97a 100644
--- a/print-carp.c
+++ b/print-carp.c
@@ -80,5 +80,5 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl)
 
 	return;
 trunc:
-	ND_PRINT("[|carp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-chdlc.c b/print-chdlc.c
index 8cd04af4..bd3133bb 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -113,7 +113,7 @@ chdlc_print(netdissect_options *ndo, const u_char *p, u_int length)
 	return (CHDLC_HDRLEN);
 
 trunc:
-	ND_PRINT("[|chdlc]");
+	nd_print_trunc(ndo);
 	return ndo->ndo_snapend - bp;
 }
 
@@ -147,6 +147,7 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
 	const struct cisco_slarp *slarp;
         u_int sec,min,hrs,days;
 
+	ndo->ndo_protocol = "chdlc_slarp";
 	ND_PRINT("SLARP (length: %u), ",length);
 	if (length < SLARP_MIN_LEN)
 		goto trunc;
@@ -201,5 +202,5 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
 	return;
 
 trunc:
-	ND_PRINT("[|slarp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-cip.c b/print-cip.c
index 15c15cd3..4d2ea54c 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -75,7 +75,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		cip_print(ndo, length);
 
 	if (cmplen == 0) {
-		ND_PRINT("[|cip]");
+		nd_print_trunc(ndo);
 		return 0;
 	}
 	if (memcmp(rfcllc, p, cmplen) == 0) {
diff --git a/print-cnfp.c b/print-cnfp.c
index f010e90c..b06e27f0 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -246,7 +246,7 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 	return;
 
 trunc:
-	ND_PRINT("[|cnfp]");
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -349,7 +349,7 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 	return;
 
 trunc:
-	ND_PRINT("[|cnfp]");
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -455,7 +455,7 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 	return;
 
 trunc:
-	ND_PRINT("[|cnfp]");
+	nd_print_trunc(ndo);
 	return;
 }
 
@@ -491,6 +491,6 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
 	return;
 
 trunc:
-	ND_PRINT("[|cnfp]");
+	nd_print_trunc(ndo);
 	return;
 }
diff --git a/print-dhcp6.c b/print-dhcp6.c
index ca9d053e..5c8f1516 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -778,7 +778,7 @@ dhcp6opt_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dhcp6ext]");
+	nd_print_trunc(ndo);
 }
 
 /*
@@ -835,5 +835,5 @@ dhcp6_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dhcp6]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-domain.c b/print-domain.c
index d966cb52..4ea39234 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -777,5 +777,5 @@ domain_print(netdissect_options *ndo,
 	return;
 
   trunc:
-	ND_PRINT("[|domain]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-dvmrp.c b/print-dvmrp.c
index 6cc7da7c..c4efd0a5 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -157,7 +157,7 @@ dvmrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dvmrp]");
+	nd_print_trunc(ndo);
 	return;
 }
 
diff --git a/print-egp.c b/print-egp.c
index aa8c7ce5..a868150b 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -258,7 +258,7 @@ egp_print(netdissect_options *ndo,
 	ndo->ndo_protocol = "egp";
 	egp = (const struct egp_packet *)bp;
 	if (length < sizeof(*egp) || !ND_TTEST_SIZE(egp)) {
-		ND_PRINT("[|egp]");
+		nd_print_trunc(ndo);
 		return;
 	}
 
diff --git a/print-enc.c b/print-enc.c
index 36c35351..630f6b31 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -105,7 +105,7 @@ enc_if_print(netdissect_options *ndo,
 
 	ndo->ndo_protocol = "enc_if";
 	if (caplen < ENC_HDRLEN) {
-		ND_PRINT("[|enc]");
+		nd_print_trunc(ndo);
 		goto out;
 	}
 
diff --git a/print-fddi.c b/print-fddi.c
index af8477ef..d73d92d6 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -284,7 +284,7 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 
 	ndo->ndo_protocol = "fddi";
 	if (caplen < FDDI_HDRLEN) {
-		ND_PRINT("[|fddi]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 
diff --git a/print-frag6.c b/print-frag6.c
index f545d2d5..618e93bb 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -66,6 +66,6 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 		return sizeof(struct ip6_frag);
 	}
 trunc:
-	ND_PRINT("[|frag]");
+	nd_print_trunc(ndo);
 	return -1;
 }
diff --git a/print-geneve.c b/print-geneve.c
index cfc981ed..c6ec3a53 100644
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -234,5 +234,5 @@ geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
     return;
 
 trunc:
-    ND_PRINT(" [|geneve]");
+    nd_print_trunc(ndo);
 }
diff --git a/print-geonet.c b/print-geonet.c
index 95bcad00..cdcc07ac 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -275,5 +275,5 @@ invalid:
 	return;
 
 trunc:
-	ND_PRINT("[|geonet]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-hsrp.c b/print-hsrp.c
index ff5cc55a..138a8c05 100644
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -135,5 +135,5 @@ hsrp_print(netdissect_options *ndo, const u_char *bp, u_int len)
 	}
 	return;
 trunc:
-	ND_PRINT("[|hsrp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-igrp.c b/print-igrp.c
index f0fe6013..a9eb28ef 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -152,5 +152,5 @@ igrp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	if (nint == 0 && nsys == 0 && next == 0)
 		return;
 trunc:
-	ND_PRINT(" [|igrp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-ipx.c b/print-ipx.c
index ed915d06..c2c32740 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -223,7 +223,7 @@ ipx_sap_print(netdissect_options *ndo, const u_char *ipx, u_int length)
     }
     return;
 trunc:
-    ND_PRINT("[|ipx]");
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -266,5 +266,5 @@ ipx_rip_print(netdissect_options *ndo, const u_char *ipx, u_int length)
     }
     return;
 trunc:
-    ND_PRINT("[|ipx]");
+    nd_print_trunc(ndo);
 }
diff --git a/print-lane.c b/print-lane.c
index c9acd446..e4f8a08b 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -86,7 +86,7 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 
 	ndo->ndo_protocol = "lane";
 	if (caplen < sizeof(struct lane_controlhdr)) {
-		ND_PRINT("[|lane]");
+		nd_print_trunc(ndo);
 		return;
 	}
 
diff --git a/print-llc.c b/print-llc.c
index 95668f92..e7c50196 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -157,12 +157,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 
 	ndo->ndo_protocol = "llc";
 	if (caplen < 3) {
-		ND_PRINT("[|llc]");
+		nd_print_trunc(ndo);
 		ND_DEFAULTPRINT((const u_char *)p, caplen);
 		return (caplen);
 	}
 	if (length < 3) {
-		ND_PRINT("[|llc]");
+		nd_print_trunc(ndo);
 		ND_DEFAULTPRINT((const u_char *)p, caplen);
 		return (length);
 	}
@@ -189,12 +189,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 		 * 2 bytes...
 		 */
 		if (caplen < 4) {
-			ND_PRINT("[|llc]");
+			nd_print_trunc(ndo);
 			ND_DEFAULTPRINT((const u_char *)p, caplen);
 			return (caplen);
 		}
 		if (length < 4) {
-			ND_PRINT("[|llc]");
+			nd_print_trunc(ndo);
 			ND_DEFAULTPRINT((const u_char *)p, caplen);
 			return (length);
 		}
@@ -368,14 +368,14 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 				return (hdrlen);
 			}
 			if (caplen < 1) {
-				ND_PRINT("[|llc]");
+				nd_print_trunc(ndo);
 				if (caplen > 0)
 					ND_DEFAULTPRINT((const u_char *)p, caplen);
 				return (hdrlen);
 			}
 			if (EXTRACT_U_1(p) == LLC_XID_FI) {
 				if (caplen < 3 || length < 3) {
-					ND_PRINT("[|llc]");
+					nd_print_trunc(ndo);
 					if (caplen > 0)
 						ND_DEFAULTPRINT((const u_char *)p, caplen);
 				} else
@@ -605,6 +605,6 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	return (0);
 
 trunc:
-	ND_PRINT("[|snap]");
+	nd_print_trunc(ndo);
 	return (1);
 }
diff --git a/print-lwres.c b/print-lwres.c
index 70b1c6f4..32024429 100644
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -602,5 +602,5 @@ lwres_print(netdissect_options *ndo,
 	return;
 
   trunc:
-	ND_PRINT("[|lwres]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-mobile.c b/print-mobile.c
index 11314d7c..28713acc 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -74,7 +74,7 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	mob = (const struct mobile_ip *)bp;
 
 	if (length < MOBILE_SIZE || !ND_TTEST_SIZE(mob)) {
-		ND_PRINT("[|mobile]");
+		nd_print_trunc(ndo);
 		return;
 	}
 	ND_PRINT("mobile: ");
diff --git a/print-msdp.c b/print-msdp.c
index ea476cb5..00481836 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -96,5 +96,5 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 	}
 	return;
 trunc:
-	ND_PRINT(" [|msdp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-olsr.c b/print-olsr.c
index a50c063c..c9ad4de5 100644
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -712,5 +712,5 @@ olsr_print(netdissect_options *ndo,
     return;
 
  trunc:
-    ND_PRINT("[|olsr]");
+    nd_print_trunc(ndo);
 }
diff --git a/print-pktap.c b/print-pktap.c
index 825851da..05ab987b 100644
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -108,7 +108,7 @@ pktap_if_print(netdissect_options *ndo,
 
 	ndo->ndo_protocol = "pktap_if";
 	if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
-		ND_PRINT("[|pktap]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 	hdr = (const pktap_header_t *)p;
@@ -122,11 +122,11 @@ pktap_if_print(netdissect_options *ndo,
 		 * is the length supplied so that the header can
 		 * be expanded in the future)?
 		 */
-		ND_PRINT("[|pktap]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 	if (caplen < hdrlen || length < hdrlen) {
-		ND_PRINT("[|pktap]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 
diff --git a/print-pppoe.c b/print-pppoe.c
index 06e330fc..5e6dd526 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -198,6 +198,6 @@ pppoe_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	}
 
 trunc:
-	ND_PRINT("[|pppoe]");
+	nd_print_trunc(ndo);
 	return (PPPOE_HDRLEN);
 }
diff --git a/print-ripng.c b/print-ripng.c
index 90eddf45..15a9aff7 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -183,6 +183,6 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 	return;
 
 trunc:
-	ND_PRINT("[|ripng]");
+	nd_print_trunc(ndo);
 	return;
 }
diff --git a/print-rrcp.c b/print-rrcp.c
index 7e140fb9..1d76613d 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -142,5 +142,5 @@ rrcp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|rrcp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-sctp.c b/print-sctp.c
index 5aed6842..88bf8c21 100644
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -768,5 +768,5 @@ sctp_print(netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("[|sctp]");
+    nd_print_trunc(ndo);
 }
diff --git a/print-sunatm.c b/print-sunatm.c
index f0857c2a..e1686d83 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -71,7 +71,7 @@ sunatm_if_print(netdissect_options *ndo,
 
 	ndo->ndo_protocol = "sunatm_if";
 	if (caplen < PKT_BEGIN_POS) {
-		ND_PRINT("[|atm]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 
diff --git a/print-symantec.c b/print-symantec.c
index 8d938b44..617cf447 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -79,7 +79,7 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
 
 	ndo->ndo_protocol = "symantec_if";
 	if (caplen < sizeof (struct symantec_header)) {
-		ND_PRINT("[|symantec]");
+		nd_print_trunc(ndo);
 		return caplen;
 	}
 
diff --git a/print-vrrp.c b/print-vrrp.c
index f628f905..71f70f0c 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -180,5 +180,5 @@ vrrp_print(netdissect_options *ndo,
 	}
 	return;
 trunc:
-	ND_PRINT("[|vrrp]");
+	nd_print_trunc(ndo);
 }
diff --git a/print-vtp.c b/print-vtp.c
index c81a2d48..2718d2ac 100644
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -394,5 +394,5 @@ vtp_print(netdissect_options *ndo,
     return;
 
  trunc:
-    ND_PRINT("[|vtp]");
+    nd_print_trunc(ndo);
 }
diff --git a/tests/dns-zlip-1.out b/tests/dns-zlip-1.out
index ce12748d..4ddac153 100644
--- a/tests/dns-zlip-1.out
+++ b/tests/dns-zlip-1.out
@@ -1 +1 @@
-IP 10.0.0.1.1024 > 146.84.28.88.53: 60777 Type49159 (Class 49168)? <BAD PTR>[|domain]
+IP 10.0.0.1.1024 > 146.84.28.88.53: 60777 Type49159 (Class 49168)? <BAD PTR> [|domain]
diff --git a/tests/dns-zlip-2.out b/tests/dns-zlip-2.out
index dbabefbf..6c55cc51 100644
--- a/tests/dns-zlip-2.out
+++ b/tests/dns-zlip-2.out
@@ -1 +1 @@
-IP 10.0.0.1.1024 > 146.84.28.88.53: 18992 Type49164 (Class 49168)? <BAD PTR>[|domain]
+IP 10.0.0.1.1024 > 146.84.28.88.53: 18992 Type49164 (Class 49168)? <BAD PTR> [|domain]
diff --git a/tests/dns-zlip-3.out b/tests/dns-zlip-3.out
index beb17304..c85c514b 100644
--- a/tests/dns-zlip-3.out
+++ b/tests/dns-zlip-3.out
@@ -1 +1 @@
-IP 10.0.0.1.1024 > 146.84.28.88.53: 65483 Type49164 (Class 49164)? thisleetostringwillcrashyourlittlenameserverforsurehahahahahah.<BAD PTR>[|domain]
+IP 10.0.0.1.1024 > 146.84.28.88.53: 65483 Type49164 (Class 49164)? thisleetostringwillcrashyourlittlenameserverforsurehahahahahah.<BAD PTR> [|domain]
diff --git a/tests/dns_fwdptr.out b/tests/dns_fwdptr.out
index 4a37b7fb..0366987a 100644
--- a/tests/dns_fwdptr.out
+++ b/tests/dns_fwdptr.out
@@ -1,2 +1,2 @@
 be:af:ca:ce:ff:ff > de:ad:be:ef:00:01, ethertype IPv4 (0x0800), length 63207: (tos 0x0, ttl 128, id 36039, offset 0, flags [none], proto UDP (17), length 63193)
-    156.118.17.235.53 > 156.118.27.229.500: [udp sum ok] 51584 zoneRef NoChange*|$ [64259q] q: Type507 (Class 769)? M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{ .M-{^C^A.<BAD PTR>[|domain]
+    156.118.17.235.53 > 156.118.27.229.500: [udp sum ok] 51584 zoneRef NoChange*|$ [64259q] q: Type507 (Class 769)? M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{^C.M-{.^AM-{ .M-{^C^A.<BAD PTR> [|domain]
diff --git a/tests/geonet-mac-lookup-heapoverflow.out b/tests/geonet-mac-lookup-heapoverflow.out
index 7d49dd0e..cc7de7da 100644
--- a/tests/geonet-mac-lookup-heapoverflow.out
+++ b/tests/geonet-mac-lookup-heapoverflow.out
@@ -1 +1 @@
-GeoNet src:30:30:30:30:30:30; v:3 NH:0-Any HT:3-0-GeoAnycastCircle HopLim:48 Payload:12336 [|geonet]
+GeoNet src:30:30:30:30:30:30; v:3 NH:0-Any HT:3-0-GeoAnycastCircle HopLim:48 Payload:12336  [|geonet]
diff --git a/tests/hoobr_chdlc_print.out b/tests/hoobr_chdlc_print.out
index 5701077d..148c1580 100644
--- a/tests/hoobr_chdlc_print.out
+++ b/tests/hoobr_chdlc_print.out
@@ -23,4 +23,4 @@ unknown CHDLC protocol (0x3030)
 unknown CHDLC protocol (0x3030)
 unknown CHDLC protocol (0x3030)
 unknown CHDLC protocol (0x3030)
-[|chdlc]
+ [|chdlc]
diff --git a/tests/hoobr_ripng_print.out b/tests/hoobr_ripng_print.out
index c2d66a06..a12873dc 100644
--- a/tests/hoobr_ripng_print.out
+++ b/tests/hoobr_ripng_print.out
@@ -1 +1 @@
-IP 48.48.48.48.521 > 48.48.48.48.12336: [|ripng]
+IP 48.48.48.48.521 > 48.48.48.48.12336:  [|ripng]
diff --git a/tests/hsrp_1-v.out b/tests/hsrp_1-v.out
index 61b8e2b1..f913db7b 100644
--- a/tests/hsrp_1-v.out
+++ b/tests/hsrp_1-v.out
@@ -13,7 +13,7 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -33,21 +33,21 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-coup 20: state=listen group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -93,9 +93,9 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
diff --git a/tests/hsrp_1.out b/tests/hsrp_1.out
index 326e57b0..c3cdcef6 100644
--- a/tests/hsrp_1.out
+++ b/tests/hsrp_1.out
@@ -5,7 +5,7 @@ IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 ad
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1
-IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
@@ -15,14 +15,14 @@ IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 ad
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1
-IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
-IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
-IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
+IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-coup 20: state=listen group=1 addr=192.168.0.1
-IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
-IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
-IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
+IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
+IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
@@ -45,7 +45,7 @@ IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 ad
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
-IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
-IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+IP 192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
+IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP 192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1
 IP 192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1
diff --git a/tests/hsrp_2-v.out b/tests/hsrp_2-v.out
index d96227f5..932bd57e 100644
--- a/tests/hsrp_2-v.out
+++ b/tests/hsrp_2-v.out
@@ -7,23 +7,23 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+    192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -63,13 +63,13 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
diff --git a/tests/hsrp_3-v.out b/tests/hsrp_3-v.out
index 54a78f43..f76d7c71 100644
--- a/tests/hsrp_3-v.out
+++ b/tests/hsrp_3-v.out
@@ -1,7 +1,7 @@
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -15,7 +15,7 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.10.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=200 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -29,11 +29,11 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=speak group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3 [|hsrp]
+    192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=3  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
@@ -73,6 +73,6 @@ IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=standby group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 44)
-    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2 [|hsrp]
+    192.168.0.20.1985 > 224.0.0.2.1985: HSRPv0-unknown (3) 16: state=initial group=2  [|hsrp]
 IP (tos 0xc0, ttl 1, id 0, offset 0, flags [none], proto UDP (17), length 48)
     192.168.0.30.1985 > 224.0.0.2.1985: HSRPv0-hello 20: state=active group=1 addr=192.168.0.1 hellotime=3s holdtime=10s priority=100 auth="cisco^@^@^@"
diff --git a/tests/ip6_frag_asan.out b/tests/ip6_frag_asan.out
index 2daba425..5bd709c2 100644
--- a/tests/ip6_frag_asan.out
+++ b/tests/ip6_frag_asan.out
@@ -1 +1 @@
-IP6 (class 0x51, flowlabel 0xb2100, hlim 16, next-header Fragment (44) payload length: 27136) 452:22:19:0:41a:e4ff:10ff:484d > 2243:80:1400:100:19:ffff:ffff:fffb: [|frag]
+IP6 (class 0x51, flowlabel 0xb2100, hlim 16, next-header Fragment (44) payload length: 27136) 452:22:19:0:41a:e4ff:10ff:484d > 2243:80:1400:100:19:ffff:ffff:fffb:  [|frag6]
diff --git a/tests/llc-xid-heapoverflow.out b/tests/llc-xid-heapoverflow.out
index f9e29e07..5a1aba82 100644
--- a/tests/llc-xid-heapoverflow.out
+++ b/tests/llc-xid-heapoverflow.out
@@ -1 +1 @@
-Unknown DSAP 0x30 Unnumbered, xid, Flags [Poll], length 262124[|llc]
+Unknown DSAP 0x30 Unnumbered, xid, Flags [Poll], length 262124 [|llc]
diff --git a/tests/olsr-oobr-1.out b/tests/olsr-oobr-1.out
index 1da23189..da6ed354 100644
--- a/tests/olsr-oobr-1.out
+++ b/tests/olsr-oobr-1.out
@@ -1,7 +1,7 @@
 IP truncated-ip - 2315 bytes missing! (tos 0x0, ttl 18, id 4111, offset 0, flags [+, DF, rsvd], proto UDP (17), length 5373, bad cksum 8e7f (->9764)!)
     15.251.128.192.698 > 193.192.186.0.122: OLSRv4, seq 0x0800, length 2056
 	Nameservice Message (0x82), originator 126.198.193.192, ttl 26, hop 145
-	  vtime 0.062s, msg-seq 0x0008, length 127[|olsr]
+	  vtime 0.062s, msg-seq 0x0008, length 127 [|olsr]
 IP truncated-ip - 2315 bytes missing! (tos 0x0, ttl 18, id 4111, offset 0, flags [+, DF, rsvd], proto UDP (17), length 5373, bad cksum 8e7f (->975f)!)
     16.0.128.192.698 > 193.192.186.0.122: OLSRv4, seq 0x0400, length 512
 	Powerinfo Message (0x80), originator 0.1.0.0, ttl 255, hop 255
@@ -9,8 +9,8 @@ IP truncated-ip - 2315 bytes missing! (tos 0x0, ttl 18, id 4111, offset 0, flags
 IP truncated-ip - 2315 bytes missing! (tos 0x0, ttl 18, id 4111, offset 0, flags [+, DF, rsvd], proto UDP (17), length 5373, bad cksum 8e7f (->9764)!)
     15.251.128.192.698 > 193.192.186.0.122: OLSRv4, seq 0x0800, length 2056
 	Nameservice Message (0x82), originator 126.198.193.192, ttl 26, hop 145
-	  vtime 0.062s, msg-seq 0x0008, length 100[|olsr]
+	  vtime 0.062s, msg-seq 0x0008, length 100 [|olsr]
 IP truncated-ip - 2315 bytes missing! (tos 0x0, ttl 18, id 4111, offset 0, flags [+, DF, rsvd], proto UDP (17), length 5373, bad cksum 8e7f (->975f)!)
     16.0.128.192.698 > 193.192.186.0.122: OLSRv4, seq 0x0800, length 2056
 	Nameservice Message (0x82), originator 126.198.193.192, ttl 26, hop 145
-	  vtime 0.062s, msg-seq 0x5c50, length 185[|olsr]
+	  vtime 0.062s, msg-seq 0x5c50, length 185 [|olsr]
diff --git a/tests/olsr-oobr-2.out b/tests/olsr-oobr-2.out
index ea01149c..9df469c9 100644
--- a/tests/olsr-oobr-2.out
+++ b/tests/olsr-oobr-2.out
@@ -1,3 +1,3 @@
 [Invalid header: caplen==0]
 [Invalid header: caplen==0]
-IP6 (flowlabel 0x06400, hlim 0, next-header UDP (17) payload length: 5401) 0:24::1e:a0a:141e.698 > 38fd:7f49:eaff:ffff:2025:7373:7562:2573.2: OLSRv6, seq 0x0201, length 5393[|olsr]
+IP6 (flowlabel 0x06400, hlim 0, next-header UDP (17) payload length: 5401) 0:24::1e:a0a:141e.698 > 38fd:7f49:eaff:ffff:2025:7373:7562:2573.2: OLSRv6, seq 0x0201, length 5393 [|olsr]
diff --git a/tests/pktap-heap-overflow.out b/tests/pktap-heap-overflow.out
index 646e65d2..8cd05caa 100644
--- a/tests/pktap-heap-overflow.out
+++ b/tests/pktap-heap-overflow.out
@@ -1,2 +1,2 @@
-[|pktap]
+ [|pktap_if]
 [|ppp]
diff --git a/tests/vtp_asan-2.out b/tests/vtp_asan-2.out
index 9effe4f1..6ff2f1d8 100644
--- a/tests/vtp_asan-2.out
+++ b/tests/vtp_asan-2.out
@@ -1,2 +1,2 @@
 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0, Config Rev fb499603[|vtp]
+	Domain name: , Seq number: 0, Config Rev fb499603 [|vtp]
diff --git a/tests/vtp_asan-3.out b/tests/vtp_asan-3.out
index bd0c5c42..4514e8f5 100644
--- a/tests/vtp_asan-3.out
+++ b/tests/vtp_asan-3.out
@@ -1,2 +1,2 @@
 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0, Config Rev 4040404[|vtp]
+	Domain name: , Seq number: 0, Config Rev 4040404 [|vtp]
diff --git a/tests/vtp_asan.out b/tests/vtp_asan.out
index dd6ced4a..a3807966 100644
--- a/tests/vtp_asan.out
+++ b/tests/vtp_asan.out
@@ -1,5 +1,5 @@
 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0[|vtp]
+	Domain name: , Seq number: 0 [|vtp]
 [Invalid header: caplen==0]
 [Invalid header: caplen==0, len==0]
 [Invalid header: caplen==0, len==0]