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

vrrpd: fix interface block config writes

Browse Source 
Improper reuse of list node broke config writes of multiple instances

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-02-28 23:48:09 +00:00
parent d37281cb04
commit 3a9c6f93d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vrrpd/vrrp.c
View File

@ -2053,7 +2053,7 @@ void vrrp_if_address_del(struct interface *ifp)
int vrrp_config_write_interface(struct vty *vty) int vrrp_config_write_interface(struct vty *vty)
{ {
struct list *vrs = hash_to_list(vrrp_vrouters_hash); struct list *vrs = hash_to_list(vrrp_vrouters_hash);
struct listnode *ln; struct listnode *ln, *ipln;
struct vrrp_vrouter *vr; struct vrrp_vrouter *vr;
int writes = 0; int writes = 0;
@ -2088,23 +2088,24 @@ int vrrp_config_write_interface(struct vty *vty)
vty_out(vty, " vrrp %" PRIu8 " priority %" PRIu8 "\n", vty_out(vty, " vrrp %" PRIu8 " priority %" PRIu8 "\n",
vr->vrid, vr->priority); vr->vrid, vr->priority);
ln = NULL;
struct ipaddr *ip; struct ipaddr *ip;
for (ALL_LIST_ELEMENTS_RO(vr->v4->addrs, ln, ip)) { for (ALL_LIST_ELEMENTS_RO(vr->v4->addrs, ipln, ip)) {
char ipbuf[INET6_ADDRSTRLEN]; char ipbuf[INET6_ADDRSTRLEN];
ipaddr2str(ip, ipbuf, sizeof(ipbuf)); ipaddr2str(ip, ipbuf, sizeof(ipbuf));
vty_out(vty, " vrrp %" PRIu8 " ip %s\n", vr->vrid, vty_out(vty, " vrrp %" PRIu8 " ip %s\n", vr->vrid,
ipbuf); ipbuf);
++writes; ++writes;
} }
for (ALL_LIST_ELEMENTS_RO(vr->v6->addrs, ln, ip)) {
for (ALL_LIST_ELEMENTS_RO(vr->v6->addrs, ipln, ip)) {
char ipbuf[INET6_ADDRSTRLEN]; char ipbuf[INET6_ADDRSTRLEN];
ipaddr2str(ip, ipbuf, sizeof(ipbuf)); ipaddr2str(ip, ipbuf, sizeof(ipbuf));
vty_out(vty, " vrrp %" PRIu8 " ipv6 %s\n", vr->vrid, vty_out(vty, " vrrp %" PRIu8 " ipv6 %s\n", vr->vrid,
ipbuf); ipbuf);
++writes; ++writes;
} }
vty_endframe(vty, "!\n");
} }
return writes; return writes;