Merge pull request #328 from darkjames/master

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 11f90ef36023e3e603d08d06d6fef411a571b9e7..8eabe5dd994a8c8cf3e9411f394de14d1483a296 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.55 2005-05-19 07:25:49 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.57 2006-03-23 14:58:44 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -41,6 +41,7 @@ static const char rcsid[] _U_ =
 #ifdef INET6
 #include "ip6.h"
 #endif
+#include "af.h"
 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
@@ -54,35 +55,6 @@ static const char rcsid[] _U_ =
  */
 #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
-
-const struct tok bsd_af_values[] = {
-        { BSD_AF_INET, "IPv4" },
-        { BSD_AF_NS, "NS" },
-        { BSD_AF_ISO, "ISO" },
-        { BSD_AF_APPLETALK, "Appletalk" },
-        { BSD_AF_IPX, "IPX" },
-        { BSD_AF_INET6_BSD, "IPv6" },
-        { BSD_AF_INET6_FREEBSD, "IPv6" },
-        { BSD_AF_INET6_DARWIN, "IPv6" },
-        { 0, NULL}
-};
-
-
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
@@ -145,27 +117,27 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 
        switch (family) {
 
-       case BSD_AF_INET:
+       case BSD_AFNUM_INET:
                ip_print(gndo, p, length);
                break;
 
 #ifdef INET6
-       case BSD_AF_INET6_BSD:
-       case BSD_AF_INET6_FREEBSD:
-       case BSD_AF_INET6_DARWIN:
-               ip6_print(p, length);
+       case BSD_AFNUM_INET6_BSD:
+       case BSD_AFNUM_INET6_FREEBSD:
+       case BSD_AFNUM_INET6_DARWIN:
+               ip6_print(gndo, p, length);
                break;
 #endif
 
-       case BSD_AF_ISO:
+       case BSD_AFNUM_ISO:
                isoclns_print(p, length, caplen);
                break;
 
-       case BSD_AF_APPLETALK:
+       case BSD_AFNUM_APPLETALK:
                atalk_print(p, length);
                break;
 
-       case BSD_AF_IPX:
+       case BSD_AFNUM_IPX:
                ipx_print(p, length);
                break;
 
@@ -173,7 +145,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
                /* unknown AF_ value */
                if (!eflag)
                        null_hdr_print(family, length + NULL_HDRLEN);
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }