From 8fcc9daf7cea9c1250d14b253ba334d590daab8d Mon Sep 17 00:00:00 2001 From: Sarita Patra Date: Tue, 18 Oct 2022 16:31:00 -0700 Subject: [PATCH] pimd, pim6d: fix pim neighbor check in pim_nexthop_lookup When there is a mismatch in nexthop address (secondary address) and neighborship address(primary address) on the same interface, RPF check fails. This is fixed now. Signed-off-by: Sarita Patra (cherry picked from commit e14ba248742cd56b903ccd965576ac18ad41d310) --- pimd/pim_rpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index d237a73126..3ec2e53ae6 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -129,8 +129,8 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop, i++; } else if (neighbor_needed && !pim_if_connected_to_source(ifp, addr)) { - nbr = pim_neighbor_find(ifp, - nexthop_tab[i].nexthop_addr); + nbr = pim_neighbor_find( + ifp, nexthop_tab[i].nexthop_addr, true); if (PIM_DEBUG_PIM_TRACE_DETAIL) zlog_debug("ifp name: %s, pim nbr: %p", ifp->name, nbr); -- 2.39.5