X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e11ed169b11242f2107d02cc3ec2ab5a77736bfb..f1ba3be3963a45f50dc8f47d8434ea29760138ad:/print-ipcomp.c diff --git a/print-ipcomp.c b/print-ipcomp.c index 1e8936ff..67cb9fff 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -19,29 +19,15 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.11 2000-10-06 04:23:12 guy Exp $"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include -#include -#include - -#include +#include #include -#ifdef INET6 -#include -#endif - struct ipcomp { u_int8_t comp_nxt; /* Next Header */ u_int8_t comp_flags; /* Length of data, in 32bit */ @@ -53,10 +39,10 @@ struct ipcomp { #endif #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; @@ -66,7 +52,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; @@ -75,7 +61,7 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr) fputs("[|IPCOMP]", stdout); goto fail; } - printf("IPComp(cpi=%u)", cpi); + printf("IPComp(cpi=0x%04x)", cpi); #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H) if (1) @@ -95,7 +81,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; }