Add more nd_print_trunc() calls

Update the output of some tests accordingly.

Moreover:
Add a ndo_protocol field assignment.

diff --git a/print-ap1394.c b/print-ap1394.c
index 4326707f266b1d5ba561a6042c7a11599afee059..d401153c6c25c6313fd49ca1b6da58c0d5ef639c 100644 (file)
--- 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 64f4b78026651fb636f88bdd588c468bbb7687c2..45bb5cc781828a775e46651113b161ce3a6a7d8b 100644 (file)
--- 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 0a505238a01e6ac615a1780f392c8ff1652d452f..4d46c97a1d534e0c7db1a79a1a6aec102c243f0a 100644 (file)
--- 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 8cd04af4adddd465dfa651319fd00adb31040b82..bd3133bb646c0b2dbae1b31f52f93c757790c551 100644 (file)
--- 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 15c15cd3fec7a4be8641a7dbbd5eab1115146520..4d2ea54ce7ce815429ea18a94d3255d87e10f391 100644 (file)
--- 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 f010e90cf0d53b390a3ee6da52c999b3be087c6a..b06e27f0b0ce5ec7949d1716b2dfe62c879e03d0 100644 (file)
--- 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 ca9d053e9a0681aa350930131bef4f52c604613b..5c8f15164912e4be2cbc4ff4c3b160cef92eac7d 100644 (file)
--- 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 d966cb52fcb4fc1cfaae021468698884ce8bd8a9..4ea39234a5c760599d47e198d1871d1000063538 100644 (file)
--- 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 6cc7da7c5530033526d21e3b29ca4677c7172807..c4efd0a5a2c4896961933bed07c56694ab20d3a1 100644 (file)
--- 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 aa8c7ce5c5f57f6a63a930ebc1824a1673a2d130..a868150bac8a448618626c6d1962b2a7eacc39c4 100644 (file)
--- 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 36c353512a960efac7770aeae02ed7f8008c423e..630f6b31603252a454e69e131c25f3d7516c3de6 100644 (file)
--- 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 af8477ef1afef6c9a864098abba8921f7107cc86..d73d92d6a0c856f60345e33b63148110a62e476c 100644 (file)
--- 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 f545d2d5b6e701d5382e1480e7269d6755a980fc..618e93bbcb25d1b764bde88ddbc4c0e9279c973b 100644 (file)
--- 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 cfc981ede915800d6352cf1d9db319de11ac40f0..c6ec3a5350664185765e8d1b43cefbe05f49a2cc 100644 (file)
--- 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 95bcad00ea294c005b17d20ffe1eca57d9042adf..cdcc07accc5ed88759e5abfe4f9f4ccbe7881d7c 100644 (file)
--- 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 ff5cc55a5f4b068697aae22046a29765693559f8..138a8c05c7924a33b28e4431ce74d3976a8ed150 100644 (file)
--- 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 f0fe6013e8c28f25e2788fde78637413409d4c48..a9eb28ef1c83c5e4e0eb851d1fd5c900a069ada4 100644 (file)
--- 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 ed915d06bdf6c4dc22d89d58337277870a5d2370..c2c327402f5da7d9ddc4cf9eafd4802e05c1d7be 100644 (file)
--- 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 c9acd446b2fb82136a8d3615a4a3adea37c56e26..e4f8a08b0d48d61bfe4652bee24fd7af716e7be5 100644 (file)
--- 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 95668f92179a1cd881130c759b896d21e84cf1bb..e7c5019676b63d47de4f92e0e624f16d92a2de97 100644 (file)
--- 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 70b1c6f41d63c4443657ae8481d0b8953eafdbcb..320244296dd179433bdf5e1fa3507e8d4e7fa7e1 100644 (file)
--- 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 11314d7c7f19c35d29cc6089af67d0abe5dceaf6..28713acc73e23a978f7b135219876e86f8e4f8a6 100644 (file)
--- 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 ea476cb58b7aab8a9b1caea3095e7fd0d0c4c7f7..004818362968745f10a9413967bf6a30268de461 100644 (file)
--- 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 a50c063c834dc98d2ed73cb0fef54d8b679cc662..c9ad4de5d9668dc286b195244cd29245de7c93cb 100644 (file)
--- 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 825851da05b9253d6505b51f633591a1286965e6..05ab987b2d8c028d5857ffc50679057bc2b14b77 100644 (file)
--- 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 06e330fc54e6ba337c000e6d0156519bc00bd2cb..5e6dd526cf35b9961dee924b3d43bb4c503a88c5 100644 (file)
--- 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 90eddf4571703719d5a1904f6f8839197e12062e..15a9aff75522f35b7bfd7a09b8567a673006e28a 100644 (file)
--- 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 7e140fb92972f55ce69cfa8c284d0f6976719ee7..1d76613d471bfae58e5d0e81da86fd59839420cd 100644 (file)
--- 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 5aed68427770e00f438cb7a468b78b859f67a48b..88bf8c212a3e8099755e1b88ac5325ed9f2769b9 100644 (file)
--- 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 f0857c2a98a3b64f5f4f00fe1a9ebf49260b1019..e1686d83d468e77e32f054678f6aea91346e1cb3 100644 (file)
--- 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 8d938b445ff3183a13d16b446600af4f2a540731..617cf44725be43e4f77e44ddb0abc8f426e594df 100644 (file)
--- 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 f628f9056d724a6aed5fda73dbcbbdcf4860059c..71f70f0cf1b62a90637ae4b2b959fe3065cc0d3f 100644 (file)
--- 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 c81a2d48a119edc91d19931afbaa5cbad1c7b35b..2718d2ac57a1113a840dc8ce87292409936fc80d 100644 (file)
--- 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 ce12748da260f4da98145cc6a5b34552a5facaad..4ddac1533fbe9d671119e15ac62997feacb126e1 100644 (file)
--- 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 dbabefbfc105674270fcdf9122a4b65eb43a786d..6c55cc514ab931ca9c5e8c8638792edaf152beb8 100644 (file)
--- 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 beb173045bbcafa1beb265bd4000203493dd7a41..c85c514b3bfea01ef8ceca2faefe5eb92acb8564 100644 (file)
--- 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 4a37b7fb371e6740edb3a792722e0d0f1eb002d9..0366987a7146aa71a839e8c87a57d2fc3415239d 100644 (file)
--- 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 7d49dd0e13afb24980ecf8ba6af753aad16e6464..cc7de7daeee70660df4c4f062affe3a30573e444 100644 (file)
--- 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 5701077dba7b2e83d15c197a9dcb7d76e76c9387..148c158079a0b025a068d88002b08b4dd068e2f1 100644 (file)
--- 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 c2d66a066d5ee7da25a89a451913f9edf9b272f9..a12873dc508f9c3464830cb7dc7b228eb6090ec7 100644 (file)
--- 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 61b8e2b1c7a7cd928001ea7beb9752482558b42e..f913db7bbf8fffdd96be6698dc0471a3405174d8 100644 (file)
--- 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 326e57b0263d0dfd60cd220b272381d808106da9..c3cdcef6cb4b26685574715b02dda547a5037edc 100644 (file)
--- 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 d96227f566d683f612558491f274759070751b74..932bd57e59560e6a1f385d29af5f5b6cb890588f 100644 (file)
--- 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 54a78f43b85d8b0819cf40c26a4b27cb7c08aac2..f76d7c71fb0fe0815c19b95c2460a073803bbb8d 100644 (file)
--- 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 2daba4254a10b3627966011c4ae63cd530ae1b48..5bd709c2a38e1686e3894306ee937262413e392c 100644 (file)
--- 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 f9e29e07a22ee7727e4515af262bf7bfbc4ea9ac..5a1aba829478d1763e6b0b3b35915108dc211abd 100644 (file)
--- 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 1da231890b21f1063387a28b773cfce4bf6d92c5..da6ed3541991d944b92aa7235f0a6e19b848c14f 100644 (file)
--- 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 ea01149c575a49c3963204861e64cfd6013038f7..9df469c9087ac93c7932490624a4fb0355507017 100644 (file)
--- 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 646e65d278fa47f94bae9008e041c165ab7fad23..8cd05caa6da44d884218d080901b66112d410660 100644 (file)
--- 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 9effe4f1542acff7e4066e115609a497457554d0..6ff2f1d863a0725260f3fa8c6c8df884cee3bc23 100644 (file)
--- 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 bd0c5c42830025ec287ca6ba8786dd84d706a30f..4514e8f51956e276e3bd6b20be668abff3c83323 100644 (file)
--- 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 dd6ced4a03705815bacc4897ab59b7662fdce057..a38079667b11e5e90a4cd9b159120b5a64311a08 100644 (file)
--- 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]