Revert "vrrpd: use parent interface LLA for advert tx"

This reverts commit 23e1accb0b083713ee7b0ef7fb08a0c47d4bbc85.

This bug has now been fixed by preconfiguring the VRRP macvlan
interfaces to use addrgenmode random instead of eui64.

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index d4a6dfc95afad5ca7b47d57d19169e0b12026518..cdc9e38665a11e49f94147c78b63e3be6282e4b3 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -918,7 +918,11 @@ static int vrrp_bind_to_primary_connected(struct vrrp_router *r)
        char ipstr[INET6_ADDRSTRLEN];
        struct interface *ifp;
 
-       ifp = r->vr->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;
 
        struct listnode *ln;
        struct connected *c = NULL;