summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pimd/pim_nht.c1
-rw-r--r--pimd/pim_rp.c9
2 files changed, 6 insertions, 4 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index f2115010ef..74a3917180 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -513,6 +513,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
nbrs[i] = pim_neighbor_find(ifps[i],
nh_node->gate.ipv4);
if (nbrs[i] || pim_if_connected_to_source(ifps[i],
+
src->u.prefix4))
num_nbrs++;
}
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index c837e01549..8ede416a53 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -700,9 +700,9 @@ void pim_rp_setup(struct pim_instance *pim)
"%s: NHT Local Nexthop not found for RP %s ",
__PRETTY_FUNCTION__, buf);
}
- if (!pim_ecmp_nexthop_lookup(
- pim, &rp_info->rp.source_nexthop,
- &nht_p, &rp_info->group, 1))
+ if (!pim_ecmp_nexthop_lookup(pim,
+ &rp_info->rp.source_nexthop,
+ &nht_p, &rp_info->group, 1))
if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug(
"Unable to lookup nexthop for rp specified");
@@ -867,7 +867,8 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group)
__PRETTY_FUNCTION__, buf, buf1);
}
pim_rpf_set_refresh_time(pim);
- pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
+ pim_ecmp_nexthop_lookup(pim,
+ &rp_info->rp.source_nexthop,
&nht_p, &rp_info->group, 1);
}
return (&rp_info->rp);