Merge branch 'master' of github.com:the-tcpdump-group/tcpdump

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index caa4232723dcf56849f9e55b367f674308ae91a2..633de9bedb09df76901393494a569c9d35882f72 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,9 +26,9 @@
 #include <tcpdump-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)
@@ -44,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;
        }