Use "len", not "payload_len", as we step through the packet; use

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 30724ec68305b7b9fbb7cdc49ad7cd83fb538c72..e8af2196cd4cc36475ef08f0b220f6958996c6c0 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -20,24 +20,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.41 2001-07-05 18:54:15 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.51 2003-11-16 09:36:30 guy Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-struct mbuf;
-struct rtentry;
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

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


@@ -51,10 +42,6 @@ struct rtentry;
 #include "ip6.h"
 #endif
 
 #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
  * 32-bit integer that specifies the family, e.g. AF_INET.
 /*
  * 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.


@@ -67,6 +54,22 @@ struct rtentry;
  */
 #define        NULL_HDRLEN 4
 
  */
 #define        NULL_HDRLEN 4
 

+/*
+ * BSD AF_ values.
+ *
+ * Unfortunately, the BSDs don't all use the same value for AF_INET6,
+ * so, because we want to be able to read captures from all of the BSDs,
+ * we check for all of them.
+ */
+#define BSD_AF_INET            2
+#define BSD_AF_NS              6               /* XEROX NS protocols */
+#define BSD_AF_ISO             7
+#define BSD_AF_APPLETALK       16
+#define BSD_AF_IPX             23
+#define BSD_AF_INET6_BSD       24      /* OpenBSD (and probably NetBSD), BSD/OS */
+#define BSD_AF_INET6_FREEBSD   28
+#define BSD_AF_INET6_DARWIN    30
+

 static void
 null_print(u_int family, u_int length)
 {
 static void
 null_print(u_int family, u_int length)
 {


@@ -75,20 +78,34 @@ null_print(u_int family, u_int length)
        else {
                switch (family) {
 
        else {
                switch (family) {
 

-               case AF_INET:
+               case BSD_AF_INET:

                        printf("ip ");
                        break;
 
 #ifdef INET6
                        printf("ip ");
                        break;
 
 #ifdef INET6

-               case AF_INET6:
+               case BSD_AF_INET6_BSD:
+               case BSD_AF_INET6_FREEBSD:
+               case BSD_AF_INET6_DARWIN:

                        printf("ip6 ");
                        break;
 #endif
 
                        printf("ip6 ");
                        break;
 #endif
 

-               case AF_NS:
+               case BSD_AF_NS:

                        printf("ns ");
                        break;
 
                        printf("ns ");
                        break;
 

+               case BSD_AF_ISO:
+                       printf("osi ");
+                       break;
+
+               case BSD_AF_APPLETALK:
+                       printf("atalk ");
+                       break;
+
+               case BSD_AF_IPX:
+                       printf("ipx ");
+                       break;
+

                default:
                        printf("AF %u ", family);
                        break;
                default:
                        printf("AF %u ", family);
                        break;


@@ -105,16 +122,23 @@ 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)
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the ether header of the packet, 'h->ts' is the timestamp,
+ * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * is the number of bytes actually captured.
+ */
+u_int
+null_if_print(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) {
+               printf("[|null]");
+               return (NULL_HDRLEN);
+       }

 
        memcpy((char *)&family, (char *)p, sizeof(family));
 
 
        memcpy((char *)&family, (char *)p, sizeof(family));
 


@@ -129,40 +153,47 @@ 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;
-

        length -= NULL_HDRLEN;
        length -= NULL_HDRLEN;

-
-       ip = (struct ip *)(p + NULL_HDRLEN);
+       caplen -= NULL_HDRLEN;
+       p += NULL_HDRLEN;

 
        if (eflag)
                null_print(family, length);
 
 
        if (eflag)
                null_print(family, length);
 

-       switch (IP_V(ip)) {
-       case 4:
-               ip_print((const u_char *)ip, length);
+       switch (family) {
+
+       case BSD_AF_INET:
+               ip_print(p, length);

                break;
                break;

+

 #ifdef INET6
 #ifdef INET6

-       case 6:
-               ip6_print((const u_char *)ip, length);
+       case BSD_AF_INET6_BSD:
+       case BSD_AF_INET6_FREEBSD:
+       case BSD_AF_INET6_DARWIN:
+               ip6_print(p, length);

                break;
                break;

-#endif /* INET6 */
-       default:
-               printf("ip v%d", IP_V(ip));
+#endif
+
+       case BSD_AF_ISO:
+               isoclns_print(p, length, caplen);
+               break;
+
+       case BSD_AF_APPLETALK:
+               atalk_print(p, length);

                break;
                break;

+
+       case BSD_AF_IPX:
+               ipx_print(p, length);
+               break;
+
+       default:
+               /* unknown AF_ value */
+               if (!eflag)
+                       null_print(family, length + NULL_HDRLEN);
+               if (!xflag && !qflag)
+                       default_print(p, caplen);

        }
 
        }
 

-       if (xflag)
-               default_print((const u_char *)ip, caplen - NULL_HDRLEN);
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (NULL_HDRLEN);

 }
 
 }