X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64e8f9a9ed91a3cbfa8e66367f87ef50a1d62b99..2db7c32de1a1c3e7f940e8275a285bbf44c658ad:/print-null.c

diff --git a/print-null.c b/print-null.c
index f2ea96e2..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"
@@ -82,12 +79,8 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	uint32_t family;
 
 	ndo->ndo_protocol = "null";
-	if (caplen < NULL_HDRLEN) {
-		ndo->ndo_ll_header_length += caplen;
-		nd_print_trunc(ndo);
-		return;
-	}
-	ndo->ndo_ll_header_length += NULL_HDRLEN;
+	ND_TCHECK_LEN(p, NULL_HDRLEN);
+	ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
 	family = GET_HE_U_4(p);
 
@@ -111,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;
 
@@ -140,6 +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;
 }