Put IPv4/IPv6 protocol demultiplexing into a common routine.

That means less duplication of functionality - and less chance that
XXX-over-IPv4 will be handled but XXX-over-IPv6 won't be handled, or
*vice versa*.  (CARP and VRRP were being handled over IPv4 but not over
IPv6; this fixes that.)

10 files changed, 405 insertions, 453 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a1df679..095d1f9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -981,6 +981,7 @@ set(NETDISSECT_SOURCE_LIST_C
     print-igmp.c
     print-igrp.c
     print-ip.c
+    print-ip-demux.c
     print-ip6.c
     print-ip6opts.c
     print-ipcomp.c
diff --git a/Makefile.in b/Makefile.in
index f434268d..9176afcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -144,6 +144,7 @@ LIBNETDISSECT_SRC=\
 	print-igmp.c \
 	print-igrp.c \
 	print-ip.c \
+	print-ip-demux.c \
 	print-ip6.c \
 	print-ip6opts.c \
 	print-ipcomp.c \
diff --git a/netdissect.h b/netdissect.h
index da6700e6..68094c7c 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -569,12 +569,11 @@ extern void igrp_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);
 extern void ipN_print(netdissect_options *, const u_char *, u_int);
 extern void ip_print(netdissect_options *, const u_char *, u_int);
-extern void ip_inner_print(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *);
 extern void ipcomp_print(netdissect_options *, const u_char *);
 extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int);
 extern void ipx_print(netdissect_options *, const u_char *, u_int);
 extern void isakmp_print(netdissect_options *, const u_char *, u_int, const u_char *);
-extern void isakmp_rfc3948_print(netdissect_options *, const u_char *, u_int, const u_char *);
+extern void isakmp_rfc3948_print(netdissect_options *, const u_char *, u_int, const u_char *, int, int, u_int);
 extern void isoclns_print(netdissect_options *, const u_char *, u_int);
 extern void krb_print(netdissect_options *, const u_char *);
 extern void l2tp_print(netdissect_options *, const u_char *, u_int);
@@ -657,7 +656,7 @@ extern void timed_print(netdissect_options *, const u_char *);
 extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);
 extern u_int token_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void udld_print(netdissect_options *, const u_char *, u_int);
-extern void udp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
+extern void udp_print(netdissect_options *, const u_char *, u_int, const u_char *, int, u_int);
 extern int vjc_print(netdissect_options *, const u_char *, u_short);
 extern void vqp_print(netdissect_options *, const u_char *, u_int);
 extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
@@ -682,6 +681,9 @@ struct cksum_vec {
 extern uint16_t in_cksum(const struct cksum_vec *, int);
 extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);
 
+/* IP protocol demuxing routines */
+extern void ip_print_demux(netdissect_options *, const u_char *, u_int, u_int, int, u_int, u_int, const u_char *);
+
 extern uint16_t nextproto4_cksum(netdissect_options *, const struct ip *, const uint8_t *, u_int, u_int, u_int);
 
 /* in print-ip6.c */
diff --git a/print-ip-demux.c b/print-ip-demux.c
new file mode 100644
index 00000000..265658e7
--- /dev/null
+++ b/print-ip-demux.c
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/* \summary: IPv4/IPv6 payload printer */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "netdissect-stdinc.h"
+
+#include <string.h>
+
+#include "netdissect.h"
+#include "addrtoname.h"
+#include "extract.h"
+
+#include "ip.h"
+#include "ipproto.h"
+
+void
+ip_print_demux(netdissect_options *ndo,
+	       const u_char *bp,
+	       u_int length, u_int ver, int fragmented, u_int ttl_hl, u_int nh,
+	       const u_char *iph)
+{
+	int advance;
+	const char *p_name;
+
+	advance = 0;
+
+again:
+	switch (nh) {
+
+	case IPPROTO_AH:
+		if (!ND_TTEST_1(bp)) {
+			ndo->ndo_protocol = "ah";
+			nd_print_trunc(ndo);
+			break;
+		}
+		nh = GET_U_1(bp);
+		advance = ah_print(ndo, bp);
+		if (advance <= 0)
+			break;
+		bp += advance;
+		length -= advance;
+		goto again;
+
+	case IPPROTO_ESP:
+	{
+		u_int enh, padlen;
+		advance = esp_print(ndo, bp, length,
+				          iph, &enh, &padlen);
+		if (advance <= 0)
+			break;
+		bp += advance;
+		length -= advance + padlen;
+		nh = enh & 0xff;
+		goto again;
+	}
+
+	case IPPROTO_IPCOMP:
+	{
+		ipcomp_print(ndo, bp);
+		/*
+		 * Either this has decompressed the payload and
+		 * printed it, in which case there's nothing more
+		 * to do, or it hasn't, in which case there's
+		 * nothing more to do.
+		 */
+		break;
+	}
+
+	case IPPROTO_SCTP:
+		sctp_print(ndo, bp, iph, length);
+		break;
+
+	case IPPROTO_DCCP:
+		dccp_print(ndo, bp, iph, length);
+		break;
+
+	case IPPROTO_TCP:
+		tcp_print(ndo, bp, length, iph, fragmented);
+		break;
+
+	case IPPROTO_UDP:
+		udp_print(ndo, bp, length, iph, fragmented, ttl_hl);
+		break;
+
+	case IPPROTO_ICMP:
+		icmp_print(ndo, bp, length, iph, fragmented);
+		break;
+
+	case IPPROTO_ICMPV6:
+		icmp6_print(ndo, bp, length, iph, fragmented);
+		return;
+
+	case IPPROTO_PIGP:
+		/*
+		 * XXX - the current IANA protocol number assignments
+		 * page lists 9 as "any private interior gateway
+		 * (used by Cisco for their IGRP)" and 88 as
+		 * "EIGRP" from Cisco.
+		 *
+		 * Recent BSD <netinet/in.h> headers define
+		 * IP_PROTO_PIGP as 9 and IP_PROTO_IGRP as 88.
+		 * We define IP_PROTO_PIGP as 9 and
+		 * IP_PROTO_EIGRP as 88; those names better
+		 * match was the current protocol number
+		 * assignments say.
+		 */
+		igrp_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_EIGRP:
+		eigrp_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_ND:
+		ND_PRINT(" nd %u", length);
+		break;
+
+	case IPPROTO_EGP:
+		egp_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_OSPF:
+		if (ver == 6)
+			ospf6_print(ndo, bp, length);
+		else
+			ospf_print(ndo, bp, length, iph);
+		break;
+
+	case IPPROTO_IGMP:
+		igmp_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_IPV4:
+		/* ipv4-in-ip encapsulation */
+		ip_print(ndo, bp, length);
+		if (! ndo->ndo_vflag) {
+			ND_PRINT(" (ipip-proto-4)");
+			return;
+		}
+		break;
+
+	case IPPROTO_IPV6:
+		/* ip6-in-ip encapsulation */
+		ip6_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_RSVP:
+		rsvp_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_GRE:
+		gre_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_MOBILE:
+		mobile_print(ndo, bp, length);
+		break;
+
+	case IPPROTO_PIM:
+		pim_print(ndo, bp, length, iph);
+		break;
+
+	case IPPROTO_VRRP:
+		if (ndo->ndo_packettype == PT_CARP) {
+			carp_print(ndo, bp, length, ttl_hl);
+		} else {
+			vrrp_print(ndo, bp, length, iph, ttl_hl);
+		}
+		break;
+
+	case IPPROTO_PGM:
+		pgm_print(ndo, bp, length, iph);
+		break;
+
+	case IPPROTO_NONE:
+		ND_PRINT("no next header");
+		break;
+
+	default:
+		if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(nh)) != NULL)
+			ND_PRINT(" %s", p_name);
+		else
+			ND_PRINT(" ip-proto-%u", nh);
+		ND_PRINT(" %u", length);
+		break;
+	}
+}
diff --git a/print-ip.c b/print-ip.c
index b47d39a9..a701fede 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -330,200 +330,6 @@ static const struct tok ip_frag_values[] = {
         { 0,            NULL }
 };
 
