Print truncations with nd_print_trunc() instead of tstr[] strings

Remove the tstr[] strings.
Update the output of some tests accordingly.

Moreover:
Add or update some ndo_protocol fields.

diff --git a/print-802_11.c b/print-802_11.c
index e61581dd45df0d900ddc672f38b852fb965fab8b..c82387592b73175789018453ce0386979674126f 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -2004,7 +2004,6 @@ ieee_802_11_hdr_print(netdissect_options *ndo,
 #define        roundup2(x, y)  (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
 #endif
 
-static const char tstr[] = "[|802.11]";
 
 static u_int
 ieee802_11_print(netdissect_options *ndo,
@@ -2020,7 +2019,7 @@ ieee802_11_print(netdissect_options *ndo,
        caplen = orig_caplen;
        /* Remove FCS, if present */
        if (length < fcslen) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
        length -= fcslen;
@@ -2032,7 +2031,7 @@ ieee802_11_print(netdissect_options *ndo,
        }
 
        if (caplen < IEEE802_11_FC_LEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return orig_caplen;
        }
 
@@ -2052,7 +2051,7 @@ ieee802_11_print(netdissect_options *ndo,
                meshdrlen = 0;
 
        if (caplen < hdrlen) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return hdrlen;
        }
 
@@ -2072,13 +2071,13 @@ ieee802_11_print(netdissect_options *ndo,
        case T_MGMT:
                get_mgmt_src_dst_mac(p - hdrlen, &src.addr, &dst.addr);
                if (!mgmt_body_print(ndo, fc, src.addr, p, length)) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                break;
        case T_CTRL:
                if (!ctrl_body_print(ndo, fc, p - hdrlen)) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                break;
@@ -2089,7 +2088,7 @@ ieee802_11_print(netdissect_options *ndo,
                if (FC_PROTECTED(fc)) {
                        ND_PRINT("Data");
                        if (!wep_print(ndo, p)) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                } else {
@@ -3007,7 +3006,7 @@ print_radiotap_field(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return rc;
 }
 
@@ -3084,7 +3083,7 @@ ieee802_11_radio_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "802.11_radio";
        if (caplen < sizeof(*hdr)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
@@ -3096,7 +3095,7 @@ ieee802_11_radio_print(netdissect_options *ndo,
         * If we don't have the entire radiotap header, just give up.
         */
        if (caplen < len) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
        cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */
@@ -3109,7 +3108,7 @@ ieee802_11_radio_print(netdissect_options *ndo,
 
        /* are there more bitmap extensions than bytes in header? */
        if ((const u_char*)(last_presentp + 1) > p + len) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
@@ -3205,27 +3204,27 @@ ieee802_11_radio_print(netdissect_options *ndo,
                        bit0 = 0;
                        vendor_namespace = 1;
                        if ((cpack_align_and_reserve(&cpacker, 2)) == NULL) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        if (cpack_uint8(&cpacker, &vendor_oui[0]) != 0) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        if (cpack_uint8(&cpacker, &vendor_oui[1]) != 0) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        if (cpack_uint8(&cpacker, &vendor_oui[2]) != 0) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        if (cpack_uint8(&cpacker, &vendor_subnamespace) != 0) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        if (cpack_uint16(&cpacker, &skip_length) != 0) {
-                               ND_PRINT("%s", tstr);
+                               nd_print_trunc(ndo);
                                break;
                        }
                        break;
@@ -3262,7 +3261,7 @@ ieee802_11_radio_avs_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "802.11_radio_avs";
        if (caplen < 8) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
@@ -3273,12 +3272,12 @@ ieee802_11_radio_avs_print(netdissect_options *ndo,
                 * to be large enough to include even the version
                 * cookie or capture header length!
                 */
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
        if (caplen < caphdr_len) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
@@ -3315,7 +3314,7 @@ prism_if_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "prism_if";
        if (caplen < 4) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 
@@ -3325,7 +3324,7 @@ prism_if_print(netdissect_options *ndo,
                return ieee802_11_radio_avs_print(ndo, p, length, caplen);
 
        if (caplen < PRISM_HDR_LEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return caplen;
        }
 

diff --git a/print-ahcp.c b/print-ahcp.c
index 9ac7de05c7c7e072d3f104c35eccccb4516784fb..0f6a49f1301a58727f24b9813814366dde00d209 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -39,7 +39,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|ahcp]";
 
 #define AHCP_MAGIC_NUMBER 43
 #define AHCP_VERSION_1 1
@@ -121,7 +120,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -139,7 +138,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -163,7 +162,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -187,7 +186,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -211,7 +210,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -235,7 +234,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -296,7 +295,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -341,7 +340,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -408,5 +407,5 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-aoe.c b/print-aoe.c
index 03ca3164dacd59cf2ac2df76eeb66bcb15ec1a5d..c7c564bb3834cdcbe8440a38dad992adb51b0bf3 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -39,7 +39,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|aoe]";
 
 #define AOE_V1 1
 #define ATA_SECTOR_SIZE 512
@@ -199,7 +198,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -248,7 +247,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -299,7 +298,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -334,7 +333,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /* cp points to the Ver/Flags octet */
@@ -392,7 +391,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -425,6 +424,6 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 

diff --git a/print-arp.c b/print-arp.c
index af553b40ed7c851051e528e0ff1f660a49550c32..034a0566f5796d9e2e1cbf458e878c195314fc08 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -34,7 +34,6 @@
 #include "ethertype.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ARP]";
 
 /*
  * Address Resolution Protocol.
@@ -266,7 +265,7 @@ atmarp_print(netdissect_options *ndo,
        op = ATMOP(ap);
 
        if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
@@ -349,7 +348,7 @@ atmarp_print(netdissect_options *ndo,
         return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -386,7 +385,7 @@ arp_print(netdissect_options *ndo,
        }
 
        if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
@@ -469,5 +468,5 @@ arp_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-atalk.c b/print-atalk.c
index 7398b15dcb6b4c944fb569a92d1c5bdca6f48e98..6e1c3503d5e112603d5a7c951be2c5122902ac23 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -36,7 +36,6 @@
 #include "extract.h"
 #include "appletalk.h"
 
-static const char tstr[] = "[|atalk]";
 
 static const struct tok type2str[] = {
        { ddpRTMP,              "rtmp" },
@@ -289,7 +288,7 @@ atp_print(netdissect_options *ndo,
 
        if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {
                /* Just bail if we don't have the whole chunk. */
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        if (length < sizeof(*ap)) {
@@ -433,7 +432,7 @@ nbp_print(netdissect_options *ndo,
        /* ep points to end of available data */
        ep = ndo->ndo_snapend;
        if ((const u_char *)tp > ep) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        control = EXTRACT_U_1(np->control);
@@ -443,7 +442,7 @@ nbp_print(netdissect_options *ndo,
        case nbpLkUp:
                ND_PRINT(i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id));
                if ((const u_char *)(tp + 1) > ep) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return;
                }
                (void)nbp_name_print(ndo, tp, ep);
@@ -487,7 +486,7 @@ print_cstring(netdissect_options *ndo,
        u_int length;
 
        if (cp >= (const char *)ep) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (0);
        }
        length = EXTRACT_U_1(cp);
@@ -500,7 +499,7 @@ print_cstring(netdissect_options *ndo,
        }
        while (length != 0) {
                if (cp >= (const char *)ep) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return (0);
                }
                fn_print_char(ndo, EXTRACT_U_1(cp));
@@ -518,7 +517,7 @@ nbp_tuple_print(netdissect_options *ndo,
        const struct atNBPtuple *tpn;
 
        if ((const u_char *)(tp + 1) > ep) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return 0;
        }
        tpn = nbp_name_print(ndo, tp, ep);

diff --git a/print-atm.c b/print-atm.c
index 22acd73f755474ae49f9185b83d51356e23e4610..01194d05ee5181cf55ca45a0b3b11c6114fa1531 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -123,7 +123,6 @@
 
 /* end of the original atmuni31.h */
 
-static const char tstr[] = "[|atm]";
 
 #define OAM_CRC10_MASK 0x3ff
 #define OAM_PAYLOAD_LEN 48
@@ -255,7 +254,7 @@ atm_if_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "atm_if";
        if (caplen < 1 || length < 1) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -272,7 +271,7 @@ atm_if_print(netdissect_options *ndo,
         * control field.
         */
        if (caplen < 3 || length < 3) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -304,7 +303,7 @@ atm_if_print(netdissect_options *ndo,
                 * new DLT_IEEE802_6 value if we added it?
                 */
                if (caplen < 20 || length < 20) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return (caplen);
                }
                if (ndo->ndo_eflag)
@@ -376,7 +375,7 @@ sig_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -552,6 +551,6 @@ oam_print (netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("[|oam]");
+    nd_print_trunc(ndo);
     return;
 }

diff --git a/print-babel.c b/print-babel.c
index 9f2ecf106da2b81d6fc1058f3ec283ee34f93024..cb4e90b27d1e54c6ba7ff0d0f8a79825ba0e9030 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -41,7 +41,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = "[|babel]";
 
 static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length);
 
@@ -73,7 +72,7 @@ babel_print(netdissect_options *ndo,
     return;
 
  trunc:
-    ND_PRINT(" %s", tstr);
+    nd_print_trunc(ndo);
     return;
 }
 
@@ -449,7 +448,7 @@ babel_print_v2(netdissect_options *ndo,
                 ae = EXTRACT_U_1(message + 2);
                 rc = network_address(ae, message + 8,
                                      len - 6, address);
-                if(rc < 0) { ND_PRINT("%s", tstr); break; }
+                if(rc < 0) { nd_print_trunc(ndo); break; }
                 ND_PRINT("%s rxcost %u interval %s",
                        ae == 0 ? "any" : format_address(ndo, address),
                        rxcost, format_interval(interval));
@@ -729,7 +728,7 @@ babel_print_v2(netdissect_options *ndo,
     return;
 
  trunc:
-    ND_PRINT(" %s", tstr);
+    nd_print_trunc(ndo);
     return;
 
  invalid:

diff --git a/print-bootp.c b/print-bootp.c
index 78d0d2fe9f213df489a381948d8a92a2458211bd..fcd4d87b56867e90f2a105a340d7d97ac31efa87 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -33,7 +33,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|bootp]";
 
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
@@ -364,7 +363,7 @@ bootp_print(netdissect_options *ndo,
                if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
                                ndo->ndo_snapend)) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
@@ -375,7 +374,7 @@ bootp_print(netdissect_options *ndo,
                if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
                                ndo->ndo_snapend)) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
@@ -399,7 +398,7 @@ bootp_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -1083,7 +1082,7 @@ cmu_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 #undef PRINTCMUADDR

diff --git a/print-bt.c b/print-bt.c
index f8a0a565f6164207acad07527bb8d9bec04ae51a..049a0e781e50181e39f9c3aab0c946b80742df08 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -31,7 +31,6 @@
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
 #include <pcap/bluetooth.h>
 
-static const char tstr[] = " [|bt]";
 
 #define        BT_HDRLEN sizeof(pcap_bluetooth_h4_header)
 /*
@@ -62,7 +61,7 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
                ND_DEFAULTPRINT(p, caplen);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return (BT_HDRLEN);
 }
 #endif

diff --git a/print-cdp.c b/print-cdp.c
index d77bf2cb7a66d4486105364c148ea4f6ae6a6c27..79d7046c7367c0ca41b72bf1c7ae25fe23655f35 100644 (file)
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -39,7 +39,6 @@
 #include "extract.h"
 #include "nlpid.h"
 
-static const char tstr[] = "[|cdp]";
 
 #define CDP_HEADER_LEN             4
 #define CDP_HEADER_VERSION_OFFSET  0
@@ -99,7 +98,7 @@ cdp_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "cdp";
        if (caplen < CDP_HEADER_LEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
 
@@ -279,7 +278,7 @@ cdp_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*

diff --git a/print-cfm.c b/print-cfm.c
index 8b3e3e002b05477a84f1aeceb2815f699b56e56b..943e41b05ab0fbab5af084f4483d5721f990dbc9 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -31,7 +31,6 @@
 #include "oui.h"
 #include "af.h"
 
-static const char tstr[] = " [|cfm]";
 
 struct cfm_common_header_t {
     nd_uint8_t mdlevel_version;
@@ -767,5 +766,5 @@ tooshort:
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-dccp.c b/print-dccp.c
index a717b166d01bee53f1b7c3936f1294bf6c140632..11c6d750a370a04cbdcfc8b308bbc58fe3ed7276 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -161,7 +161,6 @@ enum dccp_reset_codes {
        __DCCP_RESET_CODE_LAST
 };
 
-static const char tstr[] = "[|dccp]";
 
 static const char *dccp_reset_codes[] = {
        "unspecified",
@@ -514,7 +513,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }
 
@@ -662,6 +661,6 @@ static u_int dccp_print_option(netdissect_options *ndo, const u_char *option, u_
 
        return optlen;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return 0;
 }

diff --git a/print-decnet.c b/print-decnet.c
index 6f68feb8ad6e2c82b5f7e4d6731cbd2070656204..d1220327e74d5bab8893c6790c700ca93662f9c2 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -54,7 +54,6 @@ struct dn_naddr {
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = "[|decnet]";
 
 #ifndef _WIN32
 typedef nd_uint8_t byte;               /* single byte field */
@@ -509,18 +508,18 @@ decnet_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "decnet";
        if (length < sizeof(struct shorthdr)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
 
        ND_TCHECK_LEN(ap, sizeof(short));
        pktlen = EXTRACT_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        if (pktlen > length) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        length = pktlen;
@@ -535,7 +534,7 @@ decnet_print(netdissect_options *ndo,
            if (ndo->ndo_vflag)
                ND_PRINT("[pad:%u] ", padlen);
            if (length < padlen + 2) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
            }
            ND_TCHECK_LEN(ap + sizeof(short), padlen);
@@ -563,7 +562,7 @@ decnet_print(netdissect_options *ndo,
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
            }
            ND_TCHECK_SIZE(&rhp->rh_long);
@@ -606,7 +605,7 @@ decnet_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }
 

diff --git a/print-dtp.c b/print-dtp.c
index 6194dc031add2d929d58e7d6bdce318ae03009a6..8f6921e57efce1664b159f8f65bb9d73eac71d06 100644 (file)
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -27,7 +27,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|dtp]";
 
 #define DTP_HEADER_LEN                 1
 #define DTP_DOMAIN_TLV                 0x0001
@@ -118,5 +117,5 @@ dtp_print (netdissect_options *ndo, const u_char *pptr, u_int length)
     ND_PRINT("%s", istr);
     return;
  trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-eigrp.c b/print-eigrp.c
index a9206a8761438727b3bb3d8c1f59fd79b7b000db..d206237dd22f1306290a6742719f455c5a5c4426 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -35,7 +35,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|eigrp]";
 
 struct eigrp_common_header {
     nd_uint8_t  version;
@@ -524,5 +523,5 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-forces.c b/print-forces.c
index 19bb6193dbf5510a3954fb7ccfca54660ca98dca..072c9389d938b3084298968aa7f4f0fe0586f2ac 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -27,7 +27,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|forces]";
 
 #define        ForCES_VERS     1
 #define        ForCES_HDRL     24
@@ -682,7 +681,7 @@ prestlv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -717,7 +716,7 @@ fdatatlv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -763,7 +762,7 @@ sdatailv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -792,7 +791,7 @@ sdatatlv_print(netdissect_options *ndo,
        return sdatailv_print(ndo, tdp, rlen, op_msk, indent);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -834,7 +833,7 @@ pkeyitlv_print(netdissect_options *ndo,
        return fdatatlv_print(ndo, dp, tll, op_msk, indent);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -991,7 +990,7 @@ pd_err:
        return len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1056,7 +1055,7 @@ pdata_print(netdissect_options *ndo,
                return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1103,7 +1102,7 @@ genoptlv_print(netdissect_options *ndo,
        }
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1157,7 +1156,7 @@ recpdoptlv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1216,7 +1215,7 @@ otlv_print(netdissect_options *ndo,
        return rc;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1274,7 +1273,7 @@ asttlv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1327,7 +1326,7 @@ asrtlv_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1376,7 +1375,7 @@ print_metailv(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1417,7 +1416,7 @@ print_metatlv(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1511,7 +1510,7 @@ redirect_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1597,7 +1596,7 @@ lfbselect_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1692,7 +1691,7 @@ forces_type_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1773,5 +1772,5 @@ error:
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-gre.c b/print-gre.c
index 73fcb923614cd68ccdf410a3a24269907d34644d..b82d1d58a10283463949425281045ba3403759f6 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -51,7 +51,6 @@
 #include "extract.h"
 #include "ethertype.h"
 
-static const char tstr[] = "[|gre]";
 
 #define        GRE_CP          0x8000          /* checksum present */
 #define        GRE_RP          0x4000          /* routing present */
@@ -110,7 +109,7 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
         return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }
 
@@ -239,7 +238,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -324,7 +323,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static int

diff --git a/print-igmp.c b/print-igmp.c
index fdfae53de3b434690ceffd1de2856e5cbf3de04b..3205a224740bd544ae4a8eac3db2a552890ca608 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -43,7 +43,6 @@
 #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)
 #endif
 
-static const char tstr[] = "[|igmp]";
 
 /* (following from ipmulti/mrouted/prune.h) */
 
@@ -127,7 +126,7 @@ print_mtrace(netdissect_options *ndo,
         ND_PRINT(" with-ttl %u", EXTRACT_U_1(tr->tr_rttl));
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -149,7 +148,7 @@ print_mresp(netdissect_options *ndo,
         ND_PRINT(" with-ttl %u", EXTRACT_U_1(tr->tr_rttl));
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -203,7 +202,7 @@ print_igmpv3_report(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -259,7 +258,7 @@ print_igmpv3_query(netdissect_options *ndo,
     ND_PRINT("]");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 void
@@ -344,5 +343,5 @@ igmp_print(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-ip.c b/print-ip.c
index 6593aa4ef84ccc7989a8e1bb17306e99dc6dc359..4d8671bbd346c7d42a6ede12bf2927a44a109ea6 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -36,7 +36,6 @@
 #include "ip.h"
 #include "ipproto.h"
 
-static const char tstr[] = "[|ip]";
 
 static const struct tok ip_option_values[] = {
     { IPOPT_EOL, "EOL" },
@@ -318,7 +317,7 @@ ip_optprint(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 #define IP_RES 0x8000
@@ -704,7 +703,7 @@ ip_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }
 
@@ -732,6 +731,6 @@ ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }

diff --git a/print-ipfc.c b/print-ipfc.c
index 5df6127c712851e3fa716f2a7db9a180ec1ecb50..7add1b7b0965cbdc358fd8d274dcdef19ea4d11d 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -34,7 +34,6 @@
 #include "netdissect.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|ipfc]";
 
 struct ipfc_header {
        nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
@@ -130,7 +129,7 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        }
        return (IPFC_HDRLEN + llc_hdrlen);
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return caplen;
 }
 

diff --git a/print-ipnet.c b/print-ipnet.c
index 9bb6c184ed6edf5f5d9d41921d1551b73d085a64..6a521eccca19799d148d46ceb404417dfa075021 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -9,7 +9,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ipnet]";
 
 typedef struct ipnet_hdr {
        nd_uint8_t      iph_version;
@@ -58,7 +57,7 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_PRINT(", length %u: ", length);
        return;
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -100,7 +99,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        }
        return;
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*

diff --git a/print-isoclns.c b/print-isoclns.c
index 4183a6f9fa8881f4876f00c0195bae75fe9e0e94..38f40d19311bed056ba92add63824b5809e0dd3c 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -50,7 +50,6 @@
 #include "oui.h"
 #include "signature.h"
 
-static const char tstr[] = " [|isis]";
 
 /*
  * IS-IS is defined in ISO 10589.  Look there for protocol definitions.
@@ -780,6 +779,7 @@ clnp_print(netdissect_options *ndo,
        const struct clnp_segment_header_t *clnp_segment_header;
         uint8_t rfd_error,rfd_error_major,rfd_error_minor;
 
+       ndo->ndo_protocol = "clnp";
        clnp_header = (const struct clnp_header_t *) pptr;
         ND_TCHECK_SIZE(clnp_header);
 
@@ -1073,7 +1073,7 @@ clnp_print(netdissect_options *ndo,
         return (1);
 
  trunc:
-    ND_PRINT("[|clnp]");
+    nd_print_trunc(ndo);
     return (1);
 
 }
@@ -1108,6 +1108,7 @@ esis_print(netdissect_options *ndo,
        u_int li, version, esis_pdu_type, source_address_length, source_address_number;
        const struct esis_header_t *esis_header;
 
+       ndo->ndo_protocol = "esis";
        if (!ndo->ndo_eflag)
                ND_PRINT("ES-IS");
 
@@ -1386,7 +1387,7 @@ esis_print(netdissect_options *ndo,
             pptr += opli;
         }
 trunc:
-        ND_PRINT("[|esis]");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -1409,7 +1410,7 @@ isis_print_mcid(netdissect_options *ndo,
     ND_PRINT("%.2x ", mcid->digest[i]);
 
 trunc:
-  ND_PRINT("%s", tstr);
+  nd_print_trunc(ndo);
 }
 
 static int
@@ -1530,8 +1531,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
   return 0;
 
   trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return(1);
 }
 
@@ -1659,8 +1659,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
   return 0;
 
   trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return(1);
 }
 
@@ -1824,8 +1823,7 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo,
     return(1);
 
 trunc:
-    ND_PRINT("%s", ident);
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return(0);
 }
 
@@ -2270,6 +2268,7 @@ isis_print(netdissect_options *ndo,
     u_int i,vendor_id;
     int sigcheck;
 
+    ndo->ndo_protocol = "isis";
     packet_len=length;
     optr = p; /* initialize the _o_riginal pointer to the packet start -
                  need it for parsing the checksum TLV and authentication
@@ -3231,7 +3230,7 @@ isis_print(netdissect_options *ndo,
     return (1);
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return (1);
 }
 

diff --git a/print-krb.c b/print-krb.c
index ab5989985eb6e9b76ba6ac2c5c1d05f101f3268c..d8c9165ad6ec0599284133fb90f1e6afcb48bc52 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -49,7 +49,6 @@
  * RFC 1510, RFC 2630, etc.
  */
 
-static const char tstr[] = " [|kerberos]";
 
 static const u_char *c_print(netdissect_options *, const u_char *, const u_char *);
 static const u_char *krb4_print_hdr(netdissect_options *, const u_char *);
@@ -148,7 +147,7 @@ krb4_print_hdr(netdissect_options *ndo,
        return (cp);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return (NULL);
 
 #undef PRINT
@@ -170,7 +169,7 @@ krb4_print(netdissect_options *ndo,
        kp = (const struct krb *)cp;
 
        if (!ND_TTEST_1(kp->type)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
 
@@ -232,7 +231,7 @@ krb4_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -245,7 +244,7 @@ krb_print(netdissect_options *ndo,
        kp = (const struct krb *)dat;
 
        if (dat >= ndo->ndo_snapend) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
 

diff --git a/print-l2tp.c b/print-l2tp.c
index ed351af947594d37032bf93c69f0c376005f9112..0ec047324f6713b244aa6e0d12c4d2f561eed430 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -68,7 +68,6 @@
 
 #define L2TP_PROXY_AUTH_ID_MASK                0x00ff
 
-static const char tstr[] = " [|l2tp]";
 
 #define        L2TP_MSGTYPE_SCCRQ      1  /* Start-Control-Connection-Request */
 #define        L2TP_MSGTYPE_SCCRP      2  /* Start-Control-Connection-Reply */
@@ -879,5 +878,5 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
  trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-ldp.c b/print-ldp.c
index 1bb0d6f9e433de0e49d31fb0ae7c4a2c048b58ae..351c1f81e55b2793b431d466d992ee7f666a5b01 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -29,7 +29,6 @@
 #include "l2vpn.h"
 #include "af.h"
 
-static const char tstr[] = " [|ldp]";
 
 /*
  * ldp common header
@@ -536,7 +535,7 @@ ldp_tlv_print(netdissect_options *ndo,
     return(tlv_len+4); /* Type & Length fields not included */
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return 0;
 
 badtlv:
@@ -690,6 +689,6 @@ ldp_pdu_print(netdissect_options *ndo,
     }
     return pdu_len+4;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return 0;
 }

diff --git a/print-lisp.c b/print-lisp.c
index 2b903623d8eaef39289d2c061eb3af304c87482c..d5ffe4264d8cc272eab4b1a8a469c4dac4059d5e 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -109,7 +109,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|LISP]";
 
 #define IPv4_AFI                       1
 #define IPv6_AFI                       2
@@ -387,7 +386,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        }
        return;
 trunc:
-       ND_PRINT("\n   %s", tstr);
+       nd_print_trunc(ndo);
        return;
 invalid:
        ND_PRINT("\n   %s", istr);

diff --git a/print-lmp.c b/print-lmp.c
index 381255ecbdb5dfce0b01ac568238e7ea7931ded4..6b28544c8ff866b7c131711ffa8ede4438945cba 100644 (file)
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -31,7 +31,6 @@
 #include "addrtoname.h"
 #include "gmpls.h"
 
-static const char tstr[] = " [|lmp]";
 
 /*
  * LMP common header
@@ -1134,5 +1133,5 @@ lmp_print(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-loopback.c b/print-loopback.c
index e0df6f26c8604d40fda6485c475154c0eb6655d2..e47e404d9e414474eb6800b527a9a734a5109f38 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -42,7 +42,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|loopback]";
 
 #define LOOPBACK_REPLY   1
 #define LOOPBACK_FWDDATA 2
@@ -101,7 +100,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -131,6 +130,6 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 

diff --git a/print-lspping.c b/print-lspping.c
index 02468d43893491d612e1d44088faa8e47ba30ead..077f07b1de96c767c3d18c4e4718787a4073db60 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -30,7 +30,6 @@
 #include "l2vpn.h"
 #include "oui.h"
 
-static const char tstr[] = " [|lspping]";
 
 /*
  * LSPPING common header
@@ -1088,6 +1087,6 @@ tooshort:
     ND_PRINT("\n\t\t packet is too short");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return;
 }

diff --git a/print-lwapp.c b/print-lwapp.c
index d53d8e9843d6890bb9937ad46488abac15597fd6..f8ca66579779be6752a5d0ebaa0364db5d8cde65 100644 (file)
--- a/print-lwapp.c
+++ b/print-lwapp.c
@@ -29,8 +29,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char control_tstr[] = " [|lwapp_control]";
-static const char data_tstr[] = " [|lwapp_data]";
 
 /*
  * LWAPP transport (common) header
@@ -296,7 +294,7 @@ lwapp_control_print(netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("%s", control_tstr);
+    nd_print_trunc(ndo);
 }
 
 void
@@ -365,5 +363,5 @@ lwapp_data_print(netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("%s", data_tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-m3ua.c b/print-m3ua.c
index a94003970ef2960e80283b2bb0961a5b91cb1fe4..180b421339a1fecd9c40aa4e86916e628c0a933f 100644 (file)
--- a/print-m3ua.c
+++ b/print-m3ua.c
@@ -35,7 +35,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|m3ua]";
 
 #define M3UA_REL_1_0 1
 
@@ -234,7 +233,7 @@ invalid:
   ND_TCHECK_LEN(buf, size);
   return;
 trunc:
-  ND_PRINT("%s", tstr);
+  nd_print_trunc(ndo);
 }
 
 /*
@@ -282,7 +281,7 @@ invalid:
   ND_TCHECK_LEN(buf, size);
   return;
 trunc:
-  ND_PRINT("%s", tstr);
+  nd_print_trunc(ndo);
 }
 
 /*
@@ -338,6 +337,6 @@ invalid:
   ND_TCHECK_LEN(buf, size);
   return;
 trunc:
-  ND_PRINT("%s", tstr);
+  nd_print_trunc(ndo);
 }
 

diff --git a/print-medsa.c b/print-medsa.c
index b9eb2262b0f998f019c4d95f51506f2ddb2f289d..349307e6d91a8f4169262ad1fd5be0122de19c39 100644 (file)
--- a/print-medsa.c
+++ b/print-medsa.c
@@ -32,7 +32,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = "[|MEDSA]";
 
 /*
  * Marvell Extended Distributed Switch Archiecture.
@@ -189,5 +188,5 @@ medsa_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-mobility.c b/print-mobility.c
index 138d2396b339db2df0ee55458e2ed1f4fa1c7615..6fd956281a5287609b15acf6a825933ee5688abf 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -42,7 +42,6 @@
 
 #include "ip6.h"
 
-static const char tstr[] = "[|MOBILITY]";
 
 /* Mobility header */
 struct ip6_mobility {
@@ -340,6 +339,6 @@ mobility_print(netdissect_options *ndo,
        return(mhlen);
 
  trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return(-1);
 }

diff --git a/print-nflog.c b/print-nflog.c
index 0b606976a39e5a154b3e5e7b602b15113a0aa136..b295adefb04cdc0efbd0bb5c9c55642c632aca9a 100644 (file)
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -39,7 +39,6 @@
 
 #include <pcap/nflog.h>
 
-static const char tstr[] = " [|nflog]";
 
 static const struct tok nflog_values[] = {
        { AF_INET,              "IPv4" },
@@ -160,7 +159,7 @@ nflog_if_print(netdissect_options *ndo,
 
        return h_size;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return h_size;
 }
 

diff --git a/print-nfs.c b/print-nfs.c
index ca70ef504a73d13a80954e335e57a004d6e73f6e..a44426ace24c4e2de86fb15641bd9ec751e7042b 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -42,7 +42,6 @@
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
-static const char tstr[] = " [|nfs]";
 
 static void nfs_printfh(netdissect_options *, const uint32_t *, const u_int);
 static int xid_map_enter(netdissect_options *, const struct sunrpc_msg *, const u_char *);
@@ -326,7 +325,7 @@ nfsreply_print(netdissect_options *ndo,
        const struct sunrpc_msg *rp;
        char srcid[20], dstid[20];      /*fits 32bit*/
 
-       ndo->ndo_protocol = "nfsreply";
+       ndo->ndo_protocol = "nfs";
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
@@ -347,7 +346,7 @@ nfsreply_print(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
 }
 
 void
@@ -362,7 +361,7 @@ nfsreply_noaddr_print(netdissect_options *ndo,
        uint32_t rhigh;
        enum sunrpc_auth_stat rwhy;
 
-       ndo->ndo_protocol = "nfsreply_noaddr";
+       ndo->ndo_protocol = "nfs";
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
@@ -409,7 +408,7 @@ nfsreply_noaddr_print(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
 }
 
 /*
@@ -532,7 +531,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        uint32_t access_flags;
        struct nfsv3_sattr sa3;
 
-       ndo->ndo_protocol = "nfsreq_noaddr";
+       ndo->ndo_protocol = "nfs";
        ND_PRINT("%u", length);
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
@@ -789,7 +788,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
 }
 
 /*
@@ -1758,5 +1757,5 @@ interp_reply(netdissect_options *ndo,
        }
 trunc:
        if (!nfserr)
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
 }

diff --git a/print-nsh.c b/print-nsh.c
index fc129200ca589ba433bc1deb0b52306b4647d894..7de9002f2b1e663e56855235e3ca5bb6437164a8 100644 (file)
--- a/print-nsh.c
+++ b/print-nsh.c
@@ -34,7 +34,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|NSH]";
 static const struct tok nsh_flags [] = {
     { 0x20, "O" },
     { 0x10, "C" },
@@ -181,6 +180,6 @@ nsh_print(netdissect_options *ndo, const u_char *bp, u_int len)
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 

diff --git a/print-ntp.c b/print-ntp.c
index 8adb101df76f14573e6f691ec1c0506e0e757b7e..9dc47190fec82024aaad676256a2394eee1e790e 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -46,7 +46,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|ntp]";
 
 /*
  * Based on ntp.h from the U of MD implementation
@@ -377,7 +376,7 @@ invalid:
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -437,7 +436,7 @@ invalid:
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 union ntpdata {
@@ -501,7 +500,7 @@ ntp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void

diff --git a/print-null.c b/print-null.c
index 64fdfa25aae87d3e5dd752e2a081edb6a3178fbd..e7daacd42b86a265b4346d1193569421a72f0b64 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -33,7 +33,6 @@
 #include "extract.h"
 #include "af.h"
 
-static const char tstr[] = " [|null]";
 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
@@ -141,6 +140,6 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 
        return (NULL_HDRLEN);
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return (NULL_HDRLEN);
 }

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 659ee66b9775a3b186e0051d871fe9f9ce798dd2..0b2e7bbcf4991abf0eb5bd99bb92d6a6ae88695d 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -72,7 +72,6 @@
 #include "oui.h"
 #include "openflow.h"
 
-static const char tstr[] = " [|openflow]";
 
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
@@ -747,7 +746,7 @@ of10_data_print(netdissect_options *ndo,
        return cp + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -952,7 +951,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp0, len);
        return cp0 + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1026,7 +1025,7 @@ invalid:
        ND_TCHECK_LEN(cp0, len);
        return cp0 + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1055,7 +1054,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1084,7 +1083,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1110,7 +1109,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1132,7 +1131,7 @@ of10_packet_data_print(netdissect_options *ndo,
        return cp + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1213,7 +1212,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1289,7 +1288,7 @@ invalid: /* skip the rest of queue properties */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1337,7 +1336,7 @@ invalid: /* skip the rest of queues */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1441,7 +1440,7 @@ of10_match_print(netdissect_options *ndo,
        return cp + 2;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1608,7 +1607,7 @@ invalid: /* skip the rest of actions */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1647,7 +1646,7 @@ of10_features_reply_print(netdissect_options *ndo,
        return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1705,7 +1704,7 @@ of10_flow_mod_print(netdissect_options *ndo,
        return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1742,7 +1741,7 @@ of10_port_mod_print(netdissect_options *ndo,
        return cp + 4;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1826,7 +1825,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1873,7 +1872,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1954,7 +1953,7 @@ invalid: /* skip the rest of flow statistics entries */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1987,7 +1986,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2047,7 +2046,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2132,7 +2131,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2180,7 +2179,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2221,7 +2220,7 @@ of10_stats_reply_print(netdissect_options *ndo,
        return cp0 + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2259,7 +2258,7 @@ invalid: /* skip the rest of the message body */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2292,7 +2291,7 @@ of10_packet_in_print(netdissect_options *ndo,
        return of10_packet_data_print(ndo, cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2346,7 +2345,7 @@ of10_flow_removed_print(netdissect_options *ndo,
        return cp + 8;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2379,7 +2378,7 @@ of10_error_print(netdissect_options *ndo,
        return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2563,6 +2562,6 @@ next_message:
        ND_TCHECK_LEN(cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }

diff --git a/print-openflow.c b/print-openflow.c
index a0cabbe67b5be0ccfac8c363d7c4f5bdbda4b61c..f3c1a8329d992def11c57c4a637e96ecbf815ce8 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -43,7 +43,6 @@
 #include "openflow.h"
 #include "oui.h"
 
-static const char tstr[] = " [|openflow]";
 
 #define OF_VER_1_0    0x01
 
@@ -125,7 +124,7 @@ invalid: /* fail current packet */
        ND_TCHECK_LEN(cp, ep - cp);
        return ep;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 

diff --git a/print-ospf.c b/print-ospf.c
index 4c5ba665d5cfa1a8faeb893d4a61c82385c47337..eebf17b24e1229a771219d54f7a8539614cd899d 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -36,7 +36,6 @@
 
 #include "ospf.h"
 
-static const char tstr[] = " [|ospf2]";
 
 static const struct tok ospf_option_values[] = {
         { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
@@ -1111,7 +1110,7 @@ ospf_print(netdissect_options *ndo,
        const u_char *dataend;
        const char *cp;
 
-       ndo->ndo_protocol = "ospf";
+       ndo->ndo_protocol = "ospf2";
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
@@ -1202,5 +1201,5 @@ ospf_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-ospf6.c b/print-ospf6.c
index a3800109712a0ab2e9d87af9ff3913c62871581a..0511435fe933ef199b3c53fae6bb4842517250e8 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -284,7 +284,6 @@ struct lsu6 {
     struct lsa6 lsu_lsa[1]; /* may repeat      */
 };
 
-static const char tstr[] = " [|ospf3]";
 
 static const struct tok ospf6_option_values[] = {
        { OSPF6_OPTION_V6,      "V6" },
@@ -962,7 +961,7 @@ ospf6_print(netdissect_options *ndo,
        const char *cp;
        uint16_t datalen;
 
-       ndo->ndo_protocol = "ospf6";
+       ndo->ndo_protocol = "ospf3";
        op = (const struct ospf6hdr *)bp;
 
        /* If the type is valid translate it, or just print the type */
@@ -1012,5 +1011,5 @@ ospf6_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-pflog.c b/print-pflog.c
index a98a0fc1906d49b45265d6e92aba16371b2a91a7..7cd96b2eca023588b3b89b588e3fc046c2c6c568 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -39,7 +39,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|pflog]";
 
 static const struct tok pf_reasons[] = {
        { 0,    "0(match)" },
@@ -118,7 +117,7 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        ndo->ndo_protocol = "pflog_if";
        /* check length */
        if (caplen < sizeof(uint8_t)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -131,7 +130,7 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (hdrlen);        /* XXX: true? */
        }
 
@@ -175,6 +174,6 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
        return (hdrlen);
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return (hdrlen);
 }

diff --git a/print-ppi.c b/print-ppi.c
index 4671b08a67c02fa5d54da172e0d200ae62085ee8..398ed689134818492879f73d2e97797ff12d81fd 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -13,7 +13,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ppi]";
 
 typedef struct ppi_header {
        nd_uint8_t      ppi_ver;
@@ -66,7 +65,7 @@ ppi_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "ppi";
        if (caplen < sizeof(ppi_header_t)) {
-               ND_PRINT(" %s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -78,11 +77,11 @@ ppi_print(netdissect_options *ndo,
                 * If we don't have the entire PPI header, don't
                 * bother.
                 */
-               ND_PRINT(" %s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
        if (len < sizeof(ppi_header_t)) {
-               ND_PRINT(" %s", tstr);
+               nd_print_trunc(ndo);
                return (len);
        }
        ND_TCHECK_4(hdr->ppi_dlt);

diff --git a/print-pptp.c b/print-pptp.c
index 7eb6bc5912970cfca244d2892d2b96b549cd254f..1f5c331390ed64169abca887d6446cad43c72583 100644 (file)
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -34,7 +34,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|pptp]";
 
 #define PPTP_MSG_TYPE_CTRL     1       /* Control Message */
 #define PPTP_MSG_TYPE_MGMT     2       /* Management Message (currently not used */
@@ -553,7 +552,7 @@ pptp_sccrq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -584,7 +583,7 @@ pptp_sccrp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -620,7 +619,7 @@ pptp_stopccrq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -639,7 +638,7 @@ pptp_stopccrp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -654,7 +653,7 @@ pptp_echorq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -675,7 +674,7 @@ pptp_echorp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -712,7 +711,7 @@ pptp_ocrq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -743,7 +742,7 @@ pptp_ocrp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -774,7 +773,7 @@ pptp_icrq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -801,7 +800,7 @@ pptp_icrp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -826,7 +825,7 @@ pptp_iccn_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -843,7 +842,7 @@ pptp_ccrq_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -868,7 +867,7 @@ pptp_cdn_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -897,7 +896,7 @@ pptp_wen_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -918,7 +917,7 @@ pptp_sli_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -1028,5 +1027,5 @@ pptp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-radius.c b/print-radius.c
index 62f61f0c09cd220fdb0e4cdf71971ce019da1ba1..7f9ea5f2d99711a35f61c9e19e18897797d4d19b 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -89,7 +89,6 @@
 #include "extract.h"
 #include "oui.h"
 
-static const char tstr[] = " [|radius]";
 
 #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
 
@@ -638,7 +637,7 @@ print_attr_string(netdissect_options *ndo,
    return;
 
    trunc:
-      ND_PRINT("%s", tstr);
+      nd_print_trunc(ndo);
 }
 
 /*
@@ -699,7 +698,7 @@ print_vendor_attr(netdissect_options *ndo,
     return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 /******************************/
@@ -822,7 +821,7 @@ print_attr_num(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 /*****************************/
@@ -865,7 +864,7 @@ print_attr_address(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 /*****************************/
@@ -892,7 +891,7 @@ print_attr_address6(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 static void
@@ -925,7 +924,7 @@ print_attr_netmask6(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 /*************************************/
@@ -959,7 +958,7 @@ print_attr_time(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 /***********************************/
@@ -1050,7 +1049,7 @@ print_attr_strange(netdissect_options *ndo,
    return;
 
    trunc:
-     ND_PRINT("%s", tstr);
+     nd_print_trunc(ndo);
 }
 
 static void
@@ -1114,7 +1113,7 @@ radius_attrs_print(netdissect_options *ndo,
    return;
 
 trunc:
-   ND_PRINT("%s", tstr);
+   nd_print_trunc(ndo);
 }
 
 void
@@ -1131,7 +1130,7 @@ radius_print(netdissect_options *ndo,
 
    if (len < MIN_RADIUS_LEN)
    {
-         ND_PRINT("%s", tstr);
+         nd_print_trunc(ndo);
          return;
    }
 
@@ -1162,5 +1161,5 @@ radius_print(netdissect_options *ndo,
    return;
 
 trunc:
-   ND_PRINT("%s", tstr);
+   nd_print_trunc(ndo);
 }

diff --git a/print-resp.c b/print-resp.c
index cb6a011e6aa45a1d88bed9f91684ec20bf960924..47f1eb3d9f88bbb662fe12919205e0187dbe9a1f 100644 (file)
--- a/print-resp.c
+++ b/print-resp.c
@@ -42,7 +42,6 @@
 
 #include "extract.h"
 
-static const char tstr[] = " [|RESP]";
 
 /*
  * For information regarding RESP, see: http://redis.io/topics/protocol
@@ -238,7 +237,7 @@ resp_print(netdissect_options *ndo, const u_char *bp, u_int length)
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static int

diff --git a/print-rip.c b/print-rip.c
index 4c78014e65cd08f99774031c5ad89a0ffd71de34..19595a95450ad823a0e520f83c82381db6af1406 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -37,7 +37,6 @@
 
 #include "af.h"
 
-static const char tstr[] = "[|rip]";
 
 /*
  * RFC 1058 and RFC 2453 header of packet.
@@ -291,14 +290,14 @@ rip_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "rip";
        if (ndo->ndo_snapend < dat) {
-               ND_PRINT(" %s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        i = ndo->ndo_snapend - dat;
        if (i > length)
                i = length;
        if (i < sizeof(*rp)) {
-               ND_PRINT(" %s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        i -= sizeof(*rp);
@@ -349,7 +348,7 @@ rip_print(netdissect_options *ndo,
                                entry_size = rip_entry_print_v1(ndo, p, i);
                                if (entry_size == 0) {
                                        /* Error */
-                                       ND_PRINT("%s", tstr);
+                                       nd_print_trunc(ndo);
                                        break;
                                }
                                p += entry_size;
@@ -365,7 +364,7 @@ rip_print(netdissect_options *ndo,
                                entry_size = rip_entry_print_v2(ndo, p, i);
                                if (entry_size == 0) {
                                        /* Error */
-                                       ND_PRINT("%s", tstr);
+                                       nd_print_trunc(ndo);
                                        break;
                                }
 #if 0

diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index fcc2f1c2c8d0f62d79dffac629df0cf697289221..38f1e0519abf867f08c2d924914a374e0c3b7c6c 100644 (file)
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -31,7 +31,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = "[|RPKI-RTR]";
 
 /*
  * RPKI/Router PDU header
@@ -381,7 +380,7 @@ invalid:
     ND_TCHECK_LEN(tptr, len);
     return len;
 trunc:
-    ND_PRINT("\n\t%s", tstr);
+    nd_print_trunc(ndo);
     return len;
 }
 

diff --git a/print-rsvp.c b/print-rsvp.c
index ae16d6818e28e8b6f6dc7f4fc9f9256b2b1155ae..abc6b24220d50adbbda19790904e499fdbd51169 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -33,7 +33,6 @@
 #include "af.h"
 #include "signature.h"
 
-static const char tstr[] = " [|rsvp]";
 
 /*
  * RFC 2205 common header
@@ -643,7 +642,7 @@ rsvp_intserv_print(netdissect_options *ndo,
     return (parameter_length+4); /* header length 4 bytes */
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return 0;
 }
 
@@ -1866,8 +1865,7 @@ invalid:
     ND_PRINT("%s", istr);
     return -1;
 trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return -1;
 }
 
@@ -2020,6 +2018,5 @@ rsvp_print(netdissect_options *ndo,
 
     return;
 trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-sl.c b/print-sl.c
index 161c5efa12fe3df090fc295b6af188c68d4ed244..5bba17ab2c03efad2fa0e19033f018d4e100e638 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -47,7 +47,6 @@
 #define SLIPDIR_IN 0
 #define SLIPDIR_OUT 1
 
-static const char tstr[] = "[|slip]";
 
 static u_int lastlen[2][256];
 static u_int lastconn = 255;
@@ -65,7 +64,7 @@ sl_if_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "sl_if";
        if (caplen < SLIP_HDRLEN || length < SLIP_HDRLEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -78,7 +77,7 @@ sl_if_print(netdissect_options *ndo,
                sliplink_print(ndo, p, ip, length);
 
        if (caplen < 1 || length < 1) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen + SLIP_HDRLEN);
        }
 
@@ -106,7 +105,7 @@ sl_bsdos_if_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "sl_bsdos_if";
        if (caplen < SLIP_HDRLEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return (caplen);
        }
 

diff --git a/print-slow.c b/print-slow.c
index 087af0ff407124b4ae8ed57584927c065681c368..4e0ab030f7785ad3aa84fcb62ca516aaebbda1b1 100644 (file)
--- a/print-slow.c
+++ b/print-slow.c
@@ -31,7 +31,6 @@
 #include "addrtoname.h"
 #include "oui.h"
 
-static const char tstr[] = " [|slow]";
 
 #define        SLOW_PROTO_LACP                     1
 #define        SLOW_PROTO_MARKER                   2
@@ -341,7 +340,7 @@ tooshort:
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -483,7 +482,7 @@ tooshort:
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -750,5 +749,5 @@ tooshort:
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-smb.c b/print-smb.c
index 49d51091c7c5affa4f9917df8b9945d6bf29acf4..fa4081efdb663361126a138608a837b39f2c3b51 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -20,7 +20,6 @@
 #include "extract.h"
 #include "smb.h"
 
-static const char tstr[] = "[|SMB]";
 
 static int request = 0;
 static int unicodestr = 0;
@@ -142,7 +141,7 @@ trans2_qfsinfo(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static const struct smbfnsint trans2_fns[] = {
@@ -236,7 +235,7 @@ print_trans2(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -317,7 +316,7 @@ print_browse(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 
@@ -392,7 +391,7 @@ print_trans(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 
@@ -435,7 +434,7 @@ print_negprot(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -480,7 +479,7 @@ print_sesssetup(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static void
@@ -521,7 +520,7 @@ print_lockingandx(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 
@@ -923,7 +922,7 @@ print_smb(netdissect_options *ndo,
     ND_PRINT("\n");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 
@@ -1089,7 +1088,7 @@ nbt_tcp_print(netdissect_options *ndo,
     }
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 static const struct tok opcode_str[] = {
@@ -1243,7 +1242,7 @@ out:
     ND_PRINT("\n");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 /*
@@ -1287,7 +1286,7 @@ smb_tcp_print(netdissect_options *ndo,
        ND_PRINT(" SMB-over-TCP packet:(raw data or continuation?)\n");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 /*
@@ -1478,7 +1477,7 @@ out:
     ND_PRINT("\n");
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 
 

diff --git a/print-snmp.c b/print-snmp.c
index 86c772949e21ff0dacdfa1dd63a91e0529ad51d8..6607f0515c1da4291b98ae55b4fd5750657ac8df 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -76,7 +76,6 @@
 
 #undef OPAQUE  /* defined in <wingdi.h> */
 
-static const char tstr[] = "[|snmp]";
 
 /*
  * Universal ASN.1 types
@@ -669,7 +668,7 @@ asn1_parse(netdissect_options *ndo,
        return elem->asnlen + hdr;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -686,7 +685,7 @@ asn1_print_octets(netdissect_options *ndo, struct be *elem)
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -719,7 +718,7 @@ asn1_print_string(netdissect_options *ndo, struct be *elem)
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -850,7 +849,7 @@ asn1_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -949,7 +948,7 @@ smi_decode_oid(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 

diff --git a/print-syslog.c b/print-syslog.c
index 9d60f737617cef68f2b75f774aa324625eee26c6..0c5005b35605651d1589baf5d6de23536507caf1 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -25,7 +25,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|syslog]";
 
 /*
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
@@ -103,12 +102,12 @@ syslog_print(netdissect_options *ndo,
             ND_TCHECK_1(pptr + msg_off);
         }
         if (EXTRACT_U_1(pptr + msg_off) != '>') {
-            ND_PRINT("%s", tstr);
+            nd_print_trunc(ndo);
             return;
         }
         msg_off++;
     } else {
-        ND_PRINT("%s", tstr);
+        nd_print_trunc(ndo);
         return;
     }
 
@@ -143,5 +142,5 @@ syslog_print(netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-telnet.c b/print-telnet.c
index 204654ce23a900f9dc35db10eea71d920d8eb629..3bfb19a2f77362b57c83ebc5cac72b83d9b81168 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -58,7 +58,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|telnet]";
 
 #define TELCMDS
 #define TELOPTS
@@ -501,7 +500,7 @@ done:
        return sp - osp;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 pktend:
        return -1;
 #undef FETCH
@@ -556,5 +555,5 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-tftp.c b/print-tftp.c
index 548a36c5494ea76186228be1e6d41b933ea46ea0..2630e554caea64c8a0dc283bcca31a01c0230ce8 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -58,7 +58,6 @@
 #define        EEXISTS         6               /* file already exists */
 #define        ENOUSER         7               /* no such user */
 
-static const char tstr[] = " [|tftp]";
 
 /* op code to string mapping */
 static const struct tok op2str[] = {
@@ -199,6 +198,6 @@ tftp_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }

diff --git a/print-timed.c b/print-timed.c
index 1f7bc82308618d0b292c2f4f70fc7d999cb52d68..7397ef8b3c61197a4595614a34f73b340cb20774 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -82,7 +82,6 @@ struct tsp {
 
 #define        TSPTYPENUMBER           25
 
-static const char tstr[] = "[|timed]";
 
 static const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
@@ -144,5 +143,5 @@ timed_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-tipc.c b/print-tipc.c
index d837af65ebad5aba7dd4736934a3b4bf8108b0f8..45de7387638fdf66b243ebcd856ef2945fa2f954 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -37,7 +37,6 @@
 #include "ethertype.h"
 #include "extract.h"
 
-static const char tstr[] = "[|TIPC]";
 
 #define TIPC_USER_LOW_IMPORTANCE       0
 #define TIPC_USER_MEDIUM_IMPORTANCE    1
@@ -216,7 +215,7 @@ print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -284,7 +283,7 @@ print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -330,7 +329,7 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -374,5 +373,5 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-token.c b/print-token.c
index dcd023c06ac73deb2db42a0384d81fe10717dac1..9d9e36ed7eed08e0151e8d0c6741d60efe8566bd 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -89,7 +89,6 @@ struct token_header {
        nd_uint16_t  token_rseg[ROUTING_SEGMENT_MAX];
 };
 
-static const char tstr[] = "[|token-ring]";
 
 /* Extract src, dst addresses */
 static void
@@ -157,7 +156,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        trp = (const struct token_header *)p;
 
        if (caplen < TOKEN_HDRLEN) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return hdr_len;
        }
 
@@ -175,13 +174,13 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        token_hdr_print(ndo, trp, length, srcmac, dstmac);
 
                if (caplen < TOKEN_HDRLEN + 2) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return hdr_len;
                }
                route_len = RIF_LENGTH(trp);
                hdr_len += route_len;
                if (caplen < hdr_len) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        return hdr_len;
                }
                if (ndo->ndo_vflag) {

diff --git a/print-udld.c b/print-udld.c
index a9ada9e47044be6537d91376a90d82d755652c87..b97e0b3a68d792b0f3f53d865a6001372b180113 100644 (file)
--- a/print-udld.c
+++ b/print-udld.c
@@ -28,7 +28,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|udld]";
 
 #define UDLD_HEADER_LEN                        4
 #define UDLD_DEVICE_ID_TLV             0x0001
@@ -188,5 +187,5 @@ invalid:
     ND_PRINT("%s", istr);
     return;
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-udp.c b/print-udp.c
index 283726ce114a5b273bbff3338b258e6f71f41e67..ec40f2ce5203e426bb39a7d0b67b90197846f073 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -42,10 +42,6 @@
 
 #include "nfs.h"
 
-static const char vat_tstr[] = " [|vat]";
-static const char rtp_tstr[] = " [|rtp]";
-static const char rtcp_tstr[] = " [|rtcp]";
-static const char udp_tstr[] = " [|udp]";
 
 struct rtcphdr {
        nd_uint16_t rh_flags;   /* T:2 P:1 CNT:5 PT:8 */
@@ -102,6 +98,7 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
        /* vat/vt audio */
        u_int ts;
 
+       ndo->ndo_protocol = "vat";
        if (length < 2) {
                ND_PRINT("udp/va/vat, length %u < 2", length);
                return;
@@ -137,7 +134,7 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
        }
 
 trunc:
-       ND_PRINT("%s", vat_tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -149,6 +146,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
        uint32_t i0, i1;
        const char * ptype;
 
+       ndo->ndo_protocol = "rtp";
        if (len < 8) {
                ND_PRINT("udp/rtp, length %u < 8", len);
                return;
@@ -225,7 +223,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
        }
 
 trunc:
-       ND_PRINT("%s", rtp_tstr);
+       nd_print_trunc(ndo);
 }
 
 static const u_char *
@@ -239,6 +237,8 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        uint16_t flags;
        u_int cnt;
        double ts, dts;
+
+       ndo->ndo_protocol = "rtcp";
        if ((const u_char *)(rh + 1) > ep)
                goto trunc;
        ND_TCHECK_SIZE(rh);
@@ -307,7 +307,7 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        return (hdr + len);
 
 trunc:
-       ND_PRINT("%s", rtcp_tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -718,5 +718,5 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
        return;
 
 trunc:
-       ND_PRINT("%s", udp_tstr);
+       nd_print_trunc(ndo);
 }

diff --git a/print-usb.c b/print-usb.c
index 7b750a06c85919379c070dd599f3b21346d6521d..56e6dd4674b9d4ac186b0f6552ad3c95050830cf 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -135,7 +135,6 @@ typedef struct _usb_isodesc {
        nd_byte         pad[4];
 } usb_isodesc;
 
-static const char tstr[] = "[|usb]";
 
 /* returns direction: 1=inbound 2=outbound -1=invalid */
 static int
@@ -245,7 +244,7 @@ usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 {
        ndo->ndo_protocol = "usb_linux_48_byte_if";
        if (h->caplen < sizeof(pcap_usb_header)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return(sizeof(pcap_usb_header));
        }
 
@@ -269,7 +268,7 @@ usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 {
        ndo->ndo_protocol = "usb_linux_64_byte_if";
        if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return(sizeof(pcap_usb_header_mmapped));
        }
 

diff --git a/print-vxlan-gpe.c b/print-vxlan-gpe.c
index fb903c2105e88d1d28b00a5c9943d136ccb0f4ab..7a022598a4b26971384bf6504c846b6b31868754 100644 (file)
--- a/print-vxlan-gpe.c
+++ b/print-vxlan-gpe.c
@@ -34,7 +34,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|VXLAN-GPE]";
 static const struct tok vxlan_gpe_flags [] = {
     { 0x08, "I" },
     { 0x04, "P" },
@@ -109,6 +108,6 @@ vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len)
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 

diff --git a/print-vxlan.c b/print-vxlan.c
index 826d2aaf2f3054a53a005003fec12425a5aa8699..73875a1124b24a960bb6048035da8922e457b2a9 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -26,7 +26,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|VXLAN]";
 
 #define VXLAN_HDR_LEN 8
 
@@ -71,5 +70,5 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }

diff --git a/print-wb.c b/print-wb.c
index 74591ce1c5573a091d2d352456aa1324ed637bfc..b27104916aa6014805dbcb7632bbc533e7872d79 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -31,7 +31,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = "[|wb]";
 
 /* XXX need to add byte-swapping macros! */
 /* XXX - you mean like the ones in "extract.h"? */
@@ -319,7 +318,7 @@ wb_dops(netdissect_options *ndo, const struct pkt_dop *dop,
                u_int t;
 
                if (!ND_TTEST_SIZE(dh)) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        break;
                }
                t = EXTRACT_U_1(dh->dh_type);
@@ -405,7 +404,7 @@ wb_print(netdissect_options *ndo,
        ndo->ndo_protocol = "wb";
        ph = (const struct pkt_hdr *)hdr;
        if (len < sizeof(*ph) || !ND_TTEST_SIZE(ph)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        len -= sizeof(*ph);
@@ -422,37 +421,37 @@ wb_print(netdissect_options *ndo,
        case PT_ID:
                if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_RREQ:
                if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_RREP:
                if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_DRAWOP:
                if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_PREQ:
                if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_PREP:
                if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        default:

diff --git a/print-zeromq.c b/print-zeromq.c
index eb41414a0be947cab265b03ac8b82ff34739e8cd..6e5e9dc8106a3f25d1624c9b4be1679f9c002d98 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -36,7 +36,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|zmtp1]";
 
 /* Maximum number of ZMTP/1.0 frame body bytes (without the flags) to dump in
  * hex and ASCII under a single "-v" flag.
@@ -136,7 +135,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return cp + body_len_declared;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -206,7 +205,7 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
        return cp + frame_offset;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return cp + len;
 }
 
@@ -215,7 +214,7 @@ zmtp1_datagram_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
        const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
-       ndo->ndo_protocol = "zmtp1_datagram";
+       ndo->ndo_protocol = "zmtp1";
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);

diff --git a/tests/arp-oobr.out b/tests/arp-oobr.out
index 5e5199a41b9d3245237d77486726e3e6cd2a4416..c96f3cacb465868ef42e97546b84417fe9b76f84 100644 (file)
--- a/tests/arp-oobr.out
+++ b/tests/arp-oobr.out
@@ -10,7 +10,7 @@
 00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.30, length 28
 00:21:d8:35:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Reply 192.168.0.1 is-at 00:21:d8:01:03:45, length 46
 00:16:17:e0:67:e7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.33, length 46
-00:61:29:da:f8:fb > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:61:29:da:f8:fb > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 8604 0001 001f 29da f8fb c0a8  ..........).....
        0x0010:  0025 0000 0000 0000 c0a8 0025 0000 0000  .%.........%....
        0x0020:  0000 0000 0000 0000 006b 0000 0000       .........k....
@@ -59,7 +59,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 208.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0624 0001 001f 29da 2d79 c0a8  .....$....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -119,12 +119,12 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:25:00:2d:79 > ff:30:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 70:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.149.104, length 46
-6a:16:17:e0:67:e7 > ff:ff:ff:fe:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+6a:16:17:e0:67:e7 > ff:ff:ff:fe:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06aa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
 00:1f:29:da:25:00 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x3100) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 3304 0001 001f 29da 2d79 c0a8  ....3.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -136,7 +136,7 @@
 00:19:db:2b:57:d7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:4a:00:00:00:00) tell 192.168.1.104, length 46
 00:25:00:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 7804 0001 0034 29da 2d79 c0a8  ....x....4).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -166,7 +166,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.53.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:2d:da:f8:fb > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:2d:da:f8:fb > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0030 0800 06aa aaaa aaaa aaaa aaaa aaaa  .0..............
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -197,7 +197,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.170.170 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:01:00:00) tell 192.168.37.0, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  00aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -206,7 +206,7 @@
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0xbc00) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 1604 0001 001f 29da 2d33 c0a8  ..........).-3..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -223,7 +223,7 @@
        0x0000:  0001 0800 0604 4001 0016 17e0 67e7 c0a8  [email protected]...
        0x0010:  0021 0000 0000 0000 c0a8 0001 0000 0000  .!..............
        0x0020:  0000 0000 0000 0000 0000 0000 0020       ..............
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06af 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0001 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -241,7 +241,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:fe:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:d5:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:d5:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 08aa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -276,14 +276,14 @@
 00:21:5a:21:9e:fd > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.35 tell 192.168.0.35, length 46
 00:21:5a:21:9e:fd > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknown Hardware (155) (len 6), IPv4 (len 4), Request who-has 192.168.0.35 tell 192.168.0.35, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:00:b8) tell 192.168.1.104, length 46
-00:19:db:2b:57:d7 > ff:ff:ff:ae:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:19:db:2b:57:d7 > ff:ff:ff:ae:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 5c04 0001 0019 df2b 57d7 c0a8  ....\......+W...
        0x0010:  0022 0000 0000 0000 c0a8 0001 0000 0000  ."..............
        0x0020:  0000 0004 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:21:5a:21:9e:fd > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.35, length 46
 00:1f:29:da:2d:79 > ff:70:fe:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.68 (00:00:94:00:00:00) tell 192.168.1.104, length 46
-00:1f:29:da:29:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:29:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  6601 0800 0640 0001 001f 29da 2d79 c0a8  f....@....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -292,7 +292,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.37.0 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:21:5a:21:9e:fd > 73:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:21:5a:21:9e:fd > 73:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0614 0001 0021 5a21 9efd c0a8  .........!Z!....
        0x0010:  0023 0000 0000 0000 c0a8 0023 0000 0000  .#.........#....
        0x0020:  0000 0000 0000 0001 0000 0000 0000       ..............
@@ -350,7 +350,7 @@
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:25:00:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:25:00:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 2500 0001 001f 29da 2d79 69a8  ....%.....).-yi.
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -385,7 +385,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:40:00:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 12), Request who-has <wrong len> (01:01:00:00:00:00) tell <wrong len>, length 46
 40:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6204 0001 001f 29da 2d79 c0a8  ....b.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -472,14 +472,14 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:78:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x08ae) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
 00:19:db:2b:57:d7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 f204 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0072 0000 0000 0000 0000       .....r........
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:33:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -513,7 +513,7 @@
 00:1f:29:41:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.37, length 46
-00:1f:62:da:2d:79 > ff:4c:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:62:da:2d:79 > ff:4c:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 064a 0001 001f 29da 2d79 c0a8  .....J....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -534,7 +534,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:43:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.242.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6704 0063 001f 29da 2d79 c0a8  ....g..c..).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -545,7 +545,7 @@
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:2b:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:f8:fb > ff:ff:ef:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:f8:fb > ff:ff:ef:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0664 0001 001f 29da f8fb c0a8  .....d....).....
        0x0010:  0025 0000 0000 0000 c0a8 0001 0000 0000  .%..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -589,7 +589,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.33 tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0656 0001 001f efaa aaaa aaaa  .....V..........
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -608,7 +608,7 @@
        0x0000:  0001 0800 0604 004a 001f 29da 2d79 c0a8  .......J..).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
-00:1f:29:da:2d:79 > ff:71:ff:ff:ff:b8, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:71:ff:ff:ff:b8, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 9e04 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -616,18 +616,18 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.37 tell 192.168.1.104, length 46
 00:1f:29:da:2f:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06ef 7101 001f 29da 2d79 c0a8  ......q...).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0100 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (58:00:00:00:00:00) tell 192.168.1.104, length 46
-00:16:17:e0:67:e7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:16:17:e0:67:e7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  00aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
-00:0f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:0f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  00aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -654,7 +654,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:79:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:79:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  c901 0800 0683 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0001 c0a8 0101 0000 0000  .h..............
        0x0020:  0033 0000 0000 0000 0000 0000 0000       .3............
@@ -671,16 +671,16 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x0880) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:80:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:21:5a:21:9e:fd > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:21:5a:21:9e:fd > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 5204 0001 0021 5a21 9efd c0a8  ....R....!Z!....
        0x0010:  0023 0000 0000 0000 c0a8 0001 0001 0000  .#..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:25:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0624 0001 001f 29da 2d79 c0a8  .....$....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 aaaa aaaa aaaa       ..............
-00:1f:29:da:25:00 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:25:00 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -716,7 +716,7 @@
 00:1f:29:da:2d:79 > ff:25:00:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:0f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.32, length 46
 00:16:17:e0:67:e7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 170.170.170.170 (aa:aa:aa:aa:aa:aa) tell 170.170.170.170, length 46
-00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 4804 0001 0013 2013 db6f c0a8  ....H........o..
        0x0010:  001f 0000 0000 0000 c0a8 0001 0000 6f10  ..............o.
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -790,7 +790,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 7600 2500 0001 001f 29da 2d79 c0a8  ..v.%.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 aaaa aaaa  .h..............
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -823,7 +823,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0625 0001 001f 29da 2d79 c0a8  .....%....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 b000 0000 0000 0000       ..............
@@ -859,7 +859,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:25:00:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 8604 0001 001f 29da 2de7 c0a8  ..........).-...
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -975,7 +975,7 @@
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:6f:00:00:00:00) tell 192.168.1.104, length 46
 00:19:db:2b:57:d7 > ff:45:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1004,7 +1004,7 @@
        0x0000:  0001 0800 0604 8d01 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  6b00 0000 0000 0000 0000 0000 0000       k.............
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  2500 0800 4e04 0001 001f 29da 2d79 c0a8  %...N.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1048,7 +1048,7 @@ da:1f:29:76:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 242.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:19:db:2b:57:d7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 062a 0001 001f 29da 2d79 c0a8  .....*....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1199,7 +1199,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.83 (00:00:00:61:00:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6004 0057 001f 29da 2d79 c0a8  ....`..W..).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1207,7 +1207,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 205.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ef:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > fb:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > fb:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0679 0001 001f 29da 2d79 c0a8  .....y....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 00aa aaaa  .h..............
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1325,7 +1325,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:33:00:00:00:00) tell 70.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1346,7 +1346,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 5400 0000       ..........T...
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0624 0001 001f 29da 2d79 c0a8  .....$....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1415,7 +1415,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:09:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:2d:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0013 0800 0604 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1425,7 +1425,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:28:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:43:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:fe:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknown Hardware (103) (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0658 0001 001f 29da 2d79 c0a8  .....X....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1460,7 +1460,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.65 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.11.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 8604 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1500,7 +1500,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.42.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 3604 0001 001f 29da 2d79 c0a8  ....6.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1604,7 +1604,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 d804 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0001 c0a8 0101 0000 0080  .h..............
        0x0020:  00aa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1619,7 +1619,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknown Hardware (257) (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-25:00:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+25:00:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 9225 0001 001f 29da 2d79 c0a8  .....%....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1634,7 +1634,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:6b, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:02:00) tell 192.168.1.72, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.77, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (52:00:00:63:00:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6a04 0001 001f 29da 2d79 c0a8  ....j.....).-y..
        0x0010:  0168 0000 4400 0000 c0a8 aaaa aaaa aaaa  .h..D...........
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1656,7 +1656,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.38 tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 2500 0001 001f 29da 2d79 c0a8  ....%.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1700,7 +1700,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 4604 0001 001f 29da 2d79 c0a8  ....F.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1718,7 +1718,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.37.0.1 (00:00:00:00:00:46) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x5700) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 f404 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1738,7 +1738,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 53.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.121.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6d04 0001 001f 29da 2d79 c0a8  ....m.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1776,7 +1776,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0648 0001 001f 29da 2d79 c0a8  .....H....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -1823,7 +1823,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:21:d8:01:03:45 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:21:d8:01:03:45 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06aa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1866,7 +1866,7 @@ d6:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.38 tell 192.168.0.31, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  00aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -1936,7 +1936,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknown Hardware (16385) (len 6), IPv4 (len 4), Request who-has 192.168.1.117 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:7f:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0636 0001 001f beda 2d79 c0a8  .....6......-y..
        0x0010:  0168 0000 0000 0000 c0a8 0121 7300 0000  .h.........!s...
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2024,7 +2024,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.38 tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.37.0.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:28:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:28:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 064b 0001 001f 29da 2d79 c0a8  .....K....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2043,7 +2043,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:23:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:00:31) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0676 0001 001f 29da 2d79 c0a8  .....v....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2052,7 +2052,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (41:00:00:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (be:00:00:00:00:4c) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 b704 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 4801 0000 0000  .h........H.....
        0x0020:  0000 0000 0000 0000 00aa aaaa aaaa       ..............
@@ -2062,7 +2062,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:00:76) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42: [|ARP]
+00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42:  [|arp]
        0x0000:  0001 0800 c004 3601 0008 027e b236 c0a8  ......6....~.6..
        0x0010:  001e 0000 0000 0000 2500 0001            ........%...
 00:21:d8:01:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Reply 192.168.0.1 is-at 00:21:d8:01:03:45, length 46
@@ -2125,7 +2125,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:bf:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 4404 0001 001f 29da 2d79 c0a8  ....D.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0025 0000 0000 0000       .......%......
@@ -2135,7 +2135,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:21:d8:01:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Reply 192.168.0.55 is-at 00:21:d8:01:03:45, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0657 0001 001f 29da 2d79 c0a8  .....W....).-y..
        0x0010:  0168 0049 0000 0000 c0a8 0101 0000 0000  .h.I............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2150,7 +2150,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:19:db:2b:57:d7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06b6 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2203,7 +2203,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:25:00:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 2500 0001 001f 29da 2d79 c0a8  ....%.....).-y..
        0x0010:  0168 0000 00aa aaaa aaaa aaaa aaaa aaaa  .h..............
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -2215,7 +2215,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.209 tell 192.168.1.104, length 46
 00:1f:29:da:33:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:58:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 5104 0001 001f 29da 2d79 c0a8  ....Q.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 002c 0000 0000 0000       .......,......
@@ -2244,7 +2244,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 170.170.170.170 (00:00:aa:aa:aa:aa) tell 192.168.0.31, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.105, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 5004 0001 001f 29da 2d79 c0a8  ....P.....).-y..
        0x0010:  0168 0074 0000 0000 c0a8 0101 0000 0000  .h.t............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2274,12 +2274,12 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.232.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:25:00:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 5304 0001 001f 29da 2d79 c0a8  ....S.....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 1104 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2313,16 +2313,16 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ba, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x0870) (len 4), Request who-has <wrong proto type> (00:00:00:d0:00:00) tell <wrong proto type>, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:c5:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:25:00 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:8a:f7:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:8a:f7:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06aa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
-6a:2f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+6a:2f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 1604 0001 000f fe3a 7f20 c0a8  ...........:....
        0x0010:  0054 0000 0000 0000 c0a8 0001 0000 0000  .T..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2341,7 +2341,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 200.168.1.97, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:fd:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 (00:00:00:00:60:00) tell 192.168.0.31, length 46
-00:1f:29:da:2d:79 > ff:ff:32:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:32:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 4b04 0001 001f 29da 2d79 c0a8  ....K.....).-y..
        0x0010:  0168 0000 0000 0000 c032 0101 aaaa aaaa  .h.......2......
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -2374,7 +2374,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:fe:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 43.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 060f 0001 001f 29da 2d79 c0b8  ..........).-y..
        0x0010:  0168 0000 6600 0000 c0a8 0101 0000 0000  .h..f...........
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2408,7 +2408,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.30, length 28
-00:21:d8:01:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60: [|ARP]
+00:21:d8:01:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 064b 0002 0021 d801 0345 c0a8  .....K...!...E..
        0x0010:  0001 0008 027e b236 c0a8 bb1e 0000 0000  .....~.6........
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2434,7 +2434,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:80:00:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:13:20:13:db:6f > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.31, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0637 0001 001f 29da 2d79 c0a8  .....7....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2551,7 +2551,7 @@ ce:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethern
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 6e04 0001 001f 29da 2d79 c0a8  ....n.....).-y..
        0x0010:  0168 5000 0000 0000 25aa aaaa aaaa aaaa  .hP.....%.......
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -2623,7 +2623,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:16:17:e0:67:e7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.33, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42: [|ARP]
+00:08:02:7e:b2:36 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42:  [|arp]
        0x0000:  0001 0800 aaaa aaaa aaaa aaaa aaaa aaaa  ................
        0x0010:  aaaa aaaa aaaa aaaa aaaa aaaa            ............
 00:21:d8:ee:03:45 > 00:08:02:7e:b2:36, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Reply 170.170.170.170 is-at 00:21:d8:01:03:aa, length 46
@@ -2635,13 +2635,13 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:00:00:00:20:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 065b 0001 001b 29da 2d79 c0a8  .....[....).-y..
        0x0010:  0168 0400 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 170.170.170.170 (aa:aa:aa:aa:aa:aa) tell 170.170.170.170, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), Unknown Protocol (0x2500) (len 4), Request who-has <wrong proto type> tell <wrong proto type>, length 46
-00:1f:29:da:2d:39 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:39 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06d1 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0001       ..............
@@ -2656,7 +2656,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > e3:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 066e 0001 001f 29da 2d79 c0a8  .....n....).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
@@ -2682,7 +2682,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0010  .h..............
        0x0020:  0000 0000 0000 0000 0000 0000 0000       ..............
 00:19:db:2b:57:d7 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.0.1 tell 192.168.0.34, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 06d6 0001 101f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0aa aaaa aaaa aaaa  .h..............
        0x0020:  aaaa aaaa aaaa aaaa aaaa aaaa aaaa       ..............
@@ -2699,7 +2699,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 8b04 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0000 00b7 0000 4d00 0000 0000       ........M.....
@@ -2723,7 +2723,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (00:48:00:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
-00:0f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:0f:fe:3a:7f:20 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0625 0001 000f fe77 7f20 c0a8  .....%.....w....
        0x0010:  0020 0000 0000 0000 c0a8 0001 0000 0000  ................
        0x0020:  0000 0000 0000 4500 0000 0000 0000       ......E.......
@@ -2736,7 +2736,7 @@ af:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Unknow
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 (ab:00:00:00:00:00) tell 192.168.1.104, length 46
 00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.17.1 (00:00:02:00:00:00) tell 192.168.1.104, length 46
-00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: [|ARP]
+00:1f:29:da:2d:79 > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60:  [|arp]
        0x0000:  0001 0800 0684 0001 001f 29da 2d79 c0a8  ..........).-y..
        0x0010:  0168 0000 0000 0000 c0a8 0101 0000 0000  .h..............
        0x0020:  0000 0040 0000 0000 0000 0000 0000       ...@..........

diff --git a/tests/atm-oam-heapoverflow.out b/tests/atm-oam-heapoverflow.out
index cdcb8ce4045720418f8d62978416a45fede60efa..353b415abc69907fea3193ff719e9d9d714883f2 100644 (file)
--- a/tests/atm-oam-heapoverflow.out
+++ b/tests/atm-oam-heapoverflow.out
@@ -1 +1 @@
-[|oam]
+ [|oam]

diff --git a/tests/cve2015-0261-crash.out b/tests/cve2015-0261-crash.out
index 1946280c0cf7dfed109cc3fd674cb653892c9141..7ae506b1cf6ca682d2646fd70195ee6bfb5d406c 100644 (file)
--- a/tests/cve2015-0261-crash.out
+++ b/tests/cve2015-0261-crash.out
@@ -1 +1 @@
-IP6 (class 0x03, flowlabel 0x03030, hlim 48, next-header Options (0) payload length: 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 130:3030:3030:3030:3030:3030:3030:3030: HBH [trunc] (header length 8 is too small for type 1)[|MOBILITY]
+IP6 (class 0x03, flowlabel 0x03030, hlim 48, next-header Options (0) payload length: 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 130:3030:3030:3030:3030:3030:3030:3030: HBH [trunc] (header length 8 is too small for type 1) [|mobility]

diff --git a/tests/cve2015-0261-ipv6.out b/tests/cve2015-0261-ipv6.out
index 3658c198306a1f05c99637066c27259e2daa7c2a..7e23968b04f9d78d4c78770f6cea1405f74015a2 100644 (file)
--- a/tests/cve2015-0261-ipv6.out
+++ b/tests/cve2015-0261-ipv6.out
@@ -1,3 +1,3 @@
-IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:6767:6767:6767:6767:6767:6705: mobility: BU seq#=26471 HL lifetime=105884(type-0x67: len=103)[|MOBILITY]
-IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:4f67:6767:6767:6767:6767:6767: (header length 8 is too small for type 6)[|MOBILITY]
+IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:6767:6767:6767:6767:6767:6705: mobility: BU seq#=26471 HL lifetime=105884(type-0x67: len=103) [|mobility]
+IP6 truncated-ip6 - 26325 bytes missing!(class 0x76, flowlabel 0x76767, hlim 103, next-header Mobility (135) payload length: 26470) 6767:6767:6767:6767:6767:6767:6767:6767 > 6767:6767:4f67:6767:6767:6767:6767:6767: (header length 8 is too small for type 6) [|mobility]
 EXIT CODE 00000100

diff --git a/tests/decnet-oobr.out b/tests/decnet-oobr.out
index 5195082d505bb9a6ad72d3c50a0a8bbc3a3dbaf3..5d26931923719e3ca53eb52cbb3709e3dd09a58b 100644 (file)
--- a/tests/decnet-oobr.out
+++ b/tests/decnet-oobr.out
@@ -1,4 +1,4 @@
 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]
+MEDSA 16.6:48:  [|decnet]

diff --git a/tests/decnet-shorthdr-oobr.out b/tests/decnet-shorthdr-oobr.out
index a9fb4bf2ec236cc54fd82fb42fcc1920e91f9545..481ae5a7f2816369072e6f298e38dd7691c603a1 100644 (file)
--- a/tests/decnet-shorthdr-oobr.out
+++ b/tests/decnet-shorthdr-oobr.out
@@ -26,4 +26,4 @@
        0x0000:  3030 3030                                0000
 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
        0x0000:  3030 3030                                0000
-[|decnet]
+ [|decnet]

diff --git a/tests/decnet.out b/tests/decnet.out
index 8767c620b729ea99b63153160a0f14cd0a42162a..af12e49972a65437c46c56ee6ffb168a2ef98981 100644 (file)
--- a/tests/decnet.out
+++ b/tests/decnet.out
@@ -4,7 +4,7 @@ endnode-hello endnode vers 2 eco 0 ueco 0 src 1.1 blksize 16434 rtr 0.0 hello 10
 endnode-hello endnode vers 2 eco 0 ueco 0 src 1.1 blksize 16434 rtr 0.0 hello 10 data 2
 endnode-hello endnode vers 2 eco 0 ueco 0 src 1.1 blksize 16434 rtr 0.0 hello 10 data 2
 1.1 > 1.1 34 conn-initiate 8195>0 ver 4.1 segsize 16403 
-1.1 > 1.1 9 [|decnet]
+1.1 > 1.1 9  [|decnet]
 1.1 > 1.1 16 conn-confirm 8196>8195 ver 4.1 segsize 16403 
 1.1 > 1.1 19 link-service 8195>8196 ack 0 ackdat 0 seg 1 dat seg count 0 
 1.1 > 1.1 15 ils-ack 8196>8195 ack 1 ackdat 0 
@@ -18,7 +18,7 @@ endnode-hello endnode vers 2 eco 0 ueco 0 src 1.1 blksize 16434 rtr 0.0 hello 10
 1.1 > 1.1 15 data-ack 8195>8196 ack 2 oack 0 
 endnode-hello endnode vers 2 eco 0 ueco 0 src 1.1 blksize 16434 rtr 0.0 hello 10 data 2
 1.1 > 1.1 34 conn-initiate 8197>0 ver 4.1 segsize 16403 
-1.1 > 1.1 9 [|decnet]
+1.1 > 1.1 9  [|decnet]
 1.1 > 1.1 16 conn-confirm 8198>8197 ver 4.1 segsize 16403 
 1.1 > 1.1 19 link-service 8197>8198 ack 0 ackdat 0 seg 1 dat seg count 0 
 1.1 > 1.1 15 ils-ack 8198>8197 ack 1 ackdat 0 

diff --git a/tests/esis_opt_prot-oobr.out b/tests/esis_opt_prot-oobr.out
index 63f3d70e84aaa9f58e8bb8ff89eaaf728592adac..bd5804704bc8ec39fe538506ef0a954af5979788 100644 (file)
--- a/tests/esis_opt_prot-oobr.out
+++ b/tests/esis_opt_prot-oobr.out
@@ -2,4 +2,4 @@ ES-IS, length 262139
        redirect (6), v: 1, checksum: 0x00c6 (unverified), holding time: 2303s, length indicator: 54
          00.8e
          SNPA (length: 0): <empty>
-         Protocols supported Option #129, length 11, value: CLNP (0x81), [|esis]
+         Protocols supported Option #129, length 11, value: CLNP (0x81),  [|esis]

diff --git a/tests/esis_snpa_asan-3.out b/tests/esis_snpa_asan-3.out
index 360bcf46b9bdab475b0613effb74e5f740c483d8..4f088b07ceb6cfb08e0ed5887bf30bc5d5338275 100644 (file)
--- a/tests/esis_snpa_asan-3.out
+++ b/tests/esis_snpa_asan-3.out
@@ -4,4 +4,4 @@ UI 22! ES-IS, length 65565
 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]
+         SNPA (length: 0): <empty> [|esis]

diff --git a/tests/esis_snpa_asan-4.out b/tests/esis_snpa_asan-4.out
index 94e1ec2b065e19327717226b3d89c326491feb36..f5f4604ccae49fe21e1f761cfce49be79b6934a6 100644 (file)
--- a/tests/esis_snpa_asan-4.out
+++ b/tests/esis_snpa_asan-4.out
@@ -7,7 +7,7 @@ UI 22! ES-IS, length 65565
        redirect (6), v: 1, checksum: 0x7034 (incorrect should be 0x44ec), holding time: 21315s, length indicator: 16
          02.0400
          SNPA (length: 0): <empty>
-         Unknown Option #0, length 0, value: [|esis]
+         Unknown Option #0, length 0, value:  [|esis]
 UI 32! ES-IS, length 65565
        ESH (2), v: 1, checksum: 0x70a1 (incorrect should be 0xfb4e), holding time: 21315s, length indicator: 17
          Number of Source Addresses: 2
@@ -17,5 +17,5 @@ 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>
-         NET (length: 4) 00.0000.00[|esis]
+         NET (length: 4) 00.0000.00 [|esis]
 Q.922, invalid address

diff --git a/tests/esis_snpa_asan-5.out b/tests/esis_snpa_asan-5.out
index 527214cb3360be73bfe2ac35b24ae0a42bb2d192..d54bed3dbf6049aa399de0cb6483bac202d11628 100644 (file)
--- a/tests/esis_snpa_asan-5.out
+++ b/tests/esis_snpa_asan-5.out
@@ -3,7 +3,7 @@ UI 22! ES-IS, length 65565
          Number of Source Addresses: 3
          NET (length: 0): isonsap_string: illegal length
          NET (length: 4): ec.ff00.00
-         NET (length: 0): isonsap_string: illegal length[|esis]
+         NET (length: 0): isonsap_string: illegal length [|esis]
 UI 22! ES-IS, length 65565
        redirect (6), v: 1, checksum: 0x7034 (incorrect should be 0x3ff0), holding time: 21315s, length indicator: 17
          04

diff --git a/tests/gre-heapoverflow-2.out b/tests/gre-heapoverflow-2.out
index bb1cf786440596ba83d7f5f17d548c624f8f2deb..dda0846e65559620a7c5d76e1a5d1b377087f1e7 100644 (file)
--- a/tests/gre-heapoverflow-2.out
+++ b/tests/gre-heapoverflow-2.out
@@ -3,4 +3,4 @@
        0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
        0x0020:  3030                                     00
 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto GRE (47), length 12336, bad cksum 3030 (->697f)!)
-    48.48.48.48 > 48.48.48.48: GREv0, Flags [checksum present, routing present], sum 0x3030, off 0x3030, (rtaf=0x3030)[|gre]
+    48.48.48.48 > 48.48.48.48: GREv0, Flags [checksum present, routing present], sum 0x3030, off 0x3030, (rtaf=0x3030) [|gre]

diff --git a/tests/heapoverflow-sl_if_print.out b/tests/heapoverflow-sl_if_print.out
index 4ddcf52395c6561581c2d0d44b59e8acbfd11f2e..429312674282d62342bd60bea93dc19b5fccfae5 100644 (file)
--- a/tests/heapoverflow-sl_if_print.out
+++ b/tests/heapoverflow-sl_if_print.out
@@ -1 +1 @@
-[|slip]
+ [|sl_if]

diff --git a/tests/ieee802.11_rates_oobr.out b/tests/ieee802.11_rates_oobr.out
index 222eed335ad17cee3168b729e1dae7683a3a1107..3881ba8b5401b66c3bb2af2a25aa7b1fa4d3853a 100644 (file)
--- a/tests/ieee802.11_rates_oobr.out
+++ b/tests/ieee802.11_rates_oobr.out
@@ -1 +1 @@
-fhset 48 fhpat 48 48dBm signal 48dB signal 48dB noise [|802.11]Beacon IBSS, PRIVACY[|802.11]
+fhset 48 fhpat 48 48dBm signal 48dB signal 48dB noise  [|802.11_radio]Beacon IBSS, PRIVACY [|802.11]

diff --git a/tests/ieee802.11_tim_ie_oobr.out b/tests/ieee802.11_tim_ie_oobr.out
index 52686837114ba37a612f9c162ba6f7a5d70d28b8..7c45d85b06558cc41227edd30c7c6b2dcfdd70ce 100644 (file)
--- a/tests/ieee802.11_tim_ie_oobr.out
+++ b/tests/ieee802.11_tim_ie_oobr.out
@@ -1,4 +1,4 @@
-ReAssoc Response AID(3030) : PRIVACY : n/a[|802.11]
-ReAssoc Response AID(3030) : PRIVACY : n/a[|802.11]
-[|802.11]
-ReAssoc Response AID(3030) : PRIVACY : n/a[|802.11]
+ReAssoc Response AID(3030) : PRIVACY : n/a [|802.11]
+ReAssoc Response AID(3030) : PRIVACY : n/a [|802.11]
+ [|802.11]
+ReAssoc Response AID(3030) : PRIVACY : n/a [|802.11]

diff --git a/tests/ip_printroute_asan.out b/tests/ip_printroute_asan.out
index 334973e501996b5f19ddcf4e5dec89749eeef3fb..332c2bfc60db6d423e588dd1e8093ed073b9fea6 100644 (file)
--- a/tests/ip_printroute_asan.out
+++ b/tests/ip_printroute_asan.out
@@ -1,2 +1,2 @@
-IP (tos 0x0, ttl 254, id 25615, offset 65480, flags [DF, rsvd], proto UDP (17), length 32768, options (LSRR [bad length 25] [bad ptr 15] 103.103.103.0, 0.172.0.116, 0.16.36.36, 16.0.36.2 14.9.36.4[|ip]))
+IP (tos 0x0, ttl 254, id 25615, offset 65480, flags [DF, rsvd], proto UDP (17), length 32768, options (LSRR [bad length 25] [bad ptr 15] 103.103.103.0, 0.172.0.116, 0.16.36.36, 16.0.36.2 14.9.36.4 [|ip]))
     251.73.86.0 > 0.172.128.5: ip-proto-17

diff --git a/tests/ip_ts_opts_asan.out b/tests/ip_ts_opts_asan.out
index ce890b1ba19af0938d821cc724eb2f6184207b5e..f7f3b037cc86466b95cc8fa08b110b0153ee7573 100644 (file)
--- a/tests/ip_ts_opts_asan.out
+++ b/tests/ip_ts_opts_asan.out
@@ -1,2 +1,2 @@
-IP (tos 0xe2,ECT(0), id 32, offset 0, flags [+, DF, rsvd], proto ICMP (1), length 65319, options (timestamp TS{[bad length 14]TS+ADDR ^ [email protected][|ip]), bad cksum a09b (->90a7)!)
+IP (tos 0xe2,ECT(0), id 32, offset 0, flags [+, DF, rsvd], proto ICMP (1), length 65319, options (timestamp TS{[bad length 14]TS+ADDR ^ [email protected] [|ip]), bad cksum a09b (->90a7)!)
     149.8.33.81 > 95.18.83.227: [|icmp]

diff --git a/tests/ipv6-mobility-header-oobr.out b/tests/ipv6-mobility-header-oobr.out
index 8188f8a8fbe2ac56d16655a971e0d3db409e2898..df627b9353f85216789d4bccbe3deaea0be91611 100644 (file)
--- a/tests/ipv6-mobility-header-oobr.out
+++ b/tests/ipv6-mobility-header-oobr.out
@@ -1 +1 @@
-IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: mobility: BA status=48[|MOBILITY]
+IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: mobility: BA status=48 [|mobility]

diff --git a/tests/isis-extd-ipreach-oobr.out b/tests/isis-extd-ipreach-oobr.out
index 70e94d9623b00125737df2b0b6a876c371e51297..6d16be3d7982bd70e99196b0d338fca721737448 100644 (file)
--- a/tests/isis-extd-ipreach-oobr.out
+++ b/tests/isis-extd-ipreach-oobr.out
@@ -23,8 +23,7 @@
                      Lvl: 18757, Digest: 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49 45  [|isis]
                 AUX-MCID: ID: 69, Name: EIEEEIEEEIEEEIEEEIEEEIEEEIEEEIEE
                      Lvl: 17737, Digest: 45 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49  [|isis]
-              unknown subTLV #69, length: 69
-                [|isis]
+              unknown subTLV #69, length: 69 [|isis]
              0x0000:  0000 0466 0049 4545 4549 4545 4549 4545
              0x0010:  4549 4545 4549 4545 4549 4545 4549 4545
              0x0020:  4549 4545 4549 4545 4549 4545 4549 4545

diff --git a/tests/isis-seg-fault-2-v.out b/tests/isis-seg-fault-2-v.out
index bbbb55fe303bccb9d2b8311492052bd59164cc8f..9579e589163dee639fdd8630439d0cd2f390db13 100644 (file)
--- a/tests/isis-seg-fault-2-v.out
+++ b/tests/isis-seg-fault-2-v.out
@@ -14,8 +14,7 @@ IS-IS, length 1497
              unknown subTLV #0, length: 0
              unknown subTLV #0, length: 0
              unknown subTLV #0, length: 0
-             unknown subTLV #0, length: 37
-                [|isis]
+             unknown subTLV #0, length: 37 [|isis]
            Area address(es) TLV #1, length: 4
              Area address (length: 3): 49.000a
            IPv4 Interface address(es) TLV #132, length: 4

diff --git a/tests/isis_stlv_asan-2.out b/tests/isis_stlv_asan-2.out
index 0383786f05be2657629d589b6a95b3a669116fb3..4911556a4228f2380d1ff58b16a25551a9c07083 100644 (file)
--- a/tests/isis_stlv_asan-2.out
+++ b/tests/isis_stlv_asan-2.out
@@ -18,5 +18,4 @@ UI 22! IS-IS, length 262139
              unknown subTLV #16, length: 1
              unknown subTLV #224, length: 0
              unknown subTLV #59, length: 0
-             unknown subTLV #5, length: 166
-                [|isis] [|isis]
+             unknown subTLV #5, length: 166 [|isis] [|isis]

diff --git a/tests/isis_stlv_asan-3.out b/tests/isis_stlv_asan-3.out
index ebe1bd2527d4790a08c79cadb2659783f73004dc..a9a724093cafeda55262977cacdc5725b4339259 100644 (file)
--- a/tests/isis_stlv_asan-3.out
+++ b/tests/isis_stlv_asan-3.out
@@ -19,5 +19,4 @@ UI 22! IS-IS, length 262139
            Multi-Topology Capability TLV #144, length: 144
              O: 1, RES: 1, MTID(s): 0
              unknown subTLV #107, length: 0
-             unknown subTLV #0, length: 208
-                [|isis] [|isis]
+             unknown subTLV #0, length: 208 [|isis] [|isis]

diff --git a/tests/isis_stlv_asan-4.out b/tests/isis_stlv_asan-4.out
index fa7725fe0b0beecc96f5dde8eaa285c2d2d3ff35..e772245f18dc9b72fe426a8639ebd5d2e70d3932 100644 (file)
--- a/tests/isis_stlv_asan-4.out
+++ b/tests/isis_stlv_asan-4.out
@@ -24,5 +24,4 @@ UI 22! Pad! IS-IS, length 262138
               RES: 8, MTID(s): 385
               unknown subTLV #129, length: 68
               unknown subTLV #32, length: 32
-              unknown subTLV #129, length: 129
-                [|isis] [|isis]
+              unknown subTLV #129, length: 129 [|isis] [|isis]

diff --git a/tests/isis_stlv_asan.out b/tests/isis_stlv_asan.out
index 3fa0948e0e4364e35d2e21179a3b7e4ab90b7805..cb90fed188f0082b43176288f2a3e4f2c9c772ec 100644 (file)
--- a/tests/isis_stlv_asan.out
+++ b/tests/isis_stlv_asan.out
@@ -17,9 +17,7 @@ UI 22! IS-IS, length 262139
                0x0010:  2026 2020 2020 2020 2020 2020 2020 8f8f
            Multi-Topology-Aware Port Capability TLV #143, length: 143
               RES: 8, MTID(s): 3983
-              unknown subTLV #143, length: 143
-                [|isis]
+              unknown subTLV #143, length: 143 [|isis]
            Multi-Topology-Aware Port Capability TLV #143, length: 143
               RES: 8, MTID(s): 3983
-              unknown subTLV #143, length: 143
-                [|isis] [|isis]
+              unknown subTLV #143, length: 143 [|isis] [|isis]

diff --git a/tests/isoclns-heapoverflow-2.out b/tests/isoclns-heapoverflow-2.out
index 58d25204f6f92d10274580da96cc519c98b410d2..4ca23906685f6040dfa2c7817d62c0ce4b02cd41 100644 (file)
--- a/tests/isoclns-heapoverflow-2.out
+++ b/tests/isoclns-heapoverflow-2.out
@@ -1 +1 @@
-fe:fe:fe:fe:fe:fe > 30:30:da:fe:fe:fe, ethertype OSI (0xfefe), length 262144: 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]

diff --git a/tests/kday6.out b/tests/kday6.out
index 0b973d60712cad9a34abf1b4e70c125daf48e6e3..ca74e3d50bdfea1c43a9f822200d84d8bf002f53 100644 (file)
--- a/tests/kday6.out
+++ b/tests/kday6.out
@@ -4,8 +4,7 @@ FRF.16 Frag, seq 693, Flags [Begin], UI e8! IS-IS, length 262137
          chksum: 0x0900 (unverified), PDU length: 33667, Flags: [ Overload bit set, expense ATT bit set, L1 IS ]
            Multi-Topology Capability TLV #144, length: 137
              O: 0, RES: 4, MTID(s): 3945
-             unknown subTLV #8, length: 233
-                [|isis]
+             unknown subTLV #8, length: 233 [|isis]
            unknown TLV #213, length: 243
                0x0000:  5cca 8010 0410 0594 4510 0410 6e55 0000
                0x0010:  0101 080a 8cf3 ac2b 269c 0e2d 0e0e 0e0e

diff --git a/tests/mobility_opt_asan.out b/tests/mobility_opt_asan.out
index 91493c2dda1a533cd1c3b40850ba67803d51acc6..b0ec2a438f7badd735074b97544c66f99f74dce5 100644 (file)
--- a/tests/mobility_opt_asan.out
+++ b/tests/mobility_opt_asan.out
@@ -1,2 +1,2 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:0:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15872(pad1)[|MOBILITY]
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d4c3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b291: mobility: BU seq#=116 A lifetime=15360[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:0:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15872(pad1) [|mobility]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d4c3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b291: mobility: BU seq#=116 A lifetime=15360 [|mobility]

diff --git a/tests/mobility_opt_asan_2.out b/tests/mobility_opt_asan_2.out
index 403926e5b2c49553b715e0376c271a7f48938993..3da23486985f07701ac92294f831c42a43c9a248 100644 (file)
--- a/tests/mobility_opt_asan_2.out
+++ b/tests/mobility_opt_asan_2.out
@@ -1 +1 @@
-IP6 (class 0x50, flowlabel 0x0002c, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ff:7f0f:40:0:ee00:0:b658:5203 > 205:20:1:b00:0:2200:af01:e000: mobility: BRR(type-0x06: len=0)[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x0002c, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ff:7f0f:40:0:ee00:0:b658:5203 > 205:20:1:b00:0:2200:af01:e000: mobility: BRR(type-0x06: len=0) [|mobility]

diff --git a/tests/mobility_opt_asan_3.out b/tests/mobility_opt_asan_3.out
index 7e2ce3a600a0d453441aafa88dc25b5536d483a4..803dabbb93580f6ea214a82378e80a1e27516c0e 100644 (file)
--- a/tests/mobility_opt_asan_3.out
+++ b/tests/mobility_opt_asan_3.out
@@ -1,2 +1,2 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: CoT nonce id=0x74 Care-of Init Cookie=80570f80:00000004[|MOBILITY]
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ffc3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b2a1: mobility: BU seq#=39837 lifetime=261452[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: CoT nonce id=0x74 Care-of Init Cookie=80570f80:00000004 [|mobility]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ffc3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b2a1: mobility: BU seq#=39837 lifetime=261452 [|mobility]

diff --git a/tests/mobility_opt_asan_4.out b/tests/mobility_opt_asan_4.out
index d44f4e9d0ffdef49843622c725d4dd8c6428ce0d..6901ef1453bf7d812f5c91ddbde1df20b14446b1 100644 (file)
--- a/tests/mobility_opt_asan_4.out
+++ b/tests/mobility_opt_asan_4.out
@@ -1 +1 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 237, next-header Mobile IP (old) (62) payload length: 7168) d3c3:b2a9:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15360(pad1)(pad1)(type-0x3c: len=19)(ni: ho=0x0400 co=0x0012)[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 237, next-header Mobile IP (old) (62) payload length: 7168) d3c3:b2a9:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15360(pad1)(pad1)(type-0x3c: len=19)(ni: ho=0x0400 co=0x0012) [|mobility]

diff --git a/tests/mobility_opt_asan_5.out b/tests/mobility_opt_asan_5.out
index 403926e5b2c49553b715e0376c271a7f48938993..3da23486985f07701ac92294f831c42a43c9a248 100644 (file)
--- a/tests/mobility_opt_asan_5.out
+++ b/tests/mobility_opt_asan_5.out
@@ -1 +1 @@
-IP6 (class 0x50, flowlabel 0x0002c, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ff:7f0f:40:0:ee00:0:b658:5203 > 205:20:1:b00:0:2200:af01:e000: mobility: BRR(type-0x06: len=0)[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x0002c, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ff:7f0f:40:0:ee00:0:b658:5203 > 205:20:1:b00:0:2200:af01:e000: mobility: BRR(type-0x06: len=0) [|mobility]

diff --git a/tests/mobility_opt_asan_6.out b/tests/mobility_opt_asan_6.out
index 91493c2dda1a533cd1c3b40850ba67803d51acc6..b0ec2a438f7badd735074b97544c66f99f74dce5 100644 (file)
--- a/tests/mobility_opt_asan_6.out
+++ b/tests/mobility_opt_asan_6.out
@@ -1,2 +1,2 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:0:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15872(pad1)[|MOBILITY]
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d4c3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b291: mobility: BU seq#=116 A lifetime=15360[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:0:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15872(pad1) [|mobility]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d4c3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b291: mobility: BU seq#=116 A lifetime=15360 [|mobility]

diff --git a/tests/mobility_opt_asan_7.out b/tests/mobility_opt_asan_7.out
index 7e2ce3a600a0d453441aafa88dc25b5536d483a4..803dabbb93580f6ea214a82378e80a1e27516c0e 100644 (file)
--- a/tests/mobility_opt_asan_7.out
+++ b/tests/mobility_opt_asan_7.out
@@ -1,2 +1,2 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: CoT nonce id=0x74 Care-of Init Cookie=80570f80:00000004[|MOBILITY]
-IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ffc3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b2a1: mobility: BU seq#=39837 lifetime=261452[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) d400:7fa1:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: CoT nonce id=0x74 Care-of Init Cookie=80570f80:00000004 [|mobility]
+IP6 (class 0x50, flowlabel 0x00004, hlim 0, next-header Mobile IP (old) (62) payload length: 7168) ffc3:b2a1:200:400::6238:2949 > 9675:86dd:73f0:2c:1c7f:ffff:ebc3:b2a1: mobility: BU seq#=39837 lifetime=261452 [|mobility]

diff --git a/tests/mobility_opt_asan_8.out b/tests/mobility_opt_asan_8.out
index d44f4e9d0ffdef49843622c725d4dd8c6428ce0d..6901ef1453bf7d812f5c91ddbde1df20b14446b1 100644 (file)
--- a/tests/mobility_opt_asan_8.out
+++ b/tests/mobility_opt_asan_8.out
@@ -1 +1 @@
-IP6 (class 0x50, flowlabel 0x00004, hlim 237, next-header Mobile IP (old) (62) payload length: 7168) d3c3:b2a9:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15360(pad1)(pad1)(type-0x3c: len=19)(ni: ho=0x0400 co=0x0012)[|MOBILITY]
+IP6 (class 0x50, flowlabel 0x00004, hlim 237, next-header Mobile IP (old) (62) payload length: 7168) d3c3:b2a9:200:400::6238:2949 > 9675:86dd:7300:2c:1c7f:ffff:ffc3:b2a1: mobility: BU seq#=116 A lifetime=15360(pad1)(pad1)(type-0x3c: len=19)(ni: ho=0x0400 co=0x0012) [|mobility]

diff --git a/tests/oobr_parse_elements.out b/tests/oobr_parse_elements.out
index b09ed73b15f65ad1a8cd952f92498ce84780887c..11c109068a4b59d47601c7625df82ac836762df6 100644 (file)
--- a/tests/oobr_parse_elements.out
+++ b/tests/oobr_parse_elements.out
@@ -1 +1 @@
-Beacon IBSS, PRIVACY[|802.11]
+Beacon IBSS, PRIVACY [|802.11]

diff --git a/tests/radiotap-heapoverflow.out b/tests/radiotap-heapoverflow.out
index a81d18406b4d72326b98c7ed63c3e3c20150bcff..35764d49a6385eb17c58d4a61246d558ae9bee52 100644 (file)
--- a/tests/radiotap-heapoverflow.out
+++ b/tests/radiotap-heapoverflow.out
@@ -1 +1 @@
-[|802.11]
+ [|802.11_radio]

diff --git a/tests/resp_3.out b/tests/resp_3.out
index 1852f4e056c84f8fc2a57056f86a275b511d0fa7..25f70f36959ca341c3eb14aca30888d9aadf96b1 100644 (file)
--- a/tests/resp_3.out
+++ b/tests/resp_3.out
@@ -82,7 +82,7 @@ IP 127.0.0.1.52769 > 127.0.0.1.6379: Flags [.], ack 58, win 342, options [nop,no
 IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [S], seq 374549345, win 43690, options [mss 65495,sackOK,TS val 1132420457 ecr 0,nop,wscale 7], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52770: Flags [S.], seq 1146630634, ack 374549346, win 43690, options [mss 65495,sackOK,TS val 1132420457 ecr 1132420457,nop,wscale 7], length 0
 IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [.], ack 1, win 342, options [nop,nop,TS val 1132420457 ecr 1132420457], length 0
-IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132420457 ecr 1132420457], length 6: RESP [|RESP]
+IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132420457 ecr 1132420457], length 6: RESP [|resp]
 IP 127.0.0.1.6379 > 127.0.0.1.52770: Flags [.], ack 7, win 342, options [nop,nop,TS val 1132420457 ecr 1132420457], length 0
 IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [F.], seq 7, ack 1, win 342, options [nop,nop,TS val 1132420757 ecr 1132420457], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52770: Flags [F.], seq 1, ack 8, win 342, options [nop,nop,TS val 1132420757 ecr 1132420757], length 0
@@ -90,7 +90,7 @@ IP 127.0.0.1.52770 > 127.0.0.1.6379: Flags [.], ack 2, win 342, options [nop,nop
 IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [S], seq 2541241523, win 43690, options [mss 65495,sackOK,TS val 1132420760 ecr 0,nop,wscale 7], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52771: Flags [S.], seq 3482468888, ack 2541241524, win 43690, options [mss 65495,sackOK,TS val 1132420760 ecr 1132420760,nop,wscale 7], length 0
 IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [.], ack 1, win 342, options [nop,nop,TS val 1132420760 ecr 1132420760], length 0
-IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132420760 ecr 1132420760], length 6: RESP [|RESP]
+IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132420760 ecr 1132420760], length 6: RESP [|resp]
 IP 127.0.0.1.6379 > 127.0.0.1.52771: Flags [.], ack 7, win 342, options [nop,nop,TS val 1132420760 ecr 1132420760], length 0
 IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [F.], seq 7, ack 1, win 342, options [nop,nop,TS val 1132421059 ecr 1132420760], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52771: Flags [F.], seq 1, ack 8, win 342, options [nop,nop,TS val 1132421059 ecr 1132421059], length 0
@@ -98,7 +98,7 @@ IP 127.0.0.1.52771 > 127.0.0.1.6379: Flags [.], ack 2, win 342, options [nop,nop
 IP 127.0.0.1.52772 > 127.0.0.1.6379: Flags [S], seq 3376019145, win 43690, options [mss 65495,sackOK,TS val 1132421060 ecr 0,nop,wscale 7], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52772: Flags [S.], seq 2449011991, ack 3376019146, win 43690, options [mss 65495,sackOK,TS val 1132421060 ecr 1132421060,nop,wscale 7], length 0
 IP 127.0.0.1.52772 > 127.0.0.1.6379: Flags [.], ack 1, win 342, options [nop,nop,TS val 1132421060 ecr 1132421060], length 0
-IP 127.0.0.1.52772 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132421060 ecr 1132421060], length 6: RESP [|RESP]
+IP 127.0.0.1.52772 > 127.0.0.1.6379: Flags [P.], seq 1:7, ack 1, win 342, options [nop,nop,TS val 1132421060 ecr 1132421060], length 6: RESP [|resp]
 IP 127.0.0.1.6379 > 127.0.0.1.52772: Flags [.], ack 7, win 342, options [nop,nop,TS val 1132421060 ecr 1132421060], length 0
 IP 127.0.0.1.52772 > 127.0.0.1.6379: Flags [F.], seq 7, ack 1, win 342, options [nop,nop,TS val 1132421360 ecr 1132421060], length 0
 IP 127.0.0.1.6379 > 127.0.0.1.52772: Flags [F.], seq 1, ack 8, win 342, options [nop,nop,TS val 1132421360 ecr 1132421360], length 0

diff --git a/tests/resp_4_infiniteloop.out b/tests/resp_4_infiniteloop.out
index 396cb8b39af56e1cd58ce38d20d03dd278a1d4ed..a8049324d6a0a01179c15853327880fbde79a857 100644 (file)
--- a/tests/resp_4_infiniteloop.out
+++ b/tests/resp_4_infiniteloop.out
@@ -1,2 +1,2 @@
 00:50:56:b4:08:69 > 00:50:56:b4:4c:2a, ethertype IPv4 (0x0800), length 920: (tos 0x0, ttl 64, id 27576, offset 0, flags [DF], proto TCP (6), length 906)
-    172.16.8.77.33926 > 172.16.8.149.6379: Flags [P.], cksum 0xa129 (incorrect -> 0xaaa0), seq 3839414413:3839415267, ack 2526552240, win 229, options [nop,nop,TS val 2407226 ecr 24894817], length 854: RESP length negative and not -1 invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid "4" "EVAL" invalid invalid invalid invalid "GKMbNZq^@0" "stuubt.pack('<ivdMFG4294967245',^V ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''319', 2',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',', '-1494241318543828858')'L')N))'r')')~D')')E)')')')')')')')'l')')')')')'M-`'o')')'Pp)U)" invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid "1" [|RESP]
+    172.16.8.77.33926 > 172.16.8.149.6379: Flags [P.], cksum 0xa129 (incorrect -> 0xaaa0), seq 3839414413:3839415267, ack 2526552240, win 229, options [nop,nop,TS val 2407226 ecr 24894817], length 854: RESP length negative and not -1 invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid "4" "EVAL" invalid invalid invalid invalid "GKMbNZq^@0" "stuubt.pack('<ivdMFG4294967245',^V ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''319', 2',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',',', '-1494241318543828858')'L')N))'r')')~D')')E)')')')')')')')'l')')')')')'M-`'o')')'Pp)U)" invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid invalid "1" [|resp]

diff --git a/tests/rsvp_fast_reroute-oobr.out b/tests/rsvp_fast_reroute-oobr.out
index 0ca2a684b4759132dbf4a121da9ceed6b93fda9c..3decf5973c0ac23d03c492c5ede752fe1ee5cb79 100644 (file)
--- a/tests/rsvp_fast_reroute-oobr.out
+++ b/tests/rsvp_fast_reroute-oobr.out
@@ -2,5 +2,4 @@ IP (tos 0x0, ttl 224, id 17920, offset 0, flags [none], proto RSVP (46), length
     0.203.243.128 > 0.26.0.0: 
        RSVPv1 Path Message (1), Flags: [Refresh reduction capable], length: 41218, ttl: 227, checksum: 0x00f4
          Fast Re-Route Object (205) Flags: [ignore and forward if unknown], Class-Type: Unknown (0), length: 4
-         Fast Re-Route Object (205) Flags: [ignore and forward if unknown], Class-Type: Unknown (0), length: 4
-                [|rsvp]
+         Fast Re-Route Object (205) Flags: [ignore and forward if unknown], Class-Type: Unknown (0), length: 4 [|rsvp]

diff --git a/tests/snmp-heapoverflow-1.out b/tests/snmp-heapoverflow-1.out
index 58ed9179fcaf47c468df9d2b1ad127e42813dbd9..3fb819354674102ab2aef0ed44aaa5c918159512 100644 (file)
--- a/tests/snmp-heapoverflow-1.out
+++ b/tests/snmp-heapoverflow-1.out
@@ -18,4 +18,4 @@
        0x0010:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
        0x0020:  3030 3030 3030 3030 3030 3030 3030 3030  0000000000000000
        0x0030:  3030                                     00
-IP 48.48.48.48.12336 > 48.48.48.48.161:  [|snmp]
+IP 48.48.48.48.12336 > 48.48.48.48.161:   [|snmp]

diff --git a/tests/snmp-heapoverflow-2.out b/tests/snmp-heapoverflow-2.out
index 987891597a6c0ca4007ada719e0dfab62aa8dc11..5081c023c20f12dd116cd2b68b8d198c0c9754b0 100644 (file)
--- a/tests/snmp-heapoverflow-2.out
+++ b/tests/snmp-heapoverflow-2.out
@@ -1 +1 @@
-IP 48.48.48.48.12336 > 48.48.48.48.162:  [|snmp]
+IP 48.48.48.48.12336 > 48.48.48.48.162:   [|snmp]

diff --git a/tests/wb-oobr.out b/tests/wb-oobr.out
index 255e4f704402c5ad251a696b66b0fba2f1fe2f95..5fe30a04061c8eb04b4d055d7385e6772b1bedbc 100644 (file)
--- a/tests/wb-oobr.out
+++ b/tests/wb-oobr.out
@@ -2,14 +2,14 @@ MPLS (label 197376, exp 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->7754)!)
     48.4.4.4.4400 > 127.0.0.1.3503:  [|lspping]
 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->699d)!)
-    48.48.48.48.3503 > 48.48.48.48.4567: * wb-prep:[|wb]
+    48.48.48.48.3503 > 48.48.48.48.4567: * wb-prep: [|wb]
 MPLS (label 197376, exp 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->699d)!)
     48.48.48.48.4400 > 48.48.48.48.3503:  [|lspping]
 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->c624)!)
-    48.48.0.1.3503 > 48.4.4.4.4567: * wb-prep:[|wb]
+    48.48.0.1.3503 > 48.4.4.4.4567: * wb-prep: [|wb]
 MPLS (label 197376, exp 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->7754)!)
     48.4.4.4.4400 > 127.0.0.1.3503:  [|lspping]
 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->c624)!)
-    48.48.0.1.3503 > 48.4.4.4.4567: * wb-prep:[|wb]
+    48.48.0.1.3503 > 48.4.4.4.4567: * wb-prep: [|wb]