Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 315fafdb5ae200f9202350fd00ed455bff2936cc..a69997da12e312e692dcdbb2f739403a32328921 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.54 2005-05-18 13:50:52 hannes 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
@@ -91,6 +63,20 @@ const struct tok bsd_af_values[] = {
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
+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,
@@ -122,42 +108,44 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 
+       if (eflag)
+               null_hdr_print(family, length);
+
        length -= NULL_HDRLEN;
        caplen -= NULL_HDRLEN;
        p += NULL_HDRLEN;
 
-       if (eflag)
-               printf("AF %s (%u)",tok2str(bsd_af_values,"Unknown",family),family);
-
        switch (family) {
 
-       case BSD_AF_INET:
-               ip_print(gndo, p, length);
+       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:
+       case BSD_AFNUM_INET6_BSD:
+       case BSD_AFNUM_INET6_FREEBSD:
+       case BSD_AFNUM_INET6_DARWIN:
                ip6_print(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;
 
        default:
                /* unknown AF_ value */
-               if (!xflag && !qflag)
+               if (!eflag)
+                       null_hdr_print(family, length + NULL_HDRLEN);
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }