X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5cea2703185c6af1616dc338c43c6cf67b0bec60..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-ah.c

diff --git a/print-ah.c b/print-ah.c
index d47309bf..735226f6 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -24,41 +24,39 @@
 /* \summary: IPSEC Authentication Header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
-
-#include "ah.h"
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
 
+#include "ah.h"
+
 int
 ah_print(netdissect_options *ndo, const u_char *bp)
 {
 	const struct ah *ah;
-	int sumlen;
+	u_int sumlen;
 
+	ndo->ndo_protocol = "ah";
 	ah = (const struct ah *)bp;
 
-	ND_TCHECK(*ah);
+	ND_TCHECK_SIZE(ah);
 
-	sumlen = ah->ah_len << 2;
+	sumlen = EXTRACT_U_1(ah->ah_len) << 2;
 
-	ND_PRINT((ndo, "AH(spi=0x%08x", EXTRACT_BE_U_4(&ah->ah_spi)));
+	ND_PRINT("AH(spi=0x%08x", EXTRACT_BE_U_4(ah->ah_spi));
 	if (ndo->ndo_vflag)
-		ND_PRINT((ndo, ",sumlen=%d", sumlen));
+		ND_PRINT(",sumlen=%u", sumlen);
 	ND_TCHECK_4(ah + 1);
-	ND_PRINT((ndo, ",seq=0x%x", EXTRACT_BE_U_4(ah + 1)));
-	if (!ND_TTEST_LEN(bp, sizeof(struct ah) + sumlen)) {
-		ND_PRINT((ndo, "[truncated]):"));
-		return -1;
-	}
-	ND_PRINT((ndo, "): "));
+	ND_PRINT(",seq=0x%x", EXTRACT_BE_U_4(ah + 1));
+	ND_TCHECK_LEN(bp, sizeof(struct ah) + sumlen);
+	ND_PRINT("): ");
 
 	return sizeof(struct ah) + sumlen;
  trunc:
-	ND_PRINT((ndo, "[|AH]"));
+	nd_print_trunc(ndo);
 	return -1;
 }