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

vrrpd: add asserts for VRRPv2 and IPv6

Browse Source 
Disallow adding IPv6 addresses to VRRPv2 routers.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-03-14 15:56:39 +00:00
parent 26c7454b7f
commit 359c72baad
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vrrpd/vrrp.c
View File

@ -373,6 +373,7 @@ int vrrp_add_ip(struct vrrp_router *r, struct ipaddr *ip)
int af = (ip->ipa_type == IPADDR_V6) ? AF_INET6 : AF_INET; int af = (ip->ipa_type == IPADDR_V6) ? AF_INET6 : AF_INET;
assert(r->family == af); assert(r->family == af);
assert(!(r->vr->version == 2 && ip->ipa_type == IPADDR_V6));
if (vrrp_has_ip(r->vr, ip)) if (vrrp_has_ip(r->vr, ip))
return 0; return 0;
@ -416,6 +417,8 @@ int vrrp_add_ipv4(struct vrrp_vrouter *vr, struct in_addr v4)
int vrrp_add_ipv6(struct vrrp_vrouter *vr, struct in6_addr v6) int vrrp_add_ipv6(struct vrrp_vrouter *vr, struct in6_addr v6)
{ {
assert(vr->version != 2);
struct ipaddr ip; struct ipaddr ip;
ip.ipa_type = IPADDR_V6; ip.ipa_type = IPADDR_V6;
ip.ipaddr_v6 = v6; ip.ipaddr_v6 = v6;
@ -1649,7 +1652,7 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_router *r)
r->vr->vrid, family2str(r->family), ipbuf); r->vr->vrid, family2str(r->family), ipbuf);
if (r->family == AF_INET) if (r->family == AF_INET)
vrrp_add_ipv4(r->vr, c->address->u.prefix4); vrrp_add_ipv4(r->vr, c->address->u.prefix4);
else else if (r->vr->version == 3)
vrrp_add_ipv6(r->vr, c->address->u.prefix6); vrrp_add_ipv6(r->vr, c->address->u.prefix6);
} }
} }