X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbedebc666a341d8e14922dce37a92766400c798..refs/pull/482/head:/print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 610a84a5..a6e23143 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,14 +23,13 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -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)",
@@ -169,7 +168,7 @@ vrrp_print(netdissect_options *ndo,
 		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;
 			}