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

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index be1e67ce8ea0f2d60943fd49b4b56aeb750d7ea1..6f1a357cf227e23660cd0f879f49612de9e8eee0 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,56 +21,44 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.13 2000-10-06 11:32:18 itojun Exp $ (LBL)";
-#endif
+/* \summary: IPSEC Authentication Header printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #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 <netinet/in.h>
-
-#include <stdio.h>
+#include <netdissect-stdinc.h>

 
 #include "ah.h"
 
 
 #include "ah.h"
 

-#include "interface.h"
-#include "addrtoname.h"
+#include "netdissect.h"
+#include "extract.h"

 
 int
 
 int

-ah_print(register const u_char *bp, register const u_char *bp2)
+ah_print(netdissect_options *ndo, register const u_char *bp)

 {
        register const struct ah *ah;
 {
        register const struct ah *ah;

-       register const u_char *ep;

        int sumlen;
        int sumlen;

-       u_int32_t spi;

 
 

-       ah = (struct ah *)bp;
-       ep = snapend;           /* 'ep' points to the end of available data. */
+       ah = (const struct ah *)bp;

 
 

-       if ((u_char *)(ah + 1) >= ep - sizeof(struct ah))
-               goto trunc;
+       ND_TCHECK(*ah);

 
        sumlen = ah->ah_len << 2;
 
        sumlen = ah->ah_len << 2;

-       spi = (u_int32_t)ntohl(ah->ah_spi);

 
 

-       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);
-       
+       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:
        return sizeof(struct ah) + sumlen;
  trunc:

-       fputs("[|AH]", stdout);
-       return 65535;
+       ND_PRINT((ndo, "[|AH]"));
+       return -1;

 }
 }