Include <string.h> only if required.

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index f1af54401a4e32d197a4dc4b52a9686b2784456e..a1b03f86aae62f912877bc9be149cef823b4dfb7 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,18 +19,20 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: BSD loopback device printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <string.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
 #include "af.h"
 
+
 /*
  * 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.
@@ -51,18 +53,18 @@
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-static inline void
-null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
+static void
+null_hdr_print(netdissect_options *ndo, uint32_t family, u_int length)
 {
        if (!ndo->ndo_qflag) {
-               ND_PRINT((ndo, "AF %s (%u)",
-                       tok2str(bsd_af_values,"Unknown",family),family));
+               ND_PRINT("AF %s (%u)",
+                       tok2str(bsd_af_values,"Unknown",family),family);
        } else {
-               ND_PRINT((ndo, "%s",
-                       tok2str(bsd_af_values,"Unknown AF %u",family)));
+               ND_PRINT("%s",
+                       tok2str(bsd_af_values,"Unknown AF %u",family));
        }
 
-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);
 }
 
 /*
@@ -71,19 +73,18 @@ null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
-       u_int family;
+       uint32_t family;
 
-       if (caplen < NULL_HDRLEN) {
-               ND_PRINT((ndo, "[|null]"));
-               return (NULL_HDRLEN);
-       }
+       ndo->ndo_protocol = "null";
+       ND_TCHECK_LEN(p, NULL_HDRLEN);
+       ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
-       memcpy((char *)&family, (char *)p, sizeof(family));
+       family = GET_HE_U_4(p);
 
        /*
         * This isn't necessarily in our host byte order; if this is
@@ -109,20 +110,18 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                ip_print(ndo, p, length);
                break;
 
-#ifdef INET6
        case BSD_AFNUM_INET6_BSD:
        case BSD_AFNUM_INET6_FREEBSD:
        case BSD_AFNUM_INET6_DARWIN:
                ip6_print(ndo, p, length);
                break;
-#endif
 
        case BSD_AFNUM_ISO:
-               isoclns_print(p, length, caplen);
+               isoclns_print(ndo, p, length);
                break;
 
        case BSD_AFNUM_APPLETALK:
-               atalk_print(p, length);
+               atalk_print(ndo, p, length);
                break;
 
        case BSD_AFNUM_IPX:
@@ -134,15 +133,6 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                if (!ndo->ndo_eflag)
                        null_hdr_print(ndo, family, length + NULL_HDRLEN);
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
        }
-
-       return (NULL_HDRLEN);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */