X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c422d3ab0f6de2d38512a4566637bc47df291e74..refs/heads/tcpdump-4.1:/print-ipcomp.c diff --git a/print-ipcomp.c b/print-ipcomp.c index 2ee01183..89130a37 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -20,8 +20,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.15 2002-09-05 21:25:42 guy Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003-11-19 00:36:08 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -45,9 +45,10 @@ struct ipcomp { #include "interface.h" #include "addrtoname.h" +#include "extract.h" int -ipcomp_print(register const u_char *bp, int *nhdr) +ipcomp_print(register const u_char *bp, int *nhdr _U_) { register const struct ipcomp *ipcomp; register const u_char *ep; @@ -57,7 +58,7 @@ ipcomp_print(register const u_char *bp, 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; @@ -86,7 +87,5 @@ ipcomp_print(register const u_char *bp, int *nhdr) #endif fail: - if (nhdr) - *nhdr = -1; - return 65536; + return -1; }