summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2025-02-26 11:15:31 -0500
committerGitHub <noreply@github.com>2025-02-26 11:15:31 -0500
commit5bbf45dc563af058ed642007816021cc0dbb4485 (patch)
tree48d0623033f7a8be6b691063b700eb1885fb194a
parent308daf81cad16d0049f9131e66f1d4de98b10e90 (diff)
parent83fb10210f39d0fbb7da2b31e52a485e4bde71c4 (diff)
Merge pull request #18207 from FRRouting/mergify/bp/dev/10.3/pr-17666
pimd: During prefix-list update, behave as PIM_UPSTREAM_NOTJOINED sta… (backport #17666)
-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 -