X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64e8f9a9ed91a3cbfa8e66367f87ef50a1d62b99..1a9542cfd1f59a329e8cb32fb1737e7c8a11ecd2:/print-arp.c

diff --git a/print-arp.c b/print-arp.c
index e8838174..4855332b 100644
--- a/print-arp.c
+++ b/print-arp.c
@@ -27,8 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -266,11 +265,7 @@ atmarp_print(netdissect_options *ndo,
 	pro = ATMPRO(ap);
 	op = ATMOP(ap);
 
-	if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
-		nd_print_trunc(ndo);
-		ND_DEFAULTPRINT((const u_char *)ap, length);
-		return;
-	}
+	ND_TCHECK_LEN(ATMTPA(ap), ATMTPROTO_LEN(ap));
 
         if (!ndo->ndo_eflag) {
             ND_PRINT("ARP, ");
@@ -347,10 +342,6 @@ atmarp_print(netdissect_options *ndo,
 
  out:
         ND_PRINT(", length %u", length);
-        return;
-
-trunc:
-	nd_print_trunc(ndo);
 }
 
 void
@@ -386,11 +377,7 @@ arp_print(netdissect_options *ndo,
             break;
 	}
 
-	if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
-		nd_print_trunc(ndo);
-		ND_DEFAULTPRINT((const u_char *)ap, length);
-		return;
-	}
+	ND_TCHECK_LEN(TPA(ap), PROTO_LEN(ap));
 
         if (!ndo->ndo_eflag) {
             ND_PRINT("ARP, ");
@@ -467,8 +454,4 @@ arp_print(netdissect_options *ndo,
 
  out:
         ND_PRINT(", length %u", length);
-
-	return;
-trunc:
-	nd_print_trunc(ndo);
 }