remove null_print() and make use of tok2str() instead; proto names taken from etherty...

diff --git a/print-null.c b/print-null.c
index bfdf3e41958e79608f737a22b37ae65eb32f5757..315fafdb5ae200f9202350fd00ed455bff2936cc 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.53 2005-04-06 21:32:41 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.54 2005-05-18 13:50:52 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -70,49 +70,18 @@ static const char rcsid[] _U_ =
 #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;
+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}
+};
 
-               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.
@@ -158,7 +127,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        p += NULL_HDRLEN;
 
        if (eflag)
-               null_print(family, length);
+               printf("AF %s (%u)",tok2str(bsd_af_values,"Unknown",family),family);
 
        switch (family) {
 
@@ -188,8 +157,6 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 
        default:
                /* unknown AF_ value */
-               if (!eflag)
-                       null_print(family, length + NULL_HDRLEN);
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }