Merge pull request #467 from wessels/master

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 0be12628779d61ecdaaeef41d1f53a745cda7a08..3caa0b24a262f48d3c052bbf0cea54cf2ff171bf 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,7 +23,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -127,7 +126,7 @@ vrrp_print(netdissect_options *ndo,
                ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type)));
                ND_PRINT((ndo, ", intvl %us, length %u", bp[5], len));
        } else { /* version == 3 */
-               u_int16_t intvl = (bp[4] & 0x0f) << 8 | bp[5];
+               uint16_t intvl = (bp[4] & 0x0f) << 8 | bp[5];
                ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len));
        }
 
@@ -147,7 +146,7 @@ vrrp_print(netdissect_options *ndo,
                }
 
                if (version == 3 && ND_TTEST2(bp[0], len)) {
-                       u_int16_t cksum = nextproto4_cksum(ndo, (struct ip *)bp2, bp,
+                       uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
                                len, len, IPPROTO_VRRP);
                        if (cksum)
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
@@ -162,14 +161,14 @@ vrrp_print(netdissect_options *ndo,
                bp += 8;
                for (i = 0; i < naddrs; i++) {
                        ND_TCHECK(bp[3]);
-                       ND_PRINT((ndo, "%c%s", c, ipaddr_string(bp)));
+                       ND_PRINT((ndo, "%c%s", c, ipaddr_string(ndo, bp)));
                        c = ',';
                        bp += 4;
                }
                if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
                        ND_TCHECK(bp[7]);
                        ND_PRINT((ndo, " auth \""));
-                       if (fn_printn(bp, 8, ndo->ndo_snapend)) {
+                       if (fn_printn(ndo, bp, 8, ndo->ndo_snapend)) {
                                ND_PRINT((ndo, "\""));
                                goto trunc;
                        }