X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8cb3096bf915e914780a189fe3bb0767bc1a44d7..05a730b5ec781c985988c38694038b22dd1dc912:/print-null.c

diff --git a/print-null.c b/print-null.c
index a0bd3c17..315fafdb 100644
--- 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.54 2005-05-18 13:50:52 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -70,49 +70,18 @@ static const char rcsid[] =
 #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;
+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_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.
@@ -125,7 +94,7 @@ null_print(u_int family, u_int 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
@@ -158,12 +127,12 @@ 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) {
 
 	case BSD_AF_INET:
-		ip_print(p, length);
+	        ip_print(gndo, p, length);
 		break;
 
 #ifdef INET6
@@ -175,7 +144,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 #endif
 
 	case BSD_AF_ISO:
-		isoclns_print(p, length, caplen, NULL, NULL);
+		isoclns_print(p, length, caplen);
 		break;
 
 	case BSD_AF_APPLETALK:
@@ -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);
 	}
@@ -197,3 +164,9 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 	return (NULL_HDRLEN);
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */