Default to first interface from pcap_findalldevs()

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 6ed2174d65b664125d03cc7f1316c7f920e4c084..6e05a138d1779abacfa83898db63fd81a7940393 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,36 +19,16 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.42 2002-06-01 23:50:33 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <netdissect-stdinc.h>

 
 

-#include <pcap.h>
-#include <stdio.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "interface.h"
-#include "addrtoname.h"
-
-#include "ip.h"
-#ifdef INET6
-#include "ip6.h"
-#endif
-
-#ifndef AF_NS
-#define AF_NS          6               /* XEROX NS protocols */
-#endif
+#include "netdissect.h"
+#include "af.h"

 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order


@@ -62,36 +42,6 @@ static const char rcsid[] =
  */
 #define        NULL_HDRLEN 4
 
  */
 #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
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on


@@ -100,18 +50,39 @@ null_print(u_int family, u_int length)
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 

-void
-null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+static inline void
+null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
+{
+       if (!ndo->ndo_qflag) {
+               ND_PRINT((ndo, "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((ndo, ", 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.
+ */
+u_int
+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 length = h->len;
        u_int caplen = h->caplen;

-       const struct ip *ip;

        u_int family;
 
        u_int family;
 

-       ++infodelay;
-       ts_print(&h->ts);
+       if (caplen < NULL_HDRLEN) {
+               ND_PRINT((ndo, "[|null]"));
+               return (NULL_HDRLEN);
+       }

 
 

-       memcpy((char *)&family, (char *)p, sizeof(family));
+       memcpy((char *)&family, (const char *)p, sizeof(family));

 
        /*
         * This isn't necessarily in our host byte order; if this is
 
        /*
         * This isn't necessarily in our host byte order; if this is


@@ -124,40 +95,51 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 

-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;
+       if (ndo->ndo_eflag)
+               null_hdr_print(ndo, family, length);

 
        length -= NULL_HDRLEN;
 
        length -= NULL_HDRLEN;

+       caplen -= NULL_HDRLEN;
+       p += NULL_HDRLEN;

 
 

-       ip = (struct ip *)(p + NULL_HDRLEN);
+       switch (family) {

 
 

-       if (eflag)
-               null_print(family, length);
+       case BSD_AFNUM_INET:
+               ip_print(ndo, p, length);
+               break;

 
 

-       switch (IP_V(ip)) {
-       case 4:
-               ip_print((const u_char *)ip, length);
+       case BSD_AFNUM_INET6_BSD:
+       case BSD_AFNUM_INET6_FREEBSD:
+       case BSD_AFNUM_INET6_DARWIN:
+               ip6_print(ndo, p, length);

                break;
                break;

-#ifdef INET6
-       case 6:
-               ip6_print((const u_char *)ip, length);
+
+       case BSD_AFNUM_ISO:
+               isoclns_print(ndo, p, length, caplen);

                break;
                break;

-#endif /* INET6 */
-       default:
-               printf("ip v%d", IP_V(ip));
+
+       case BSD_AFNUM_APPLETALK:
+               atalk_print(ndo, p, length);
+               break;
+
+       case BSD_AFNUM_IPX:
+               ipx_print(ndo, p, length);

                break;
                break;

+
+       default:
+               /* 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);
+       return (NULL_HDRLEN);

 }
 
 }
 

+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */