X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c9d84d15c5c4dc8eca7594101fe5026080ed641e..ea5736c8c68f0fc3699cff8205f2823f97a05f8b:/print-null.c

diff --git a/print-null.c b/print-null.c
index f5b03227..a69997da 100644
--- a/print-null.c
+++ b/print-null.c
@@ -20,120 +20,141 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.26 1999-10-30 05:11:18 itojun 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
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
-#include <net/if.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <tcpdump-stdinc.h>
 
 #include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #include "interface.h"
 #include "addrtoname.h"
 
-#ifndef AF_NS
-#define AF_NS		6		/* XEROX NS protocols */
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
 #endif
+#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)
+/*
+ * 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))
+
+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->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(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]");
+		return (NULL_HDRLEN);
+	}
+
 	memcpy((char *)&family, (char *)p, sizeof(family));
 
-	if (nflag) {
-		/* XXX just dump the header */
-		return;
-	}
+	/*
+	 * 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.
+	 */
+	if ((family & 0xFFFF0000) != 0)
+		family = SWAPLONG(family);
+
+	if (eflag)
+		null_hdr_print(family, length);
+
+	length -= NULL_HDRLEN;
+	caplen -= NULL_HDRLEN;
+	p += NULL_HDRLEN;
+
 	switch (family) {
 
-	case AF_INET:
-		printf("ip: ");
+	case BSD_AFNUM_INET:
+		ip_print(gndo, p, length);
 		break;
 
 #ifdef INET6
-	case AF_INET6:
-		printf("ip6: ");
+	case BSD_AFNUM_INET6_BSD:
+	case BSD_AFNUM_INET6_FREEBSD:
+	case BSD_AFNUM_INET6_DARWIN:
+		ip6_print(p, length);
 		break;
 #endif
 
-	case AF_NS:
-		printf("ns: ");
+	case BSD_AFNUM_ISO:
+		isoclns_print(p, length, caplen);
 		break;
 
-	default:
-		printf("AF %d: ", family);
+	case BSD_AFNUM_APPLETALK:
+		atalk_print(p, length);
 		break;
-	}
-}
-
-void
-null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-{
-	u_int length = h->len;
-	u_int caplen = h->caplen;
-	const struct ip *ip;
 
-	ts_print(&h->ts);
-
-	/*
-	 * 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.
-	 */
-	packetp = p;
-	snapend = p + caplen;
-
-	length -= NULL_HDRLEN;
+	case BSD_AFNUM_IPX:
+		ipx_print(p, length);
+		break;
 
-	ip = (struct ip *)(p + NULL_HDRLEN);
+	default:
+		/* unknown AF_ value */
+		if (!eflag)
+			null_hdr_print(family, length + NULL_HDRLEN);
+		if (!suppress_default_print)
+			default_print(p, caplen);
+	}
 
-	if (eflag)
-		null_print(p, ip, length);
-
-#ifndef INET6
-	ip_print((const u_char *)ip, length);
-#else
-	if (ip->ip_v == IPVERSION)
-		ip_print((const u_char *)ip, length);
-	else if (ip->ip_v == 6)
-		ip6_print((const u_char *)ip, length);
-#endif /*INET6*/
-
-	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:
+ */