X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/536f5125835b031330f472aebed8241a1718b018..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 4787471b..30fb8d26 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,76 +21,44 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.8 2000-09-23 08:54:25 guy Exp $ (LBL)";
-#endif
+/* \summary: IPSEC Authentication Header printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
+#include <netdissect-stdinc.h>
 
-#include <stdio.h>
+#include "netdissect.h"
+#include "extract.h"
 
-/* there's no standard definition so we are on our own */
-struct ah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	u_int32_t	ah_spi;		/* Security parameter index */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-struct newah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data + 1, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	u_int32_t	ah_spi;		/* Security parameter index */
-	u_int32_t	ah_seq;		/* Sequence number field */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-#include "interface.h"
-#include "addrtoname.h"
+#include "ah.h"
 
 int
-ah_print(register const u_char *bp, register const u_char *bp2)
+ah_print(netdissect_options *ndo, const u_char *bp)
 {
-	register const struct ah *ah;
-	register const u_char *ep;
+	const struct ah *ah;
 	int sumlen;
-	u_int32_t spi;
 
-	ah = (struct ah *)bp;
-	ep = snapend;		/* 'ep' points to the end of avaible data. */
+	ah = (const struct ah *)bp;
+
+	ND_TCHECK(*ah);
 
-	if ((u_char *)(ah + 1) >= ep - sizeof(struct ah))
-		goto trunc;
+	sumlen = EXTRACT_U_1(ah->ah_len) << 2;
 
-	sumlen = ah->ah_len << 2;
-	spi = (u_int32_t)ntohl(ah->ah_spi);
+	ND_PRINT((ndo, "AH(spi=0x%08x", EXTRACT_BE_U_4(ah->ah_spi)));
+	if (ndo->ndo_vflag)
+		ND_PRINT((ndo, ",sumlen=%d", 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, "): "));
 
-	printf("AH(spi=%u", spi);
-	if (vflag)
-		printf(",sumlen=%d", sumlen);
-	printf(",seq=0x%x", (u_int32_t)ntohl(*(u_int32_t *)(ah + 1)));
-	if (bp + sizeof(struct ah) + sumlen > ep)
-		fputs("[truncated]", stdout);
-	fputs("): ", stdout);
-	
 	return sizeof(struct ah) + sumlen;
  trunc:
-	fputs("[|AH]", stdout);
-	return 65535;
+	ND_PRINT((ndo, "[|AH]"));
+	return -1;
 }