Do the dump file Capsicum stuff in a common routine.

[tcpdump] / print-carp.c

diff --git a/print-carp.c b/print-carp.c
index 832d7ae1cc588ad89b96575a926d1d2f4e8242a6..7b9f28ceae4fbbc2ef2836ba49ab29c789ee8a8d 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -34,6 +34,7 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -41,7 +42,6 @@
 #include <tcpdump-stdinc.h>
 
 #include "interface.h" /* for checksum structure and functions */
-#include "netdissect.h"
 #include "extract.h"
 
 void
@@ -68,7 +68,7 @@ carp_print(netdissect_options *ndo, register const u_char *bp, register u_int le
            bp[1], bp[5], bp[2], bp[3]));
        if (ndo->ndo_vflag) {
                struct cksum_vec vec[1];
-               vec[0].ptr = (const u_int8_t *)bp;
+               vec[0].ptr = (const uint8_t *)bp;
                vec[0].len = len;
                if (ND_TTEST2(bp[0], len) && in_cksum(vec, 1))
                        ND_PRINT((ndo, " (bad carp cksum %x!)",