summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetwroks.com>2016-07-22 10:19:32 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-12-21 20:26:02 -0500
commitf6a1dc2ca74705ccf9fc68784ab4a1b39835cf9c (patch)
treec5e88cb0de991d610743d6ab5e0e09cb14841efe
parent9fd309db2d88eeba9d2828fb5fe47516f51cbec1 (diff)
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 <sharpd@cumulusnetworks.com>
-rw-r--r--pimd/pim_register.c2
1 files changed, 1 insertions, 1 deletions
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);