Include <string.h> only if required.

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index cdbb3734bcd02428a9251a29dbba0e8158785319..a1b03f86aae62f912877bc9be149cef823b4dfb7 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,32 +19,19 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.45 2002-12-18 08:53:22 guy Exp $ (LBL)";
-#endif
+/* \summary: BSD loopback device printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
-#include "addrtoname.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
+#include "af.h"
 
-#include "ip.h"
-#ifdef INET6
-#include "ip6.h"
-#endif
-
-#ifndef AF_NS
-#define AF_NS          6               /* XEROX NS protocols */
-#endif
 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
@@ -58,36 +45,6 @@ static const char rcsid[] =
  */
 #define        NULL_HDRLEN 4
 
-static void
-null_print(u_int family, u_int length)
-{
-       if (nflag)
-               printf("AF %u ", family);
-       else {
-               switch (family) {
-
-               case AF_INET:
-                       printf("ip ");
-                       break;
-
-#ifdef INET6
-               case AF_INET6:
-                       printf("ip6 ");
-                       break;
-#endif
-
-               case AF_NS:
-                       printf("ns ");
-                       break;
-
-               default:
-                       printf("AF %u ", family);
-                       break;
-               }
-       }
-       printf("%d: ", length);
-}
-
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
@@ -96,18 +53,38 @@ null_print(u_int family, u_int length)
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
+static void
+null_hdr_print(netdissect_options *ndo, uint32_t family, u_int length)
+{
+       if (!ndo->ndo_qflag) {
+               ND_PRINT("AF %s (%u)",
+                       tok2str(bsd_af_values,"Unknown",family),family);
+       } else {
+               ND_PRINT("%s",
+                       tok2str(bsd_af_values,"Unknown AF %u",family));
+       }
+
+       ND_PRINT(", length %u: ", length);
+}
+
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the ether header of the packet, 'h->ts' is the timestamp,
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
+ * is the number of bytes actually captured.
+ */
 void
-null_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+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;
-       const struct ip *ip;
-       u_int family;
+       uint32_t family;
 
-       ++infodelay;
-       ts_print(&h->ts);
+       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
@@ -120,39 +97,42 @@ null_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 
-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
+       if (ndo->ndo_eflag)
+               null_hdr_print(ndo, family, length);
 
        length -= NULL_HDRLEN;
+       caplen -= NULL_HDRLEN;
+       p += NULL_HDRLEN;
+
+       switch (family) {
+
+       case BSD_AFNUM_INET:
+               ip_print(ndo, p, length);
+               break;
 
-       ip = (struct ip *)(p + NULL_HDRLEN);
+       case BSD_AFNUM_INET6_BSD:
+       case BSD_AFNUM_INET6_FREEBSD:
+       case BSD_AFNUM_INET6_DARWIN:
+               ip6_print(ndo, p, length);
+               break;
 
-       if (eflag)
-               null_print(family, length);
+       case BSD_AFNUM_ISO:
+               isoclns_print(ndo, p, length);
+               break;
 
-       switch (IP_V(ip)) {
-       case 4:
-               ip_print((const u_char *)ip, length);
+       case BSD_AFNUM_APPLETALK:
+               atalk_print(ndo, p, length);
                break;
-#ifdef INET6
-       case 6:
-               ip6_print((const u_char *)ip, length);
+
+       case BSD_AFNUM_IPX:
+               ipx_print(ndo, p, length);
                break;
-#endif /* INET6 */
+
        default:
-               printf("ip v%d", IP_V(ip));
-               break;
+               /* unknown AF_ value */
+               if (!ndo->ndo_eflag)
+                       null_hdr_print(ndo, family, length + NULL_HDRLEN);
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
        }
-
-       if (xflag)
-               default_print((const u_char *)ip, caplen - NULL_HDRLEN);
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
 }
-