pimd, pim6d: Fix pim upstream rpf change

When upstream RPF address is secondary, and
neighborship is built with primary address,
then pim_neighbor_find() fails, due to which when there
is upstream change it wont send prune.

Verify the nexthop is present in the neighbor primary
and secondary address list.

Signed-off-by: Sarita Patra <saritap@vmware.com>
(cherry picked from commit 689b9f10fc33387414c8077cd8cacd2eb2fc7198)

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 2c76fd6868f0ae0285368187dfb9569e0cc998bf..6377deca213a85a01de5abebc8c96535ef5719ba 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -270,7 +270,8 @@ void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
                struct pim_neighbor *nbr;
 
                nbr = pim_neighbor_find(old->source_nexthop.interface,
-                                       old->rpf_addr);
+                                       old->rpf_addr, true);
+
                if (nbr)
                        pim_jp_agg_remove_group(nbr->upstream_jp_agg, up, nbr);