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

diff --git a/print-null.c b/print-null.c
index 315fafdb..166f777d 100644
--- a/print-null.c
+++ b/print-null.c
@@ -19,28 +19,17 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#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)";
-#endif
-
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
-#include "addrtoname.h"
-
-#include "ip.h"
-#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 +43,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 +51,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(netdissect_options *ndo, u_int family, u_int length)
+{
+	if (!ndo->ndo_qflag) {
+		ND_PRINT((ndo, "AF %s (%u)",
+			tok2str(bsd_af_values,"Unknown",family),family));
+	} else {
+		ND_PRINT((ndo, "%s",
+			tok2str(bsd_af_values,"Unknown AF %u",family)));
+	}
+
+	ND_PRINT((ndo, ", 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,
@@ -98,14 +72,14 @@ const struct tok bsd_af_values[] = {
  * is the number of bytes actually captured.
  */
 u_int
-null_if_print(const struct pcap_pkthdr *h, const u_char *p)
+null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int length = h->len;
 	u_int caplen = h->caplen;
 	u_int family;
 
 	if (caplen < NULL_HDRLEN) {
-		printf("[|null]");
+		ND_PRINT((ndo, "[|null]"));
 		return (NULL_HDRLEN);
 	}
 
@@ -122,43 +96,43 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 	if ((family & 0xFFFF0000) != 0)
 		family = SWAPLONG(family);
 
+	if (ndo->ndo_eflag)
+		null_hdr_print(ndo, 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(ndo, 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(ndo, p, length);
 		break;
-#endif
 
-	case BSD_AF_ISO:
-		isoclns_print(p, length, caplen);
+	case BSD_AFNUM_ISO:
+		isoclns_print(ndo, p, length, caplen);
 		break;
 
-	case BSD_AF_APPLETALK:
-		atalk_print(p, length);
+	case BSD_AFNUM_APPLETALK:
+		atalk_print(ndo, p, length);
 		break;
 
-	case BSD_AF_IPX:
-		ipx_print(p, length);
+	case BSD_AFNUM_IPX:
+		ipx_print(ndo, p, length);
 		break;
 
 	default:
 		/* unknown AF_ value */
-		if (!xflag && !qflag)
-			default_print(p, caplen);
+		if (!ndo->ndo_eflag)
+			null_hdr_print(ndo, family, length + NULL_HDRLEN);
+		if (!ndo->ndo_suppress_default_print)
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
 	return (NULL_HDRLEN);