]> git.proxmox.com Git - mirror_frr.git/commitdiff
pim6d: Adjust rpf_addr in pim_zebra
authorsarita patra <saritap@vmware.com>
Wed, 27 Apr 2022 08:22:21 +0000 (01:22 -0700)
committerSarita Patra <saritap@vmware.com>
Wed, 6 Jul 2022 09:41:47 +0000 (02:41 -0700)
In this PR, we are handling the pim_zebra code
after rpf_addr modified from prefix to pim_addr.

Signed-off-by: sarita patra <saritap@vmware.com>
pimd/pim_zebra.c

index 7f217d9c2eb5465e9adfd380dded6f49fa172c50..2c76fd6868f0ae0285368187dfb9569e0cc998bf 100644 (file)
@@ -255,7 +255,7 @@ void pim_zebra_update_all_interfaces(struct pim_instance *pim)
                        struct pim_rpf rpf;
 
                        rpf.source_nexthop.interface = ifp;
-                       pim_addr_to_prefix(&rpf.rpf_addr, us->address);
+                       rpf.rpf_addr = us->address;
                        pim_joinprune_send(&rpf, us->us);
                        pim_jp_agg_clear_group(us->us);
                }
@@ -269,8 +269,8 @@ void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
        if (old->source_nexthop.interface) {
                struct pim_neighbor *nbr;
 
-               nbr = pim_neighbor_find_prefix(old->source_nexthop.interface,
-                                              &old->rpf_addr);
+               nbr = pim_neighbor_find(old->source_nexthop.interface,
+                                       old->rpf_addr);
                if (nbr)
                        pim_jp_agg_remove_group(nbr->upstream_jp_agg, up, nbr);