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

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 360fc5e5421e42f0418df12b2db3cf60503d2488..6f1a357cf227e23660cd0f879f49612de9e8eee0 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,11 +21,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPSEC Authentication Header printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "ah.h"
 
@@ -36,24 +38,23 @@ int
 ah_print(netdissect_options *ndo, register const u_char *bp)
 {
        register const struct ah *ah;
-       register const u_char *ep;
        int sumlen;
-       u_int32_t spi;
 
        ah = (const struct ah *)bp;
-       ep = ndo->ndo_snapend;          /* 'ep' points to the end of available data. */
 
        ND_TCHECK(*ah);
 
        sumlen = ah->ah_len << 2;
-       spi = EXTRACT_32BITS(&ah->ah_spi);
 
-       ND_PRINT((ndo, "AH(spi=0x%08x", 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_PRINT((ndo, ",seq=0x%x", EXTRACT_32BITS(ah + 1)));
-       if (bp + sizeof(struct ah) + sumlen > ep)
-               ND_PRINT((ndo, "[truncated]"));
+       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;