]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Handle rpf_addr in pim_ifchannel code
authorsarita patra <saritap@vmware.com>
Wed, 27 Apr 2022 08:31:31 +0000 (01:31 -0700)
committerSarita Patra <saritap@vmware.com>
Wed, 6 Jul 2022 09:41:48 +0000 (02:41 -0700)
Signed-off-by: sarita patra <saritap@vmware.com>
pimd/pim_ifchannel.c

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