X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..refs/heads/master:/print-null.c

diff --git a/print-null.c b/print-null.c
index e7daacd4..725d5839 100644
--- a/print-null.c
+++ b/print-null.c
@@ -21,14 +21,11 @@
 
 /* \summary: BSD loopback device printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "af.h"
@@ -55,7 +52,7 @@
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 static void
-null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
+null_hdr_print(netdissect_options *ndo, uint32_t family, u_int length)
 {
 	if (!ndo->ndo_qflag) {
 		ND_PRINT("AF %s (%u)",
@@ -74,19 +71,18 @@ null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 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;
 	uint32_t family;
 
-	ndo->ndo_protocol = "null_if";
-	if (caplen < NULL_HDRLEN)
-		goto trunc;
+	ndo->ndo_protocol = "null";
+	ND_TCHECK_LEN(p, NULL_HDRLEN);
+	ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
-	ND_TCHECK_4(p);
-	memcpy((char *)&family, (const char *)p, sizeof(family));
+	family = GET_HE_U_4(p);
 
 	/*
 	 * This isn't necessarily in our host byte order; if this is
@@ -108,25 +104,25 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 
 	switch (family) {
 
-	case BSD_AFNUM_INET:
+	case BSD_AF_INET:
 		ip_print(ndo, p, length);
 		break;
 
-	case BSD_AFNUM_INET6_BSD:
-	case BSD_AFNUM_INET6_FREEBSD:
-	case BSD_AFNUM_INET6_DARWIN:
+	case BSD_AF_INET6_BSD:
+	case BSD_AF_INET6_FREEBSD:
+	case BSD_AF_INET6_DARWIN:
 		ip6_print(ndo, p, length);
 		break;
 
-	case BSD_AFNUM_ISO:
+	case BSD_AF_ISO:
 		isoclns_print(ndo, p, length);
 		break;
 
-	case BSD_AFNUM_APPLETALK:
+	case BSD_AF_APPLETALK:
 		atalk_print(ndo, p, length);
 		break;
 
-	case BSD_AFNUM_IPX:
+	case BSD_AF_IPX:
 		ipx_print(ndo, p, length);
 		break;
 
@@ -137,9 +133,4 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		if (!ndo->ndo_suppress_default_print)
 			ND_DEFAULTPRINT(p, caplen);
 	}
-
-	return (NULL_HDRLEN);
-trunc:
-	nd_print_trunc(ndo);
-	return (NULL_HDRLEN);
 }