pimd: Handle rpf_addr in pim_ifchannel code

Signed-off-by: sarita patra <saritap@vmware.com>
This commit is contained in:
sarita patra 2022-04-27 01:31:31 -07:00 committed by Sarita Patra
parent 6288ebcf22
commit 8d61ad0f17

View File

@ -685,8 +685,7 @@ static void on_ifjoin_prune_pending_timer(struct thread *t)
struct pim_rpf rpf; struct pim_rpf rpf;
rpf.source_nexthop.interface = ifp; rpf.source_nexthop.interface = ifp;
pim_addr_to_prefix(&rpf.rpf_addr, rpf.rpf_addr = pim_ifp->primary_address;
pim_ifp->primary_address);
pim_jp_agg_single_upstream_send( pim_jp_agg_single_upstream_send(
&rpf, ch->upstream, 0); &rpf, ch->upstream, 0);
} }
@ -751,7 +750,7 @@ static void check_recv_upstream(int is_join, struct interface *recv_ifp,
return; return;
} }
rpf_addr = pim_addr_from_prefix(&up->rpf.rpf_addr); rpf_addr = up->rpf.rpf_addr;
/* upstream directed to RPF'(S,G) ? */ /* upstream directed to RPF'(S,G) ? */
if (pim_addr_cmp(upstream, rpf_addr)) { if (pim_addr_cmp(upstream, rpf_addr)) {