Fix spaces

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index bec6f88f67d05e454ecc8142a55e62017955a664..735226f696ecdf045067460c2cb2c7ffbf0d4c85 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -24,41 +24,39 @@
 /* \summary: IPSEC Authentication Header printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IPSEC Authentication Header printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-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;
-       int sumlen;
+       const struct ah *ah;
+       u_int sumlen;

 
 

+       ndo->ndo_protocol = "ah";

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

-       ND_TCHECK(*ah);
+       ND_TCHECK_SIZE(ah);

 
 

-       sumlen = ah->ah_len << 2;
+       sumlen = EXTRACT_U_1(ah->ah_len) << 2;

 
 

-       ND_PRINT((ndo, "AH(spi=0x%08x", EXTRACT_32BITS(&ah->ah_spi)));
+       ND_PRINT("AH(spi=0x%08x", EXTRACT_BE_U_4(ah->ah_spi));

        if (ndo->ndo_vflag)
        if (ndo->ndo_vflag)

-               ND_PRINT((ndo, ",sumlen=%d", sumlen));
-       ND_TCHECK_32BITS(ah + 1);
-       ND_PRINT((ndo, ",seq=0x%x", EXTRACT_32BITS(ah + 1)));
-       if (!ND_TTEST2(*bp, sizeof(struct ah) + sumlen)) {
-               ND_PRINT((ndo, "[truncated]):"));
-               return -1;
-       }
-       ND_PRINT((ndo, "): "));
+               ND_PRINT(",sumlen=%u", sumlen);
+       ND_TCHECK_4(ah + 1);
+       ND_PRINT(",seq=0x%x", EXTRACT_BE_U_4(ah + 1));
+       ND_TCHECK_LEN(bp, sizeof(struct ah) + sumlen);
+       ND_PRINT("): ");

 
        return sizeof(struct ah) + sumlen;
  trunc:
 
        return sizeof(struct ah) + sumlen;
  trunc:

-       ND_PRINT((ndo, "[|AH]"));
+       nd_print_trunc(ndo);

        return -1;
 }
        return -1;
 }