diff options
Diffstat (limited to 'contrib/tcpdump/print-ipcomp.c')
-rw-r--r-- | contrib/tcpdump/print-ipcomp.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/contrib/tcpdump/print-ipcomp.c b/contrib/tcpdump/print-ipcomp.c index 9975e54..7a3c1ba 100644 --- a/contrib/tcpdump/print-ipcomp.c +++ b/contrib/tcpdump/print-ipcomp.c @@ -20,8 +20,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.13 2000/12/12 09:58:41 itojun Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.17.2.3 2003/11/19 00:35:45 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -29,12 +29,7 @@ static const char rcsid[] = #endif #include <string.h> -#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> @@ -50,9 +45,10 @@ struct ipcomp { #include "interface.h" #include "addrtoname.h" +#include "extract.h" int -ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr) +ipcomp_print(register const u_char *bp, int *nhdr _U_) { register const struct ipcomp *ipcomp; register const u_char *ep; @@ -62,7 +58,7 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr) #endif ipcomp = (struct ipcomp *)bp; - cpi = (u_int16_t)ntohs(ipcomp->comp_cpi); + cpi = EXTRACT_16BITS(&ipcomp->comp_cpi); /* 'ep' points to the end of available data. */ ep = snapend; @@ -91,7 +87,5 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr) #endif fail: - if (nhdr) - *nhdr = -1; - return 65536; + return -1; } |