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

Merge pull request #11712 from mobash-rasool/fixes2

Browse Source 
pimd: Simply the code a bit, reduce code complexity
This commit is contained in:
Donald Sharp 2022-08-01 07:18:10 -04:00 committed by GitHub
commit d758d2a9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pimd/pim_iface.c
View File

@ -801,22 +801,13 @@ void pim_if_addr_add_all(struct interface *ifp)
pim_if_addr_add(ifc); pim_if_addr_add(ifc);
} }
if (!v4_addrs && v6_addrs && !if_is_loopback(ifp)) { if (!v4_addrs && v6_addrs && !if_is_loopback(ifp) &&
if (pim_ifp->pim_enable) { pim_ifp->pim_enable && !pim_addr_is_any(pim_ifp->primary_address) &&
pim_ifp->pim_sock_fd < 0 && pim_sock_add(ifp)) {
/* Interface has a valid primary address ? */ /* Interface has a valid primary address ? */
if (!pim_addr_is_any(pim_ifp->primary_address)) { /* Interface has a valid socket ? */
zlog_warn("Failure creating PIM socket for interface %s",
/* Interface has a valid socket ? */ ifp->name);
if (pim_ifp->pim_sock_fd < 0) {
if (pim_sock_add(ifp)) {
zlog_warn(
"Failure creating PIM socket for interface %s",
ifp->name);
}
}
}
} /* pim */
} }
/* /*
* PIM or IGMP is enabled on interface, and there is at least one * PIM or IGMP is enabled on interface, and there is at least one