X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2d86b23ecde8e2e815ace35e5060856fa61a7e36..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 61bdf91c..a3d05544 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,81 +21,55 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] =
-    "@(#) Header: print-ah.c,v 1.37 94/06/10 17:01:42 mccanne Exp (LBL)";
-#endif
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-#undef NOERROR					/* Solaris sucks */
-#include <arpa/nameser.h>
-#include <arpa/tftp.h>
+/* \summary: IPSEC Authentication Header printer */
 
-#ifdef SOLARIS
-#include <tiuser.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
-#include <rpc/rpc.h>
 
-#include <errno.h>
-#include <stdio.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
-#include "addrtoname.h"
-#include "appletalk.h"
+#include "netdissect.h"
+#include "extract.h"
 
-#include "nfs.h"
-#include "bootp.h"
+#include "ah.h"
 
-extern int packettype;
-
-
-void
-ah_print(register const u_char *bp, int length, register const u_char *bp2)
+int
+ah_print(netdissect_options *ndo, const u_char *bp)
 {
-  register const struct ip *ip;
-  register const u_char *cp, *nh;
-  u_short nextheader;
-  u_short ahlen, authlen;
-  u_long  spi, seqno;
-
-  ip = (struct ip *)bp2;
-
-  (void)printf("AH %s > %s\n\t\t",
-	       ipaddr_string(&ip->ip_src),
-	       ipaddr_string(&ip->ip_dst));
+	const struct ah *ah;
+	uint8_t ah_len;
+	u_int ah_hdr_len;
+	uint16_t reserved;
+	const u_char *p;
 
-  if (length < 8) {
-    (void)printf(" [|ah] truncated-ah %d", length);
-    return;
-  }
+	ndo->ndo_protocol = "ah";
+	ah = (const struct ah *)bp;
 
-  nextheader = bp[0];
-  ahlen      = bp[1];
-  spi        = ntohl(*((u_long *)(bp+4)));
-  seqno      = ntohl(*((u_long *)(bp+8)));
-  authlen    = ahlen - 12;
-
-  nh         = bp+ahlen;
-
-  if(authlen > length || authlen == 0)
-    {
-      authlen = length;
-    }
-
-  (void)printf("spi:%08x seqno:%d authlen: %d authdata: ", spi,
-	       seqno, authlen);
-  (void)default_print_unaligned(bp+12, authlen);
-  
-  (void)print_ipproto(nextheader, ip, nh, length-authlen);
+	nd_print_protocol_caps(ndo);
+/*
+ * RFC4302
+ *
+ * 2.2.  Payload Length
+ *
+ *    This 8-bit field specifies the length of AH in 32-bit words (4-byte
+ *    units), minus "2".
+ */
+	ah_len = GET_U_1(ah->ah_len);
+	ah_hdr_len = (ah_len + 2) * 4;
+
+	ND_PRINT("(");
+	if (ndo->ndo_vflag)
+		ND_PRINT("length=%u(%u-bytes),", ah_len, ah_hdr_len);
+	reserved = GET_BE_U_2(ah->ah_reserved);
+	if (reserved)
+		ND_PRINT("reserved=0x%x[MustBeZero],", reserved);
+	ND_PRINT("spi=0x%08x,", GET_BE_U_4(ah->ah_spi));
+	ND_PRINT("seq=0x%x,", GET_BE_U_4(ah->ah_seq));
+	ND_PRINT("icv=0x");
+	for (p = (const u_char *)(ah + 1); p < bp + ah_hdr_len; p++)
+		ND_PRINT("%02x", GET_U_1(p));
+	ND_PRINT("): ");
+
+	return ah_hdr_len;
 }