ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 95668f92179a1cd881130c759b896d21e84cf1bb..e7c5019676b63d47de4f92e0e624f16d92a2de97 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -157,12 +157,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 
        ndo->ndo_protocol = "llc";
        if (caplen < 3) {
 
        ndo->ndo_protocol = "llc";
        if (caplen < 3) {

-               ND_PRINT("[|llc]");
+               nd_print_trunc(ndo);

                ND_DEFAULTPRINT((const u_char *)p, caplen);
                return (caplen);
        }
        if (length < 3) {
                ND_DEFAULTPRINT((const u_char *)p, caplen);
                return (caplen);
        }
        if (length < 3) {

-               ND_PRINT("[|llc]");
+               nd_print_trunc(ndo);

                ND_DEFAULTPRINT((const u_char *)p, caplen);
                return (length);
        }
                ND_DEFAULTPRINT((const u_char *)p, caplen);
                return (length);
        }


@@ -189,12 +189,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                 * 2 bytes...
                 */
                if (caplen < 4) {
                 * 2 bytes...
                 */
                if (caplen < 4) {

-                       ND_PRINT("[|llc]");
+                       nd_print_trunc(ndo);

                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                        return (caplen);
                }
                if (length < 4) {
                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                        return (caplen);
                }
                if (length < 4) {

-                       ND_PRINT("[|llc]");
+                       nd_print_trunc(ndo);

                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                        return (length);
                }
                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                        return (length);
                }


@@ -368,14 +368,14 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                                return (hdrlen);
                        }
                        if (caplen < 1) {
                                return (hdrlen);
                        }
                        if (caplen < 1) {

-                               ND_PRINT("[|llc]");
+                               nd_print_trunc(ndo);

                                if (caplen > 0)
                                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                                return (hdrlen);
                        }
                        if (EXTRACT_U_1(p) == LLC_XID_FI) {
                                if (caplen < 3 || length < 3) {
                                if (caplen > 0)
                                        ND_DEFAULTPRINT((const u_char *)p, caplen);
                                return (hdrlen);
                        }
                        if (EXTRACT_U_1(p) == LLC_XID_FI) {
                                if (caplen < 3 || length < 3) {

-                                       ND_PRINT("[|llc]");
+                                       nd_print_trunc(ndo);

                                        if (caplen > 0)
                                                ND_DEFAULTPRINT((const u_char *)p, caplen);
                                } else
                                        if (caplen > 0)
                                                ND_DEFAULTPRINT((const u_char *)p, caplen);
                                } else


@@ -605,6 +605,6 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
        return (0);
 
 trunc:
        return (0);
 
 trunc:

-       ND_PRINT("[|snap]");
+       nd_print_trunc(ndo);

        return (1);
 }
        return (1);
 }