From f6a1dc2ca74705ccf9fc68784ab4a1b39835cf9c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 22 Jul 2016 10:19:32 -0400 Subject: [PATCH] pimd: Fix join in register to use correct nexthop pim was sending the join from the RP towards the FHR with a address that was the source instead of the nexthop. This join was treated as a non-local and nothing was done with it. Ticket: CM-11945 Signed-off-by: Donald Sharp --- pimd/pim_register.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 8c9e6c7810..bb05ba1c68 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -348,7 +348,7 @@ pim_register_recv (struct interface *ifp, upstream->upstream_addr, NULL); upstream->rpf.source_nexthop.interface = ifp; upstream->source_addr.s_addr = source.s_addr; - upstream->rpf.rpf_addr.s_addr = source.s_addr; + upstream->rpf.rpf_addr = upstream->rpf.source_nexthop.mrib_nexthop_addr; upstream->channel_oil->oil.mfcc_origin = source; pim_scan_individual_oil (upstream->channel_oil); pim_upstream_send_join (upstream); -- 2.39.5