Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 61bdf91c7ba9ac198a09c51571e9654930b25ed5..6f1a357cf227e23660cd0f879f49612de9e8eee0 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,81 +21,44 @@
  * 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 "ah.h"
 
-#include "nfs.h"
-#include "bootp.h"
+#include "netdissect.h"
+#include "extract.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, register 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));
-
-  if (length < 8) {
-    (void)printf(" [|ah] truncated-ah %d", length);
-    return;
-  }
-
-  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);
+       register const struct ah *ah;
+       int sumlen;
+
+       ah = (const struct ah *)bp;
+
+       ND_TCHECK(*ah);
+
+       sumlen = ah->ah_len << 2;
+
+       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_TTEST2(*bp, sizeof(struct ah) + sumlen)) {
+               ND_PRINT((ndo, "[truncated]):"));
+               return -1;
+       }
+       ND_PRINT((ndo, "): "));
+
+       return sizeof(struct ah) + sumlen;
+ trunc:
+       ND_PRINT((ndo, "[|AH]"));
+       return -1;
 }