Fix mkdep invocations.

[tcpdump] / print-carp.c

diff --git a/print-carp.c b/print-carp.c
index eb893e2af2b7d18314c331ebe5cecca1d37169f9..45ed4f0fcb5318d2ee6144cb76bf17fc9ebcdb34 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -34,6 +34,8 @@
  *
  */
 
+/* \summary: Common Address Redundancy Protocol (CARP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -64,16 +66,16 @@ carp_print(netdissect_options *ndo, register const u_char *bp, register u_int le
        ND_TCHECK(bp[2]);
        ND_TCHECK(bp[5]);
        ND_PRINT((ndo, "vhid=%d advbase=%d advskew=%d authlen=%d ",
-           bp[1], bp[5], bp[2], bp[3]));
+           EXTRACT_U_1(bp + 1), EXTRACT_U_1(bp + 5), EXTRACT_U_1(bp + 2), EXTRACT_U_1(bp + 3)));
        if (ndo->ndo_vflag) {
                struct cksum_vec vec[1];
                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!)",
-                               EXTRACT_16BITS(&bp[6])));
+                               EXTRACT_BE_U_2(bp + 6)));
        }
-       ND_PRINT((ndo, "counter=%" PRIu64, EXTRACT_64BITS(&bp[8])));
+       ND_PRINT((ndo, "counter=%" PRIu64, EXTRACT_BE_U_8(bp + 8)));
 
        return;
 trunc: