Backout CHANGES update - wrong branch

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index a602bc3a511cfde4886733ed1ccc050100bb7447..73b990a301ed0dc1fb58e13dbcddd6c8385f88fa 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -20,24 +20,15 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.40 2000-12-16 22:00:50 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53.2.4 2007-02-26 13:31:33 hannes Exp $ (LBL)";
 #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>
@@ -45,16 +36,13 @@ struct rtentry;
 
 #include "interface.h"
 #include "addrtoname.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
  * 32-bit integer that specifies the family, e.g. AF_INET.
@@ -67,35 +55,6 @@ struct rtentry;
  */
 #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.
@@ -105,15 +64,37 @@ null_print(u_int family, u_int length)
 #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(u_int family, u_int length)
+{
+       if (!qflag) {
+               (void)printf("AF %s (%u)",
+                       tok2str(bsd_af_values,"Unknown",family),family);
+       } else {
+               (void)printf("%s",
+                       tok2str(bsd_af_values,"Unknown AF %u",family));
+       }
+
+       (void)printf(", 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(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;
 
-       ts_print(&h->ts);
+       if (caplen < NULL_HDRLEN) {
+               printf("[|null]");
+               return (NULL_HDRLEN);
+       }
 
        memcpy((char *)&family, (char *)p, sizeof(family));
 
@@ -128,37 +109,53 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        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 (eflag)
+               null_hdr_print(family, length);
 
        length -= NULL_HDRLEN;
+       caplen -= NULL_HDRLEN;
+       p += NULL_HDRLEN;
 
-       ip = (struct ip *)(p + NULL_HDRLEN);
+       switch (family) {
 
-       if (eflag)
-               null_print(family, length);
-
-       switch (IP_V(ip)) {
-       case 4:
-               ip_print((const u_char *)ip, length);
+       case BSD_AFNUM_INET:
+               ip_print(gndo, p, length);
                break;
+
 #ifdef INET6
-       case 6:
-               ip6_print((const u_char *)ip, length);
+       case BSD_AFNUM_INET6_BSD:
+       case BSD_AFNUM_INET6_FREEBSD:
+       case BSD_AFNUM_INET6_DARWIN:
+               ip6_print(p, length);
                break;
-#endif /* INET6 */
-       default:
-               printf("ip v%d", IP_V(ip));
+#endif
+
+       case BSD_AFNUM_ISO:
+               isoclns_print(p, length, caplen);
+               break;
+
+       case BSD_AFNUM_APPLETALK:
+               atalk_print(p, length);
+               break;
+
+       case BSD_AFNUM_IPX:
+               ipx_print(p, length);
                break;
+
+       default:
+               /* unknown AF_ value */
+               if (!eflag)
+                       null_hdr_print(family, length + NULL_HDRLEN);
+               if (!suppress_default_print)
+                       default_print(p, caplen);
        }
 
-       if (xflag)
-               default_print((const u_char *)ip, caplen - NULL_HDRLEN);
-       putchar('\n');
+       return (NULL_HDRLEN);
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */