diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2025-02-20 16:19:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-20 16:19:12 -0500 |
| commit | dab15679e3912577171ee7ae1279ba415b2552bc (patch) | |
| tree | 4f4daef039b49e14ab850128991b58e86ced24af | |
| parent | 312d74048db39052db62f61c5bb996e1535de39e (diff) | |
| parent | 8653c12d31ae1973f10002e5a6076cb6e9c72233 (diff) | |
Merge pull request #18209 from FRRouting/mergify/bp/stable/10.1/pr-17666
pimd: During prefix-list update, behave as PIM_UPSTREAM_NOTJOINED sta… (backport #17666)
| -rw-r--r-- | pimd/pim_upstream.c | 6 |
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 - |