]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd, pim6d: Fix pim upstream rpf change
authorSarita Patra <saritap@vmware.com>
Wed, 19 Oct 2022 00:32:11 +0000 (17:32 -0700)
committerSarita Patra <saritap@vmware.com>
Fri, 24 Feb 2023 12:40:38 +0000 (04:40 -0800)
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>
pimd/pim_zebra.c

index e39eca7a2ccf464e6903c21d2df3984c5bf26e30..29aac7f1c77d1cbd977382d9031aa1cc28735c4a 100644 (file)
@@ -257,7 +257,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);