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 a0bd3c17af5e9d644d5da7497f5870141476fd7a..a69997da12e312e692dcdbb2f739403a32328921 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.48 2003-02-05 02:28:45 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $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[] =
 #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,66 +55,6 @@ static const char rcsid[] =
  */
 #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)
-{
-       if (nflag)
-               printf("AF %u ", family);
-       else {
-               switch (family) {
-
-               case BSD_AF_INET:
-                       printf("ip ");
-                       break;
-
-#ifdef INET6
-               case BSD_AF_INET6_BSD:
-               case BSD_AF_INET6_FREEBSD:
-               case BSD_AF_INET6_DARWIN:
-                       printf("ip6 ");
-                       break;
-#endif
-
-               case BSD_AF_NS:
-                       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;
-               }
-       }
-       printf("%d: ", length);
-}
-
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
@@ -122,10 +63,24 @@ null_print(u_int family, u_int length)
 #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,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 u_int
@@ -153,47 +108,53 @@ 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)
-               null_print(family, length);
-
        switch (family) {
 
-       case BSD_AF_INET:
-               ip_print(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:
-               isoclns_print(p, length, caplen, NULL, NULL);
+       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 (!eflag)
-                       null_print(family, length + NULL_HDRLEN);
-               if (!xflag && !qflag)
+                       null_hdr_print(family, length + NULL_HDRLEN);
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }
 
        return (NULL_HDRLEN);
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */