X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3d932490b826facb568937a1290910a1265267f5..a9a7c86c7875a38358a9ff1f2a35e93febf6f41e:/print-ah.c diff --git a/print-ah.c b/print-ah.c index 27616c59..ecd106b7 100644 --- a/print-ah.c +++ b/print-ah.c @@ -22,8 +22,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.17 2002-08-01 08:52:59 risso Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.22 2003-11-19 00:36:06 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -38,9 +38,10 @@ static const char rcsid[] = #include "interface.h" #include "addrtoname.h" +#include "extract.h" int -ah_print(register const u_char *bp, register const u_char *bp2) +ah_print(register const u_char *bp) { register const struct ah *ah; register const u_char *ep; @@ -53,12 +54,12 @@ ah_print(register const u_char *bp, register const u_char *bp2) TCHECK(*ah); sumlen = ah->ah_len << 2; - spi = (u_int32_t)ntohl(ah->ah_spi); + spi = EXTRACT_32BITS(&ah->ah_spi); printf("AH(spi=0x%08x", spi); if (vflag) printf(",sumlen=%d", sumlen); - printf(",seq=0x%x", (u_int32_t)ntohl(*(const u_int32_t *)(ah + 1))); + printf(",seq=0x%x", EXTRACT_32BITS(ah + 1)); if (bp + sizeof(struct ah) + sumlen > ep) fputs("[truncated]", stdout); fputs("): ", stdout); @@ -66,5 +67,5 @@ ah_print(register const u_char *bp, register const u_char *bp2) return sizeof(struct ah) + sumlen; trunc: fputs("[|AH]", stdout); - return 65535; + return -1; }