From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 14 Mar 2019 15:54:49 +0000 (+0000)
Subject: vrrpd: do not start v6 router if using VRRPv2
X-Git-Tag: base_7.2~330^2~26
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=26c7454b7fc6e2c408a453fc0de1a05a5f557bf6;p=matthieu%2Ffrr.git

vrrpd: do not start v6 router if using VRRPv2

v2 doesn't support IPv6.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 3ffa2fbf68..ff39d78ed3 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -304,6 +304,9 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
 	r = vr->v6;
 	/* Must not already be started */
 	start = r->fsm.state == VRRP_STATE_INITIALIZE;
+	/* Must not be v2 */
+	start = vr->version != 2;
+	whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : NULL;
 	/* Must have a parent interface */
 	start = start && (vr->ifp != NULL);
 	whynot = (!start && !whynot) ? "No base interface" : NULL;