X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/10afb02ac804db7fa41a776fd61eff922c09c4df..58b04f7f360c33a8058d0b9a2d1314e34dff8403:/print-ipcomp.c diff --git a/print-ipcomp.c b/print-ipcomp.c index 8cdb779d..bc76448f 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.16 2002-11-09 17:19:26 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.17 2002-12-11 07:14:03 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -37,7 +37,7 @@ struct ipcomp { u_int8_t comp_nxt; /* Next Header */ u_int8_t comp_flags; /* Length of data, in 32bit */ u_int16_t comp_cpi; /* Compression parameter index */ -} __attribute__((packed)); +}; #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H) #include @@ -45,6 +45,7 @@ struct ipcomp { #include "interface.h" #include "addrtoname.h" +#include "extract.h" int ipcomp_print(register const u_char *bp, int *nhdr) @@ -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;