summaryrefslogtreecommitdiff
path: root/pimd
diff options
context:
space:
mode:
authorMark Stapp <mjs.ietf@gmail.com>2025-02-20 13:41:10 -0500
committerGitHub <noreply@github.com>2025-02-20 13:41:10 -0500
commitbf8e4a3b83956c112cf7863e5b4538c70384e027 (patch)
tree915910b6d6b786ca70f6788e7300dda78a7d9d16 /pimd
parentfc6b0413fa3f9d52857f6b534d5ab6ab1420b3b2 (diff)
parent51f26d17da288af44a8a0e536dbe317a7e678514 (diff)
Merge pull request #17666 from routingrocks/pim_fhr_rp
pimd: During prefix-list update, behave as PIM_UPSTREAM_NOTJOINED sta…
Diffstat (limited to 'pimd')
-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 01e1321b25..e4603ff946 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -643,6 +643,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 -