-struct ip_print_demux_state {
-	const struct ip *ip;
-	const u_char *cp;
-	u_int   len, off;
-	u_char  nh;
-	int     advance;
-};
-
-static void
-ip_print_demux(netdissect_options *ndo,
-	       struct ip_print_demux_state *ipds)
-{
-	const char *p_name;
-
-again:
-	switch (ipds->nh) {
-
-	case IPPROTO_AH:
-		if (!ND_TTEST_1(ipds->cp)) {
-			ndo->ndo_protocol = "ah";
-			nd_print_trunc(ndo);
-			break;
-		}
-		ipds->nh = GET_U_1(ipds->cp);
-		ipds->advance = ah_print(ndo, ipds->cp);
-		if (ipds->advance <= 0)
-			break;
-		ipds->cp += ipds->advance;
-		ipds->len -= ipds->advance;
-		goto again;
-
-	case IPPROTO_ESP:
-	{
-		u_int enh, padlen;
-		ipds->advance = esp_print(ndo, ipds->cp, ipds->len,
-				    (const u_char *)ipds->ip,
-				    &enh, &padlen);
-		if (ipds->advance <= 0)
-			break;
-		ipds->cp += ipds->advance;
-		ipds->len -= ipds->advance + padlen;
-		ipds->nh = enh & 0xff;
-		goto again;
-	}
-
-	case IPPROTO_IPCOMP:
-	{
-		ipcomp_print(ndo, ipds->cp);
-		/*
-		 * Either this has decompressed the payload and
-		 * printed it, in which case there's nothing more
-		 * to do, or it hasn't, in which case there's
-		 * nothing more to do.
-		 */
-		break;
-	}
-
-	case IPPROTO_SCTP:
-		sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
-		break;
-
-	case IPPROTO_DCCP:
-		dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
-		break;
-
-	case IPPROTO_TCP:
-		/* pass on the MF bit plus the offset to detect fragments */
-		tcp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
-			  ipds->off & (IP_MF|IP_OFFMASK));
-		break;
-
-	case IPPROTO_UDP:
-		/* pass on the MF bit plus the offset to detect fragments */
-		udp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
-			  ipds->off & (IP_MF|IP_OFFMASK));
-		break;
-
-	case IPPROTO_ICMP:
-		/* pass on the MF bit plus the offset to detect fragments */
-		icmp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
-			   ipds->off & (IP_MF|IP_OFFMASK));
-		break;
-
-	case IPPROTO_PIGP:
-		/*
-		 * XXX - the current IANA protocol number assignments
-		 * page lists 9 as "any private interior gateway
-		 * (used by Cisco for their IGRP)" and 88 as
-		 * "EIGRP" from Cisco.
-		 *
-		 * Recent BSD <netinet/in.h> headers define
-		 * IP_PROTO_PIGP as 9 and IP_PROTO_IGRP as 88.
-		 * We define IP_PROTO_PIGP as 9 and
-		 * IP_PROTO_EIGRP as 88; those names better
-		 * match was the current protocol number
-		 * assignments say.
-		 */
-		igrp_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_EIGRP:
-		eigrp_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_ND:
-		ND_PRINT(" nd %u", ipds->len);
-		break;
-
-	case IPPROTO_EGP:
-		egp_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_OSPF:
-		ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
-		break;
-
-	case IPPROTO_IGMP:
-		igmp_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_IPV4:
-		/* DVMRP multicast tunnel (ip-in-ip encapsulation) */
-		ip_print(ndo, ipds->cp, ipds->len);
-		if (! ndo->ndo_vflag) {
-			ND_PRINT(" (ipip-proto-4)");
-			return;
-		}
-		break;
-
-	case IPPROTO_IPV6:
-		/* ip6-in-ip encapsulation */
-		ip6_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_RSVP:
-		rsvp_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_GRE:
-		/* do it */
-		gre_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_MOBILE:
-		mobile_print(ndo, ipds->cp, ipds->len);
-		break;
-
-	case IPPROTO_PIM:
-		pim_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
-		break;
-
-	case IPPROTO_VRRP:
-		if (ndo->ndo_packettype == PT_CARP) {
-			carp_print(ndo, ipds->cp, ipds->len,
-				GET_U_1(ipds->ip->ip_ttl));
-		} else {
-			vrrp_print(ndo, ipds->cp, ipds->len,
-				(const u_char *)ipds->ip,
-				GET_U_1(ipds->ip->ip_ttl));
-		}
-		break;
-
-	case IPPROTO_PGM:
-		pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
-		break;
-
-	default:
-		if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
-			ND_PRINT(" %s", p_name);
-		else
-			ND_PRINT(" ip-proto-%u", ipds->nh);
-		ND_PRINT(" %u", ipds->len);
-		break;
-	}
-}
-
-void
-ip_inner_print(netdissect_options *ndo,
-	       const u_char *bp,
-	       u_int length, u_int nh,
-	       const u_char *bp2)
-{
-	struct ip_print_demux_state  ipd;
-
-	ipd.ip = (const struct ip *)bp2;
-	ipd.cp = bp;
-	ipd.len  = length;
-	ipd.off  = 0;
-	ipd.nh   = nh;
-	ipd.advance = 0;
-
-	ip_print_demux(ndo, &ipd);
-}
-
 
 /*
  * print an IP datagram.
@@ -533,10 +339,11 @@ ip_print(netdissect_options *ndo,
 	 const u_char *bp,
 	 u_int length)
 {
-	struct ip_print_demux_state  ipd;
-	struct ip_print_demux_state *ipds=&ipd;
+	const struct ip *ip;
 	const u_char *ipend;
+	u_int off;
 	u_int hlen;
+	u_int len;
 	struct cksum_vec vec[1];
 	uint8_t ip_tos, ip_ttl, ip_proto;
 	uint16_t sum, ip_sum;
@@ -544,46 +351,45 @@ ip_print(netdissect_options *ndo,
 	int truncated = 0;
 
 	ndo->ndo_protocol = "ip";
-	ipds->ip = (const struct ip *)bp;
-	ND_TCHECK_1(ipds->ip->ip_vhl);
-	if (IP_V(ipds->ip) != 4) { /* print version and fail if != 4 */
-	    if (IP_V(ipds->ip) == 6)
+	ip = (const struct ip *)bp;
+	if (IP_V(ip) != 4) { /* print version and fail if != 4 */
+	    if (IP_V(ip) == 6)
 	      ND_PRINT("IP6, wrong link-layer encapsulation");
 	    else
-	      ND_PRINT("IP%u", IP_V(ipds->ip));
+	      ND_PRINT("IP%u", IP_V(ip));
 	    nd_print_invalid(ndo);
 	    return;
 	}
 	if (!ndo->ndo_eflag)
 		ND_PRINT("IP ");
 
