From: sarita patra <saritap@vmware.com>
Date: Wed, 27 Apr 2022 08:22:21 +0000 (-0700)
Subject: pim6d: Adjust rpf_addr in pim_zebra
X-Git-Tag: base_8.4~264^2~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=144035b741733d450a992700c95785492c41e1df;p=matthieu%2Ffrr.git

pim6d: Adjust rpf_addr in pim_zebra

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>
---

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 7f217d9c2e..2c76fd6868 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -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);