vrrpd: only count ipv4 addresses on check start

Signed-off-by: Ghasem Naddaf <ghasem.naddaf@gmail.com>

diff --git a/lib/if.c b/lib/if.c
index 594961d763ceaa6e630f5714fec98f961af66914..7c3606bbbf9b617187992b2749460ef5f5d6da5f 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -959,6 +959,20 @@ static int connected_same_prefix(struct prefix *p1, struct prefix *p2)
        return 0;
 }
 
+/* count the number of connected addresses that are in the given family */
+unsigned int connected_count_by_family(struct interface *ifp, int family)
+{
+       struct listnode *cnode;
+       struct connected *connected;
+       unsigned int cnt = 0;
+
+       for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, connected))
+               if (connected->address->family == family)
+                       cnt++;
+
+       return cnt;
+}
+
 struct connected *connected_lookup_prefix_exact(struct interface *ifp,
                                                struct prefix *p)
 {

diff --git a/lib/if.h b/lib/if.h
index 1ee6561e8d481b5900e1fcf0c1575bc80d2b9724..632229093735478db83605bfe2a93f3ed3d3e5db 100644 (file)
--- a/lib/if.h
+++ b/lib/if.h
@@ -553,6 +553,7 @@ extern struct connected *connected_lookup_prefix(struct interface *,
                                                 struct prefix *);
 extern struct connected *connected_lookup_prefix_exact(struct interface *,
                                                       struct prefix *);
+extern unsigned int connected_count_by_family(struct interface *, int family);
 extern struct nbr_connected *nbr_connected_new(void);
 extern void nbr_connected_free(struct nbr_connected *);
 struct nbr_connected *nbr_connected_check(struct interface *, struct prefix *);

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 54089b3612b819343aa414a118207e9ae5cba5b8..df2376c4739205f7d4d658bb7eca8bdc394b4637 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -298,7 +298,7 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
        start = start && if_is_operative(vr->ifp);
 #endif
        /* Parent interface must have at least one v4 */
-       start = start && vr->ifp->connected->count > 1;
+       start = start && connected_count_by_family(vr->ifp, AF_INET) > 0;
        whynot = (!start && !whynot) ? "No primary IPv4 address" : whynot;
        /* Must have a macvlan interface */
        start = start && (r->mvl_ifp != NULL);
@@ -341,17 +341,17 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
        /* Macvlan interface must have a link local */
        start = start && connected_get_linklocal(r->mvl_ifp);
        whynot =
-               (!start && !whynot) ? "No link local address configured" : NULL;
+               (!start && !whynot) ? "No link local address configured" : whynot;
        /* Macvlan interface must have a v6 IP besides the link local */
-       start = start && (r->mvl_ifp->connected->count >= 2);
+       start = start && (connected_count_by_family(r->mvl_ifp, AF_INET6) > 1);
        whynot = (!start && !whynot)
-                        ? "No Virtual IP configured on macvlan device"
-                        : NULL;
+                        ? "No Virtual IPv6 address configured on macvlan device"
+                        : whynot;
 #endif
        /* Must have at least one VIP configured */
        start = start && r->addrs->count > 0;
        whynot =
-               (!start && !whynot) ? "No Virtual IP address configured" : NULL;
+               (!start && !whynot) ? "No Virtual IP address configured" : whynot;
        if (start)
                vrrp_event(r, VRRP_EVENT_STARTUP);
        else if (whynot)