X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e89409254248af64db721ede4babbe9fd1753f6c..refs/pull/482/head:/print-null.c

diff --git a/print-null.c b/print-null.c
index c08f28dc..6e05a138 100644
--- a/print-null.c
+++ b/print-null.c
@@ -19,127 +19,127 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.32 2000-09-23 08:03:39 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#include <netdissect-stdinc.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
+#include <string.h>
 
-#include "interface.h"
-#include "addrtoname.h"
-
-#ifndef AF_NS
-#define AF_NS		6		/* XEROX NS protocols */
-#endif
+#include "netdissect.h"
+#include "af.h"
 
 /*
- * The DLT_NULL packet header is 4 bytes long. It contains a network
- * order 32 bit integer that specifies the family, e.g. AF_INET
+ * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
+ * 32-bit integer that specifies the family, e.g. AF_INET.
+ *
+ * Note here that "host" refers to the host on which the packets were
+ * captured; that isn't necessarily *this* host.
+ *
+ * The OpenBSD DLT_LOOP packet header is the same, except that the integer
+ * is in network byte order.
  */
 #define	NULL_HDRLEN 4
 
-static void
-null_print(const u_char *p, const struct ip *ip, u_int length)
-{
-	u_int family;
-
-	memcpy((char *)&family, (char *)p, sizeof(family));
+/*
+ * Byte-swap a 32-bit number.
+ * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
+ * big-endian platforms.)
+ */
+#define	SWAPLONG(y) \
+((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-	if (nflag) {
-		/* XXX just dump the header */
-		return;
+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)));
 	}
-	switch (family) {
 
-	case AF_INET:
-		printf("ip: ");
-		break;
-
-#ifdef INET6
-	case AF_INET6:
-		printf("ip6: ");
-		break;
-#endif
-
-	case AF_NS:
-		printf("ns: ");
-		break;
-
-	default:
-		printf("AF %d: ", family);
-		break;
-	}
+	ND_PRINT((ndo, ", length %u: ", length));
 }
 
-void
-null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the ether header of the packet, 'h->ts' is the timestamp,
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
+ * is the number of bytes actually captured.
+ */
+u_int
+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;
-	const struct ip *ip;
+	u_int family;
+
+	if (caplen < NULL_HDRLEN) {
+		ND_PRINT((ndo, "[|null]"));
+		return (NULL_HDRLEN);
+	}
 
-	ts_print(&h->ts);
+	memcpy((char *)&family, (const char *)p, sizeof(family));
 
 	/*
-	 * Some printers want to get back at the link level addresses,
-	 * and/or check that they're not walking off the end of the packet.
-	 * Rather than pass them all the way down, we set these globals.
+	 * This isn't necessarily in our host byte order; if this is
+	 * a DLT_LOOP capture, it's in network byte order, and if
+	 * this is a DLT_NULL capture from a machine with the opposite
+	 * byte-order, it's in the opposite byte order from ours.
+	 *
+	 * If the upper 16 bits aren't all zero, assume it's byte-swapped.
 	 */
-	packetp = p;
-	snapend = p + caplen;
+	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;
 
-	ip = (struct ip *)(p + NULL_HDRLEN);
+	switch (family) {
 
-	if (eflag)
-		null_print(p, ip, length);
+	case BSD_AFNUM_INET:
+		ip_print(ndo, p, length);
+		break;
 
-	switch (ip->ip_v) {
-	case 4:
-		ip_print((const u_char *)ip, length);
+	case BSD_AFNUM_INET6_BSD:
+	case BSD_AFNUM_INET6_FREEBSD:
+	case BSD_AFNUM_INET6_DARWIN:
+		ip6_print(ndo, p, length);
 		break;
-#ifdef INET6
-	case 6:
-		ip6_print((const u_char *)ip, length);
+
+	case BSD_AFNUM_ISO:
+		isoclns_print(ndo, p, length, caplen);
 		break;
-#endif /* INET6 */
-	default:
-		printf("ip v%d", ip->ip_v);
+
+	case BSD_AFNUM_APPLETALK:
+		atalk_print(ndo, p, length);
+		break;
+
+	case BSD_AFNUM_IPX:
+		ipx_print(ndo, p, length);
 		break;
+
+	default:
+		/* unknown AF_ value */
+		if (!ndo->ndo_eflag)
+			null_hdr_print(ndo, family, length + NULL_HDRLEN);
+		if (!ndo->ndo_suppress_default_print)
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
-	if (xflag)
-		default_print((const u_char *)ip, caplen - NULL_HDRLEN);
-	putchar('\n');
+	return (NULL_HDRLEN);
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */