From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 28 Feb 2019 19:00:26 +0000 (+0000)
Subject: vrrpd: use parent interface LLA for advert tx
X-Git-Tag: base_7.2~330^2~52
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=76c00fca685b4368dfbb4801ce6d5b630de6e7af;p=matthieu%2Ffrr.git

vrrpd: use parent interface LLA for advert tx

Interface MACs for v6 macvlan devices are the same, so the link local
address will be the same, which breaks mastership election based on
primary address comparison. Use the parent interface link local address.

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

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 58a046fefa..84ff84b8a4 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -888,11 +888,7 @@ static int vrrp_bind_to_primary_connected(struct vrrp_router *r)
 	char ipstr[INET6_ADDRSTRLEN];
 	struct interface *ifp;
 
-	/*
-	 * A slight quirk: the RFC specifies that advertisements under IPv6 must
-	 * be transmitted using the link local address of the source interface
-	 */
-	ifp = r->family == AF_INET ? r->vr->ifp : r->mvl_ifp;
+	ifp = r->vr->ifp;
 
 	struct listnode *ln;
 	struct connected *c = NULL;