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 1ba687e843e0524baf48a4c5ae3a7c6d8c083b90..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
@@ -49,13 +48,13 @@ ipcomp_print(netdissect_options *ndo, register const u_char *bp, int *nhdr _U_)
        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;
        }