Use more the ND_TTEST_1() macro

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 360fc5e5421e42f0418df12b2db3cf60503d2488..30fb8d266b4f4ad1fd9d1f78c3a45051bce083be 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,39 +21,40 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: IPSEC Authentication Header printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include "ah.h"
+#include <netdissect-stdinc.h>

 
 #include "netdissect.h"
 #include "extract.h"
 
 
 #include "netdissect.h"
 #include "extract.h"
 

+#include "ah.h"
+

 int
 int

-ah_print(netdissect_options *ndo, register const u_char *bp)
+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;
        int sumlen;

-       u_int32_t spi;

 
        ah = (const struct ah *)bp;
 
        ah = (const struct ah *)bp;

-       ep = ndo->ndo_snapend;          /* 'ep' points to the end of available data. */

 
        ND_TCHECK(*ah);
 
 
        ND_TCHECK(*ah);
 

-       sumlen = ah->ah_len << 2;
-       spi = EXTRACT_32BITS(&ah->ah_spi);
+       sumlen = EXTRACT_U_1(ah->ah_len) << 2;

 
 

-       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));
        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_TTEST_LEN(bp, sizeof(struct ah) + sumlen)) {
+               ND_PRINT((ndo, "[truncated]):"));
+               return -1;
+       }

        ND_PRINT((ndo, "): "));
 
        return sizeof(struct ah) + sumlen;
        ND_PRINT((ndo, "): "));
 
        return sizeof(struct ah) + sumlen;