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

pimd: Make code consistent in regards to lookup

Browse Source 
In places where we do a pim_ecmp_nexthop_search, also
use pim_ecmp_nexthop_lookup instead of the single path
case of pim_nexthop_lookup.

This is in preparation of more serious surgery to fix
the weird api of pim_find_or_track_nexthop.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-07-07 10:04:30 -04:00
parent b938537bdb
commit 53bc94b070
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pimd/pim_rp.c
View File

@ -486,10 +486,9 @@ int pim_rp_new(struct pim_instance *pim, const char *rp,
&rp_all->group, 1)) &rp_all->group, 1))
return PIM_RP_NO_PATH; return PIM_RP_NO_PATH;
} else { } else {
if (pim_nexthop_lookup( if (!pim_ecmp_nexthop_lookup(
pim, &rp_all->rp.source_nexthop, pim, &rp_all->rp.source_nexthop,
rp_all->rp.rpf_addr.u.prefix4, 1) &nht_p, &rp_all->group, 1))
!= 0)
return PIM_RP_NO_PATH; return PIM_RP_NO_PATH;
} }
pim_rp_check_interfaces(pim, rp_all); pim_rp_check_interfaces(pim, rp_all);
@ -571,9 +570,8 @@ int pim_rp_new(struct pim_instance *pim, const char *rp,
&nht_p, &rp_info->group, 1)) &nht_p, &rp_info->group, 1))
return PIM_RP_NO_PATH; return PIM_RP_NO_PATH;
} else { } else {
if (pim_nexthop_lookup(pim, &rp_info->rp.source_nexthop, if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
rp_info->rp.rpf_addr.u.prefix4, 1) &nht_p, &rp_info->group, 1))
!= 0)
return PIM_RP_NO_PATH; return PIM_RP_NO_PATH;
} }
@ -702,9 +700,9 @@ void pim_rp_setup(struct pim_instance *pim)
"%s: NHT Local Nexthop not found for RP %s ", "%s: NHT Local Nexthop not found for RP %s ",
__PRETTY_FUNCTION__, buf); __PRETTY_FUNCTION__, buf);
} }
if (pim_nexthop_lookup( if (!pim_ecmp_nexthop_lookup(
pim, &rp_info->rp.source_nexthop, pim, &rp_info->rp.source_nexthop,
rp_info->rp.rpf_addr.u.prefix4, 1) < 0) &nht_p, &rp_info->group, 1))
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug( zlog_debug(
"Unable to lookup nexthop for rp specified"); "Unable to lookup nexthop for rp specified");
@ -869,8 +867,8 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group)
__PRETTY_FUNCTION__, buf, buf1); __PRETTY_FUNCTION__, buf, buf1);
} }
pim_rpf_set_refresh_time(pim); pim_rpf_set_refresh_time(pim);
pim_nexthop_lookup(pim, &rp_info->rp.source_nexthop, pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
rp_info->rp.rpf_addr.u.prefix4, 1); &nht_p, &rp_info->group, 1);
} }
return (&rp_info->rp); return (&rp_info->rp);
} }