diff options
Diffstat (limited to 'contrib/tcpdump/print-ah.c')
| -rw-r--r-- | contrib/tcpdump/print-ah.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/contrib/tcpdump/print-ah.c b/contrib/tcpdump/print-ah.c index 50af4d4..4094c25 100644 --- a/contrib/tcpdump/print-ah.c +++ b/contrib/tcpdump/print-ah.c @@ -22,20 +22,15 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.15 2001/09/17 21:57:54 fenner Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.19.2.3 2003/11/19 00:35:43 guy Exp $ (LBL)"; #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 <tcpdump-stdinc.h> #include <stdio.h> @@ -43,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; @@ -58,18 +54,18 @@ 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); - + return sizeof(struct ah) + sumlen; trunc: fputs("[|AH]", stdout); - return 65535; + return -1; } |
