proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 08:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Handle pimreg a bit better

Browse Source 
The pimreg device is vif_index == 0.  Allow it
to be used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-06-23 11:46:57 -04:00
parent 169edb7f12
commit ae90dfbbb7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pimd/pim_iface.c
View File

@ -772,6 +772,9 @@ struct interface *pim_if_find_by_vif_index(int vif_index)
struct listnode *ifnode; struct listnode *ifnode;
struct interface *ifp; struct interface *ifp;
if (vif_index == 0)
return if_lookup_by_name_vrf ("pimreg", VRF_DEFAULT);
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) { for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
if (ifp->info) { if (ifp->info) {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
@ -789,7 +792,15 @@ struct interface *pim_if_find_by_vif_index(int vif_index)
*/ */
int pim_if_find_vifindex_by_ifindex(int ifindex) int pim_if_find_vifindex_by_ifindex(int ifindex)
{ {
return ifindex; struct pim_interface *pim_ifp;
struct interface *ifp;
ifp = if_lookup_by_index_vrf (ifindex, VRF_DEFAULT);
pim_ifp = ifp->info;
if (!pim_ifp)
return -1;
return pim_ifp->mroute_vif_index;
} }
int pim_if_lan_delay_enabled(struct interface *ifp) int pim_if_lan_delay_enabled(struct interface *ifp)

2
pimd/pim_zebra.c
View File

@ -779,7 +779,7 @@ static int fib_lookup_if_vif_index(struct in_addr addr)
vif_index = pim_if_find_vifindex_by_ifindex(first_ifindex); vif_index = pim_if_find_vifindex_by_ifindex(first_ifindex);
if (vif_index < 1) { if (vif_index < 0) {
char addr_str[100]; char addr_str[100];
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str)); pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
zlog_warn("%s %s: low vif_index=%d < 1 nexthop for address %s", zlog_warn("%s %s: low vif_index=%d < 1 nexthop for address %s",