Merge pull request #667 from slavashw/master

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 874521e24aca006c9fc776815f28c25259394b1d..64fdfa25aae87d3e5dd752e2a081edb6a3178fbd 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -30,8 +30,11 @@
 #include <string.h>
 
 #include "netdissect.h"
+#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
  * 32-bit integer that specifies the family, e.g. AF_INET.
@@ -77,13 +80,13 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
-       u_int family;
+       uint32_t family;
 
-       if (caplen < NULL_HDRLEN) {
-               ND_PRINT("[|null]");
-               return (NULL_HDRLEN);
-       }
+       ndo->ndo_protocol = "null_if";
+       if (caplen < NULL_HDRLEN)
+               goto trunc;
 
+       ND_TCHECK_4(p);
        memcpy((char *)&family, (const char *)p, sizeof(family));
 
        /*
@@ -136,12 +139,8 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                        ND_DEFAULTPRINT(p, caplen);
        }
 
+       return (NULL_HDRLEN);
+trunc:
+       ND_PRINT("%s", tstr);
        return (NULL_HDRLEN);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */