summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pimd/pim_upstream.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index ddd9fe1ff0..f3f3d5f0f3 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -635,6 +635,12 @@ void pim_upstream_update_use_rpt(struct pim_upstream *up,
if (pim_addr_is_any(up->sg.src))
return;
+ /* Ignore RP mapping when the upsteam state
+ * is NOT Joined on a FHR
+ */
+ if (up->join_state == PIM_UPSTREAM_NOTJOINED && PIM_UPSTREAM_FLAG_TEST_FHR(up->flags))
+ return;
+
old_use_rpt = !!PIM_UPSTREAM_FLAG_TEST_USE_RPT(up->flags);
/* We will use the SPT (IIF=RPF_interface(S) if -