-	ND_TCHECK_SIZE(ipds->ip);
+	ND_TCHECK_SIZE(ip);
 	if (length < sizeof (struct ip)) {
 		ND_PRINT("truncated-ip %u", length);
 		return;
 	}
-	hlen = IP_HL(ipds->ip) * 4;
+	hlen = IP_HL(ip) * 4;
 	if (hlen < sizeof (struct ip)) {
 		ND_PRINT("bad-hlen %u", hlen);
 		return;
 	}
 
-	ipds->len = GET_BE_U_2(ipds->ip->ip_len);
-	if (length < ipds->len)
+	len = GET_BE_U_2(ip->ip_len);
+	if (length < len)
 		ND_PRINT("truncated-ip - %u bytes missing! ",
-			ipds->len - length);
-	if (ipds->len < hlen) {
+			len - length);
+	if (len < hlen) {
 #ifdef GUESS_TSO
-            if (ipds->len) {
-                ND_PRINT("bad-len %u", ipds->len);
+            if (len) {
+                ND_PRINT("bad-len %u", len);
                 return;
             }
             else {
                 /* we guess that it is a TSO send */
-                ipds->len = length;
+                len = length;
             }
 #else
-            ND_PRINT("bad-len %u", ipds->len);
+            ND_PRINT("bad-len %u", len);
             return;
 #endif /* GUESS_TSO */
 	}
@@ -591,18 +397,18 @@ ip_print(netdissect_options *ndo,
 	/*
 	 * Cut off the snapshot length to the end of the IP payload.
 	 */
-	ipend = bp + ipds->len;
+	ipend = bp + len;
 	if (ipend < ndo->ndo_snapend)
 		ndo->ndo_snapend = ipend;
 
-	ipds->len -= hlen;
+	len -= hlen;
 
-	ipds->off = GET_BE_U_2(ipds->ip->ip_off);
+	off = GET_BE_U_2(ip->ip_off);
 
-        ip_proto = GET_U_1(ipds->ip->ip_p);
+        ip_proto = GET_U_1(ip->ip_p);
 
         if (ndo->ndo_vflag) {
-            ip_tos = GET_U_1(ipds->ip->ip_tos);
+            ip_tos = GET_U_1(ip->ip_tos);
             ND_PRINT("(tos 0x%x", ip_tos);
             /* ECN bits */
             switch (ip_tos & 0x03) {
@@ -623,7 +429,7 @@ ip_print(netdissect_options *ndo,
                 break;
             }
 
-            ip_ttl = GET_U_1(ipds->ip->ip_ttl);
+            ip_ttl = GET_U_1(ip->ip_ttl);
             if (ip_ttl >= 1)
                 ND_PRINT(", ttl %u", ip_ttl);
 
@@ -633,17 +439,17 @@ ip_print(netdissect_options *ndo,
 	     * For unfragmented datagrams, note the don't fragment flag.
 	     */
 	    ND_PRINT(", id %u, offset %u, flags [%s], proto %s (%u)",
-                         GET_BE_U_2(ipds->ip->ip_id),
-                         (ipds->off & 0x1fff) * 8,
-                         bittok2str(ip_frag_values, "none", ipds->off&0xe000),
+                         GET_BE_U_2(ip->ip_id),
+                         (off & IP_OFFMASK) * 8,
+                         bittok2str(ip_frag_values, "none", off & (IP_RES|IP_DF|IP_MF)),
                          tok2str(ipproto_values, "unknown", ip_proto),
                          ip_proto);
 
-            ND_PRINT(", length %u", GET_BE_U_2(ipds->ip->ip_len));
+            ND_PRINT(", length %u", GET_BE_U_2(ip->ip_len));
 
             if ((hlen - sizeof(struct ip)) > 0) {
                 ND_PRINT(", options (");
-                if (ip_optprint(ndo, (const u_char *)(ipds->ip + 1),
+                if (ip_optprint(ndo, (const u_char *)(ip + 1),
                     hlen - sizeof(struct ip)) == -1) {
                         ND_PRINT(" [truncated-option]");
 			truncated = 1;
@@ -651,12 +457,12 @@ ip_print(netdissect_options *ndo,
                 ND_PRINT(")");
             }
 
-	    if (!ndo->ndo_Kflag && (const u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
-	        vec[0].ptr = (const uint8_t *)(const void *)ipds->ip;
+	    if (!ndo->ndo_Kflag && (const u_char *)ip + hlen <= ndo->ndo_snapend) {
+	        vec[0].ptr = (const uint8_t *)(const void *)ip;
 	        vec[0].len = hlen;
 	        sum = in_cksum(vec, 1);
 		if (sum != 0) {
-		    ip_sum = GET_BE_U_2(ipds->ip->ip_sum);
+		    ip_sum = GET_BE_U_2(ip->ip_sum);
 		    ND_PRINT(", bad cksum %x (->%x)!", ip_sum,
 			     in_cksum_shouldbe(ip_sum, sum));
 		}
@@ -665,27 +471,28 @@ ip_print(netdissect_options *ndo,
 	    ND_PRINT(")\n    ");
 	    if (truncated) {
 		ND_PRINT("%s > %s: ",
-			 ipaddr_string(ndo, ipds->ip->ip_src),
-			 ipaddr_string(ndo, ipds->ip->ip_dst));
+			 ipaddr_string(ndo, ip->ip_src),
+			 ipaddr_string(ndo, ip->ip_dst));
 		goto trunc;
 	    }
 	}
 
 	/*
 	 * If this is fragment zero, hand it to the next higher
-	 * level protocol.
+	 * level protocol.  Let them know whether there are more
+	 * fragments.
 	 */
-	if ((ipds->off & 0x1fff) == 0) {
-		ipds->cp = (const u_char *)ipds->ip + hlen;
-		ipds->nh = GET_U_1(ipds->ip->ip_p);
+	if ((off & IP_OFFMASK) == 0) {
+		u_int nh = GET_U_1(ip->ip_p);
 
-		if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
-		    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {
+		if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
+		    nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) {
 			ND_PRINT("%s > %s: ",
-				     ipaddr_string(ndo, ipds->ip->ip_src),
-				     ipaddr_string(ndo, ipds->ip->ip_dst));
+				     ipaddr_string(ndo, ip->ip_src),
+				     ipaddr_string(ndo, ip->ip_dst));
 		}
-		ip_print_demux(ndo, ipds);
+		ip_print_demux(ndo, (const u_char *)ip + hlen, len, 4,
+		    off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp);
 	} else {
 		/*
 		 * Ultra quiet now means that all this stuff should be
@@ -699,8 +506,8 @@ ip_print(netdissect_options *ndo,
 		 * next level protocol header.  print the ip addr
 		 * and the protocol.
 		 */
-		ND_PRINT("%s > %s:", ipaddr_string(ndo, ipds->ip->ip_src),
-		          ipaddr_string(ndo, ipds->ip->ip_dst));
+		ND_PRINT("%s > %s:", ipaddr_string(ndo, ip->ip_src),
+		          ipaddr_string(ndo, ip->ip_dst));
 		if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
 			ND_PRINT(" %s", p_name);
 		else
diff --git a/print-ip6.c b/print-ip6.c
index 9802ce04..b6893cf3 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -281,6 +281,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 	cp = (const u_char *)ip6;
 	advance = sizeof(struct ip6_hdr);
+	/* Process extension headers */
 	while (cp < ndo->ndo_snapend && advance > 0) {
 		if (len < (u_int)advance)
 			goto trunc;
@@ -295,18 +296,21 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		}
 
 		switch (nh) {
+
 		case IPPROTO_HOPOPTS:
 			advance = hbhopt_print(ndo, cp);
 			if (advance < 0)
 				return;
 			nh = GET_U_1(cp);
 			break;
+
 		case IPPROTO_DSTOPTS:
 			advance = dstopt_print(ndo, cp);
 			if (advance < 0)
 				return;
 			nh = GET_U_1(cp);
 			break;
+
 		case IPPROTO_FRAGMENT:
 			advance = frag6_print(ndo, cp, (const u_char *)ip6);
 			if (advance < 0 || ndo->ndo_snapend <= cp + advance)
@@ -330,6 +334,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 				return;
 			nh = GET_U_1(cp);
 			return;
+
 		case IPPROTO_ROUTING:
 			ND_TCHECK_1(cp);
 			advance = rt6_print(ndo, cp, (const u_char *)ip6);
@@ -337,88 +342,14 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 				return;
 			nh = GET_U_1(cp);
 			break;
-		case IPPROTO_SCTP:
-			sctp_print(ndo, cp, (const u_char *)ip6, len);
-			return;
-		case IPPROTO_DCCP:
-			dccp_print(ndo, cp, (const u_char *)ip6, len);
-			return;
-		case IPPROTO_TCP:
-			tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented);
-			return;
-		case IPPROTO_UDP:
-			udp_print(ndo, cp, len, (const u_char *)ip6, fragmented);
-			return;
-		case IPPROTO_ICMPV6:
-			icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
-			return;
-		case IPPROTO_AH:
-			advance = ah_print(ndo, cp);
-			if (advance < 0)
-				return;
-			nh = GET_U_1(cp);
-			break;
-		case IPPROTO_ESP:
-		    {
-			u_int enh, padlen;
-			advance = esp_print(ndo, cp, len, (const u_char *)ip6, &enh, &padlen);
-			if (advance < 0)
-				return;
-			nh = enh & 0xff;
-			len -= padlen;
-			break;
-		    }
-		case IPPROTO_IPCOMP:
-		    {
-			ipcomp_print(ndo, cp);
-			/*
-			 * Either this has decompressed the payload and
-			 * printed it, in which case there's nothing more
-			 * to do, or it hasn't, in which case there's
-			 * nothing more to do.
-			 */
-			advance = -1;
-			break;
-		    }
-
-		case IPPROTO_PIM:
-			pim_print(ndo, cp, len, (const u_char *)ip6);
-			return;
-
-		case IPPROTO_OSPF:
-			ospf6_print(ndo, cp, len);
-			return;
-
-		case IPPROTO_IPV6:
-			ip6_print(ndo, cp, len);
-			return;
-
-		case IPPROTO_IPV4:
-		        ip_print(ndo, cp, len);
-			return;
-
-                case IPPROTO_PGM:
-                        pgm_print(ndo, cp, len, (const u_char *)ip6);
-                        return;
-
-		case IPPROTO_GRE:
-			gre_print(ndo, cp, len);
-			return;
-
-		case IPPROTO_RSVP:
-			rsvp_print(ndo, cp, len);
-			return;
-
-		case IPPROTO_EIGRP:
-			eigrp_print(ndo, cp, len);
-			return;
-
-		case IPPROTO_NONE:
-			ND_PRINT("no next header");
-			return;
 
 		default:
-			ND_PRINT("ip-proto-%u %u", nh, len);
+			/*
+			 * Not an extension header; hand off to the
+			 * IP protocol demuxer.
+			 */
+			ip_print_demux(ndo, cp, len, 6, fragmented,
+			    GET_U_1(ip6->ip6_hlim), nh, bp);
 			return;
 		}
 
diff --git a/print-isakmp.c b/print-isakmp.c
index e85f64f8..0acab5a3 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -3099,7 +3099,7 @@ isakmp_print(netdissect_options *ndo,
 void
 isakmp_rfc3948_print(netdissect_options *ndo,
 		     const u_char *bp, u_int length,
-		     const u_char *bp2)
+		     const u_char *bp2, int ver, int fragmented, u_int ttl_hl)
 {
 	ndo->ndo_protocol = "isakmp_rfc3948";
 	ND_TCHECK_1(bp);
@@ -3137,7 +3137,7 @@ isakmp_rfc3948_print(netdissect_options *ndo,
 		length -= advance + padlen;
 		nh = enh & 0xff;
 
-		ip_inner_print(ndo, bp, length, nh, bp2);
+		ip_print_demux(ndo, bp, length, ver, fragmented, ttl_hl, nh, bp2);
 		return;
 	}
 
diff --git a/print-udp.c b/print-udp.c
index e27882dc..4878b7b4 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -383,7 +383,7 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
 
 void
 udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
-	  const u_char *bp2, int fragmented)
+	  const u_char *bp2, int fragmented, u_int ttl_hl)
 {
 	const struct udphdr *up;
 	const struct ip *ip;
@@ -607,7 +607,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 	        else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
 			 isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
 	        else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
-			 isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
+			 isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2, IP_V(ip), fragmented, ttl_hl);
 	        else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
 			isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
 		else if (IS_SRC_OR_DST_PORT(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
diff --git a/tests/vrrp-v.out b/tests/vrrp-v.out
index b03a9c01..9531ab7c 100644
--- a/tests/vrrp-v.out
+++ b/tests/vrrp-v.out
@@ -8,16 +8,16 @@
     10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 191, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
     5  21:55:16.753436 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 191, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-    6  21:55:19.064377 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
-    7  21:55:19.064509 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
+    6  21:55:19.064377 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40, (bad vrrp cksum cfa0), addrs(2): 254.128.0.0,0.0.0.0
+    7  21:55:19.064509 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88, (bad vrrp cksum 5f12), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
     8  21:55:19.074681 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.91 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 191, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
     9  21:55:26.751857 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 191, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    10  21:55:26.751923 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 191, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   11  21:55:29.068063 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
-   12  21:55:29.068132 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
+   11  21:55:29.068063 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88, (bad vrrp cksum 5f12), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   12  21:55:29.068132 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40, (bad vrrp cksum cfa0), addrs(2): 254.128.0.0,0.0.0.0
    13  21:55:29.078313 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.91 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 191, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
    14  21:55:34.773565 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
@@ -26,54 +26,54 @@
     10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    16  21:55:37.044216 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   17  21:55:39.070934 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
-   18  21:55:39.071010 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
+   17  21:55:39.070934 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40, (bad vrrp cksum cfa0), addrs(2): 254.128.0.0,0.0.0.0
+   18  21:55:39.071010 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88, (bad vrrp cksum 5f12), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    19  21:55:44.778957 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 192, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    20  21:55:44.789130 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    21  21:55:47.046947 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   22  21:55:47.047012 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
-   23  21:55:47.047042 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
+   22  21:55:47.047012 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88, (bad vrrp cksum 7b8c), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   23  21:55:47.047042 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40, (bad vrrp cksum ec1a), addrs(2): 254.128.0.0,0.0.0.0
    24  21:55:54.780328 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 192, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    25  21:55:54.780387 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    26  21:55:57.042694 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   27  21:55:57.042754 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
-   28  21:55:57.042778 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
+   27  21:55:57.042754 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40, (bad vrrp cksum ec1a), addrs(2): 254.128.0.0,0.0.0.0
+   28  21:55:57.042778 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88, (bad vrrp cksum 7b8c), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    29  21:56:04.643506 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    30  21:56:04.649862 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    31  21:56:06.862122 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   32  21:56:07.046980 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
-   33  21:56:07.047062 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
+   32  21:56:07.046980 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88, (bad vrrp cksum 7b8c), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   33  21:56:07.047062 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40, (bad vrrp cksum ec1a), addrs(2): 254.128.0.0,0.0.0.0
    34  21:56:14.647902 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    35  21:56:14.647963 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   36  21:56:16.860142 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   37  21:56:16.860206 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   36  21:56:16.860142 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88, (bad vrrp cksum 5d0d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   37  21:56:16.860206 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40, (bad vrrp cksum cd9b), addrs(2): 254.128.0.0,0.0.0.0
    38  21:56:16.860214 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
    39  21:56:24.657679 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    40  21:56:24.657741 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   41  21:56:26.859969 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   42  21:56:26.860037 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   41  21:56:26.859969 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88, (bad vrrp cksum 5d0d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   42  21:56:26.860037 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40, (bad vrrp cksum cd9b), addrs(2): 254.128.0.0,0.0.0.0
    43  21:56:26.860045 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
    44  21:56:34.667398 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    45  21:56:34.667454 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-   46  21:56:36.859720 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   47  21:56:36.859786 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   46  21:56:36.859720 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88, (bad vrrp cksum 5d0d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   47  21:56:36.859786 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40, (bad vrrp cksum cd9b), addrs(2): 254.128.0.0,0.0.0.0
    48  21:56:36.859795 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
    49  21:56:41.365005 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
@@ -82,184 +82,184 @@
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    51  21:56:43.571121 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   52  21:56:46.860576 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   53  21:56:46.860627 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   52  21:56:46.860576 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88, (bad vrrp cksum 5d0d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
+   53  21:56:46.860627 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40, (bad vrrp cksum cd9b), addrs(2): 254.128.0.0,0.0.0.0
    54  21:56:51.366475 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    55  21:56:51.366535 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   56  21:56:53.568732 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
+   56  21:56:53.568732 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40, (bad vrrp cksum c7a5), addrs(2): 254.128.0.0,0.0.0.0
    57  21:56:53.568785 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   58  21:56:53.589188 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   58  21:56:53.589188 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88, (bad vrrp cksum 5717), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    59  21:57:01.373895 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    60  21:57:01.373951 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    61  21:57:03.566197 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   62  21:57:03.566241 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   63  21:57:03.586537 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   62  21:57:03.566241 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40, (bad vrrp cksum c7a5), addrs(2): 254.128.0.0,0.0.0.0
+   63  21:57:03.586537 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88, (bad vrrp cksum 5717), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    64  21:57:11.381178 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    65  21:57:11.381238 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   66  21:57:13.563581 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
+   66  21:57:13.563581 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40, (bad vrrp cksum c7a5), addrs(2): 254.128.0.0,0.0.0.0
    67  21:57:13.563652 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   68  21:57:13.583750 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   68  21:57:13.583750 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88, (bad vrrp cksum 5717), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    69  21:57:21.390823 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    70  21:57:21.390887 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    71  21:57:23.563280 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   72  21:57:23.563341 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   73  21:57:23.583426 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   72  21:57:23.563341 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40, (bad vrrp cksum c7a5), addrs(2): 254.128.0.0,0.0.0.0
+   73  21:57:23.583426 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88, (bad vrrp cksum 5717), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    74  21:57:30.198637 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    75  21:57:30.202588 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    76  21:57:32.373402 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   77  21:57:33.567816 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   78  21:57:33.588127 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   77  21:57:33.567816 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40, (bad vrrp cksum c7a5), addrs(2): 254.128.0.0,0.0.0.0
+   78  21:57:33.588127 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88, (bad vrrp cksum 5717), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    79  21:57:40.205279 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    80  21:57:40.205343 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    81  21:57:42.367695 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   82  21:57:42.367760 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   83  21:57:42.377819 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   82  21:57:42.367760 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40, (bad vrrp cksum c696), addrs(2): 254.128.0.0,0.0.0.0
+   83  21:57:42.377819 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88, (bad vrrp cksum 5608), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    84  21:57:50.215046 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    85  21:57:50.215112 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-   86  21:57:52.367351 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
+   86  21:57:52.367351 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40, (bad vrrp cksum c696), addrs(2): 254.128.0.0,0.0.0.0
    87  21:57:52.367427 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   88  21:57:52.377456 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   88  21:57:52.377456 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88, (bad vrrp cksum 5608), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    89  21:58:00.224875 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    90  21:58:00.224935 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    91  21:58:02.367084 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   92  21:58:02.367144 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   93  21:58:02.377445 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   92  21:58:02.367144 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40, (bad vrrp cksum c696), addrs(2): 254.128.0.0,0.0.0.0
+   93  21:58:02.377445 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88, (bad vrrp cksum 5608), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    94  21:58:04.461974 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
    95  21:58:04.466033 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
    96  21:58:06.599034 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-   97  21:58:12.374622 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   98  21:58:12.374697 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   97  21:58:12.374622 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40, (bad vrrp cksum c696), addrs(2): 254.128.0.0,0.0.0.0
+   98  21:58:12.374697 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88, (bad vrrp cksum 5608), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
    99  21:58:14.458404 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   100  21:58:14.468662 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  101  21:58:16.590792 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  101  21:58:16.590792 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40, (bad vrrp cksum e810), addrs(2): 254.128.0.0,0.0.0.0
   102  21:58:16.600962 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  103  21:58:16.611202 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  103  21:58:16.611202 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88, (bad vrrp cksum 7782), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   104  21:58:24.464854 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   105  21:58:24.464916 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  106  21:58:26.587122 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  106  21:58:26.587122 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40, (bad vrrp cksum e810), addrs(2): 254.128.0.0,0.0.0.0
   107  21:58:26.597278 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  108  21:58:26.607415 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  108  21:58:26.607415 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88, (bad vrrp cksum 7782), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   109  21:58:34.474628 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   110  21:58:34.474688 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-  111  21:58:36.586887 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  111  21:58:36.586887 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40, (bad vrrp cksum e810), addrs(2): 254.128.0.0,0.0.0.0
   112  21:58:36.597038 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  113  21:58:36.607177 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  113  21:58:36.607177 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88, (bad vrrp cksum 7782), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   114  21:58:44.484468 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   115  21:58:44.484534 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  116  21:58:46.585913 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  116  21:58:46.585913 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40, (bad vrrp cksum e810), addrs(2): 254.128.0.0,0.0.0.0
   117  21:58:46.596106 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  118  21:58:46.606276 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  118  21:58:46.606276 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88, (bad vrrp cksum 7782), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   119  21:58:49.932515 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   120  21:58:49.935030 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   121  21:58:52.025571 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  122  21:58:56.594126 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
-  123  21:58:56.604316 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  122  21:58:56.594126 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40, (bad vrrp cksum e810), addrs(2): 254.128.0.0,0.0.0.0
+  123  21:58:56.604316 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88, (bad vrrp cksum 7782), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   124  21:58:59.938046 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   125  21:58:59.938096 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  126  21:59:02.020356 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  126  21:59:02.020356 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   127  21:59:02.030572 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  128  21:59:02.040691 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  128  21:59:02.040691 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   129  21:59:09.941288 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   130  21:59:09.941346 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-  131  21:59:12.013545 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  131  21:59:12.013545 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   132  21:59:12.023710 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  133  21:59:12.033831 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  133  21:59:12.033831 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   134  21:59:19.951291 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   135  21:59:19.951350 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  136  21:59:22.013537 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  136  21:59:22.013537 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   137  21:59:22.023644 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  138  21:59:22.033781 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  138  21:59:22.033781 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   139  21:59:29.961257 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   140  21:59:29.961318 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-  141  21:59:32.013287 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  141  21:59:32.013287 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   142  21:59:32.023734 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  143  21:59:32.033779 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  143  21:59:32.033779 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   144  21:59:39.971275 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   145  21:59:39.971336 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  146  21:59:42.013484 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  146  21:59:42.013484 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   147  21:59:42.023603 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  148  21:59:42.033784 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  148  21:59:42.033784 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   149  21:59:49.981283 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   150  21:59:49.981343 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-  151  21:59:52.013458 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  151  21:59:52.013458 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   152  21:59:52.023620 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  153  21:59:52.033729 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  153  21:59:52.033729 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   154  21:59:59.991224 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   155  21:59:59.991284 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
-  156  22:00:02.013448 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  156  22:00:02.013448 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   157  22:00:02.023620 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  158  22:00:02.033735 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  158  22:00:02.033735 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   159  22:00:10.001302 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20, addrs: 10.4.43.150
   160  22:00:10.001364 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
-  161  22:00:12.013443 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  161  22:00:12.013443 IP6 (hlim 255, next-header VRRP (112) payload length: 40) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40, (bad vrrp cksum d5eb), addrs(2): 254.128.0.0,0.0.0.0
   162  22:00:12.023585 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 36)
     10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16, addrs(2): 10.4.44.100,10.4.44.200
-  163  22:00:12.033752 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  163  22:00:12.033752 IP6 (hlim 255, next-header VRRP (112) payload length: 88) fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88, (bad vrrp cksum 655d), addrs(5): 254.128.0.0,0.0.0.0,2.0.94.255,254.0.2.46,32.1.0.0
   164  22:00:20.011269 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 48)
     10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28, addrs(3): 10.4.42.1,10.4.42.2,10.4.42.3 auth "abcdefgh"
   165  22:00:20.011328 IP (tos 0x0, ttl 255, id 4660, offset 0, flags [none], proto VRRP (112), length 40)
diff --git a/tests/vrrp.out b/tests/vrrp.out
index 6a79c122..6fa6edd5 100644
--- a/tests/vrrp.out
+++ b/tests/vrrp.out
@@ -3,163 +3,163 @@
     3  21:55:09.074730 IP 10.0.0.91 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 191, intvl 1000cs, length 16
     4  21:55:16.753372 IP 10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 191, authtype simple, intvl 10s, length 28
     5  21:55:16.753436 IP 10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 191, authtype none, intvl 10s, length 20
-    6  21:55:19.064377 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
-    7  21:55:19.064509 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
+    6  21:55:19.064377 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40
+    7  21:55:19.064509 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88
     8  21:55:19.074681 IP 10.0.0.91 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 191, intvl 1000cs, length 16
     9  21:55:26.751857 IP 10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 191, authtype simple, intvl 10s, length 28
    10  21:55:26.751923 IP 10.0.0.91 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 191, authtype none, intvl 10s, length 20
-   11  21:55:29.068063 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
-   12  21:55:29.068132 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
+   11  21:55:29.068063 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88
+   12  21:55:29.068132 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40
    13  21:55:29.078313 IP 10.0.0.91 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 191, intvl 1000cs, length 16
    14  21:55:34.773565 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 192, authtype simple, intvl 10s, length 28
    15  21:55:34.783698 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20
    16  21:55:37.044216 IP 10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16
-   17  21:55:39.070934 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 40
-   18  21:55:39.071010 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: ip-proto-112 88
+   17  21:55:39.070934 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 191, intvl 1000cs, length 40
+   18  21:55:39.071010 IP6 fe80::d6ca:6dff:fe66:cf60 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 191, intvl 1000cs, length 88
    19  21:55:44.778957 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 192, authtype simple, intvl 10s, length 28
    20  21:55:44.789130 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20
    21  21:55:47.046947 IP 10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16
-   22  21:55:47.047012 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
-   23  21:55:47.047042 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
+   22  21:55:47.047012 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88
+   23  21:55:47.047042 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40
    24  21:55:54.780328 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 192, authtype simple, intvl 10s, length 28
    25  21:55:54.780387 IP 10.0.0.92 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 192, authtype none, intvl 10s, length 20
    26  21:55:57.042694 IP 10.0.0.92 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 192, intvl 1000cs, length 16
-   27  21:55:57.042754 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
-   28  21:55:57.042778 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
+   27  21:55:57.042754 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40
+   28  21:55:57.042778 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88
    29  21:56:04.643506 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28
    30  21:56:04.649862 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20
    31  21:56:06.862122 IP 10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16
-   32  21:56:07.046980 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 88
-   33  21:56:07.047062 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: ip-proto-112 40
+   32  21:56:07.046980 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 46, prio 192, intvl 1000cs, length 88
+   33  21:56:07.047062 IP6 fe80::d6ca:6dff:fe72:b1da > ff02::12: VRRPv3, Advertisement, vrid 45, prio 192, intvl 1000cs, length 40
    34  21:56:14.647902 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28
    35  21:56:14.647963 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20
-   36  21:56:16.860142 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   37  21:56:16.860206 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   36  21:56:16.860142 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88
+   37  21:56:16.860206 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40
    38  21:56:16.860214 IP 10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16
    39  21:56:24.657679 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28
    40  21:56:24.657741 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20
-   41  21:56:26.859969 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   42  21:56:26.860037 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   41  21:56:26.859969 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88
+   42  21:56:26.860037 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40
    43  21:56:26.860045 IP 10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16
    44  21:56:34.667398 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 193, authtype none, intvl 10s, length 20
    45  21:56:34.667454 IP 10.0.0.93 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 193, authtype simple, intvl 10s, length 28
-   46  21:56:36.859720 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   47  21:56:36.859786 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   46  21:56:36.859720 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88
+   47  21:56:36.859786 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40
    48  21:56:36.859795 IP 10.0.0.93 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 193, intvl 1000cs, length 16
    49  21:56:41.365005 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28
    50  21:56:41.367020 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20
    51  21:56:43.571121 IP 10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16
-   52  21:56:46.860576 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 88
-   53  21:56:46.860627 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: ip-proto-112 40
+   52  21:56:46.860576 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 193, intvl 1000cs, length 88
+   53  21:56:46.860627 IP6 fe80::d6ca:6dff:fe66:cf65 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 193, intvl 1000cs, length 40
    54  21:56:51.366475 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28
    55  21:56:51.366535 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20
-   56  21:56:53.568732 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
+   56  21:56:53.568732 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40
    57  21:56:53.568785 IP 10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16
-   58  21:56:53.589188 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   58  21:56:53.589188 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88
    59  21:57:01.373895 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28
    60  21:57:01.373951 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20
    61  21:57:03.566197 IP 10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16
-   62  21:57:03.566241 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   63  21:57:03.586537 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   62  21:57:03.566241 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40
+   63  21:57:03.586537 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88
    64  21:57:11.381178 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28
    65  21:57:11.381238 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20
-   66  21:57:13.563581 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
+   66  21:57:13.563581 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40
    67  21:57:13.563652 IP 10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16
-   68  21:57:13.583750 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   68  21:57:13.583750 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88
    69  21:57:21.390823 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 194, authtype simple, intvl 10s, length 28
    70  21:57:21.390887 IP 10.0.0.94 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 194, authtype none, intvl 10s, length 20
    71  21:57:23.563280 IP 10.0.0.94 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 194, intvl 1000cs, length 16
-   72  21:57:23.563341 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   73  21:57:23.583426 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   72  21:57:23.563341 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40
+   73  21:57:23.583426 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88
    74  21:57:30.198637 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28
    75  21:57:30.202588 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20
    76  21:57:32.373402 IP 10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16
-   77  21:57:33.567816 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 40
-   78  21:57:33.588127 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: ip-proto-112 88
+   77  21:57:33.567816 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 45, prio 194, intvl 1000cs, length 40
+   78  21:57:33.588127 IP6 fe80::d6ca:6dff:fe65:d45c > ff02::12: VRRPv3, Advertisement, vrid 46, prio 194, intvl 1000cs, length 88
    79  21:57:40.205279 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28
    80  21:57:40.205343 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20
    81  21:57:42.367695 IP 10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16
-   82  21:57:42.367760 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   83  21:57:42.377819 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   82  21:57:42.367760 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40
+   83  21:57:42.377819 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88
    84  21:57:50.215046 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28
    85  21:57:50.215112 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20
-   86  21:57:52.367351 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
+   86  21:57:52.367351 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40
    87  21:57:52.367427 IP 10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16
-   88  21:57:52.377456 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   88  21:57:52.377456 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88
    89  21:58:00.224875 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 195, authtype simple, intvl 10s, length 28
    90  21:58:00.224935 IP 10.0.0.95 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 195, authtype none, intvl 10s, length 20
    91  21:58:02.367084 IP 10.0.0.95 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 195, intvl 1000cs, length 16
-   92  21:58:02.367144 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   93  21:58:02.377445 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   92  21:58:02.367144 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40
+   93  21:58:02.377445 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88
    94  21:58:04.461974 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28
    95  21:58:04.466033 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20
    96  21:58:06.599034 IP 10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16
-   97  21:58:12.374622 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 40
-   98  21:58:12.374697 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: ip-proto-112 88
+   97  21:58:12.374622 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 45, prio 195, intvl 1000cs, length 40
+   98  21:58:12.374697 IP6 fe80::d6ca:6dff:fe65:d46b > ff02::12: VRRPv3, Advertisement, vrid 46, prio 195, intvl 1000cs, length 88
    99  21:58:14.458404 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28
   100  21:58:14.468662 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20
-  101  21:58:16.590792 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  101  21:58:16.590792 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40
   102  21:58:16.600962 IP 10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16
-  103  21:58:16.611202 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  103  21:58:16.611202 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88
   104  21:58:24.464854 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28
   105  21:58:24.464916 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20
-  106  21:58:26.587122 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  106  21:58:26.587122 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40
   107  21:58:26.597278 IP 10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16
-  108  21:58:26.607415 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  108  21:58:26.607415 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88
   109  21:58:34.474628 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20
   110  21:58:34.474688 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28
-  111  21:58:36.586887 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  111  21:58:36.586887 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40
   112  21:58:36.597038 IP 10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16
-  113  21:58:36.607177 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  113  21:58:36.607177 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88
   114  21:58:44.484468 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 196, authtype simple, intvl 10s, length 28
   115  21:58:44.484534 IP 10.0.0.96 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 196, authtype none, intvl 10s, length 20
-  116  21:58:46.585913 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
+  116  21:58:46.585913 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40
   117  21:58:46.596106 IP 10.0.0.96 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 196, intvl 1000cs, length 16
-  118  21:58:46.606276 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  118  21:58:46.606276 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88
   119  21:58:49.932515 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   120  21:58:49.935030 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
   121  21:58:52.025571 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  122  21:58:56.594126 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 40
-  123  21:58:56.604316 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: ip-proto-112 88
+  122  21:58:56.594126 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 45, prio 196, intvl 1000cs, length 40
+  123  21:58:56.604316 IP6 fe80::d6ca:6dff:fe72:b1e4 > ff02::12: VRRPv3, Advertisement, vrid 46, prio 196, intvl 1000cs, length 88
   124  21:58:59.938046 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   125  21:58:59.938096 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
-  126  21:59:02.020356 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  126  21:59:02.020356 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   127  21:59:02.030572 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  128  21:59:02.040691 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  128  21:59:02.040691 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   129  21:59:09.941288 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
   130  21:59:09.941346 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
-  131  21:59:12.013545 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  131  21:59:12.013545 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   132  21:59:12.023710 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  133  21:59:12.033831 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  133  21:59:12.033831 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   134  21:59:19.951291 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   135  21:59:19.951350 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
-  136  21:59:22.013537 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  136  21:59:22.013537 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   137  21:59:22.023644 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  138  21:59:22.033781 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  138  21:59:22.033781 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   139  21:59:29.961257 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
   140  21:59:29.961318 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
-  141  21:59:32.013287 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  141  21:59:32.013287 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   142  21:59:32.023734 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  143  21:59:32.033779 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  143  21:59:32.033779 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   144  21:59:39.971275 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   145  21:59:39.971336 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
-  146  21:59:42.013484 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  146  21:59:42.013484 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   147  21:59:42.023603 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  148  21:59:42.033784 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  148  21:59:42.033784 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   149  21:59:49.981283 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
   150  21:59:49.981343 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
-  151  21:59:52.013458 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  151  21:59:52.013458 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   152  21:59:52.023620 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  153  21:59:52.033729 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  153  21:59:52.033729 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   154  21:59:59.991224 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   155  21:59:59.991284 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
-  156  22:00:02.013448 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  156  22:00:02.013448 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   157  22:00:02.023620 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  158  22:00:02.033735 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  158  22:00:02.033735 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   159  22:00:10.001302 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20
   160  22:00:10.001364 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
-  161  22:00:12.013443 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 40
+  161  22:00:12.013443 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 45, prio 197, intvl 1000cs, length 40
   162  22:00:12.023585 IP 10.0.0.97 > 224.0.0.18: VRRPv3, Advertisement, vrid 44, prio 197, intvl 1000cs, length 16
-  163  22:00:12.033752 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: ip-proto-112 88
+  163  22:00:12.033752 IP6 fe80::20c:42ff:fe5e:c2dc > ff02::12: VRRPv3, Advertisement, vrid 46, prio 197, intvl 1000cs, length 88
   164  22:00:20.011269 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 42, prio 197, authtype simple, intvl 10s, length 28
   165  22:00:20.011328 IP 10.0.0.97 > 224.0.0.18: VRRPv2, Advertisement, vrid 43, prio 197, authtype none, intvl 10s, length 20