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

pimd: Refactor function to use pim_ecmp_nexthop_lookup

Browse Source 
The pim_ecmp_fib_looikup_if_vif_index does practically
the same work as pim_ecmp_nexthop_lookup, refactor to
use that function so that we do not have more code
that must parse the results from zclient_lookup_nexthop.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-07-07 08:43:27 -04:00
parent ab9ac14351
commit 8a5134aaa6
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pimd/pim_nht.c
View File

@ -979,17 +979,11 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
struct in_addr addr, struct prefix *src, struct in_addr addr, struct prefix *src,
struct prefix *grp) struct prefix *grp)
{ {
struct pim_zlookup_nexthop nexthop_tab[MULTIPATH_NUM]; struct pim_nexthop nhop;
int num_ifindex;
int vif_index; int vif_index;
ifindex_t first_ifindex; ifindex_t ifindex;
uint32_t hash_val = 0, mod_val = 0;
memset(nexthop_tab, 0, if (!pim_ecmp_nexthop_lookup(pim, &nhop, addr, src, grp, 0)) {
sizeof(struct pim_zlookup_nexthop) * MULTIPATH_NUM);
num_ifindex = zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
addr, PIM_NEXTHOP_LOOKUP_MAX);
if (num_ifindex < 1) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {
char addr_str[INET_ADDRSTRLEN]; char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr, addr_str, pim_inet4_dump("<addr?>", addr, addr_str,
@ -1001,28 +995,18 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
return -1; return -1;
} }
// If PIM ECMP enable then choose ECMP path. ifindex = nhop.interface->ifindex;
if (pim->ecmp_enable) {
hash_val = pim_compute_ecmp_hash(src, grp);
mod_val = hash_val % num_ifindex;
if (PIM_DEBUG_PIM_NHT_DETAIL)
zlog_debug("%s: hash_val %u mod_val %u",
__PRETTY_FUNCTION__, hash_val, mod_val);
}
first_ifindex = nexthop_tab[mod_val].ifindex;
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {
char addr_str[INET_ADDRSTRLEN]; char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<ifaddr?>", addr, addr_str, sizeof(addr_str)); pim_inet4_dump("<ifaddr?>", addr, addr_str, sizeof(addr_str));
zlog_debug( zlog_debug(
"%s: found nexthop ifindex=%d (interface %s(%s)) for address %s", "%s: found nexthop ifindex=%d (interface %s(%s)) for address %s",
__PRETTY_FUNCTION__, first_ifindex, __PRETTY_FUNCTION__, ifindex,
ifindex2ifname(first_ifindex, pim->vrf_id), ifindex2ifname(ifindex, pim->vrf_id),
pim->vrf->name, addr_str); pim->vrf->name, addr_str);
} }
vif_index = pim_if_find_vifindex_by_ifindex(pim, first_ifindex); vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
if (vif_index < 0) { if (vif_index < 0) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {