X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/207f31f2bd0a007f978b60ad0881a30c055f32ee..refs/pull/482/head:/print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index e5a38b6a..a6d25257 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -23,12 +23,12 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 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 */
+	uint8_t comp_nxt;	/* Next Header */
+	uint8_t comp_flags;	/* Length of data, in 32bit */
+	uint16_t comp_cpi;	/* Compression parameter index */
 };
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
@@ -43,18 +43,18 @@ ipcomp_print(netdissect_options *ndo, register const u_char *bp, int *nhdr _U_)
 {
 	register const struct ipcomp *ipcomp;
 	register const u_char *ep;
-	u_int16_t cpi;
+	uint16_t cpi;
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 	int advance;
 #endif
 
-	ipcomp = (struct ipcomp *)bp;
+	ipcomp = (const struct ipcomp *)bp;
 	cpi = EXTRACT_16BITS(&ipcomp->comp_cpi);
 
 	/* 'ep' points to the end of available data. */
 	ep = ndo->ndo_snapend;
 
-	if ((u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {
+	if ((const u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {
 		ND_PRINT((ndo, "[|IPCOMP]"));
 		goto fail;
 	}