proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5247 from ghasemnaddaf/vrrp_ipv4

Browse Source 
vrrpd: only count ipv4 addresses on check start
This commit is contained in:
Quentin Young 2019-10-29 23:51:44 -04:00 committed by GitHub
commit 6d05ba3dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/if.c
View File

@ -959,6 +959,20 @@ static int connected_same_prefix(struct prefix *p1, struct prefix *p2)
return 0; 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 connected *connected_lookup_prefix_exact(struct interface *ifp,
struct prefix *p) struct prefix *p)
{ {

1
lib/if.h
View File

@ -553,6 +553,7 @@ extern struct connected *connected_lookup_prefix(struct interface *,
struct prefix *); struct prefix *);
extern struct connected *connected_lookup_prefix_exact(struct interface *, extern struct connected *connected_lookup_prefix_exact(struct interface *,
struct prefix *); struct prefix *);
extern unsigned int connected_count_by_family(struct interface *, int family);
extern struct nbr_connected *nbr_connected_new(void); extern struct nbr_connected *nbr_connected_new(void);
extern void nbr_connected_free(struct nbr_connected *); extern void nbr_connected_free(struct nbr_connected *);
struct nbr_connected *nbr_connected_check(struct interface *, struct prefix *); struct nbr_connected *nbr_connected_check(struct interface *, struct prefix *);

12
vrrpd/vrrp.c
View File

@ -298,7 +298,7 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
start = start && if_is_operative(vr->ifp); start = start && if_is_operative(vr->ifp);
#endif #endif
/* Parent interface must have at least one v4 */ /* 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; whynot = (!start && !whynot) ? "No primary IPv4 address" : whynot;
/* Must have a macvlan interface */ /* Must have a macvlan interface */
start = start && (r->mvl_ifp != NULL); 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 */ /* Macvlan interface must have a link local */
start = start && connected_get_linklocal(r->mvl_ifp); start = start && connected_get_linklocal(r->mvl_ifp);
whynot = 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 */ /* 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) whynot = (!start && !whynot)
? "No Virtual IP configured on macvlan device" ? "No Virtual IPv6 address configured on macvlan device"
: NULL; : whynot;
#endif #endif
/* Must have at least one VIP configured */ /* Must have at least one VIP configured */
start = start && r->addrs->count > 0; start = start && r->addrs->count > 0;
whynot = whynot =
(!start && !whynot) ? "No Virtual IP address configured" : NULL; (!start && !whynot) ? "No Virtual IP address configured" : whynot;
if (start) if (start)
vrrp_event(r, VRRP_EVENT_STARTUP); vrrp_event(r, VRRP_EVENT_STARTUP);
else if (whynot) else if (whynot)