diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2025-02-20 16:19:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-20 16:19:23 -0500 |
| commit | f526b3d8f0aed1c2eff036b60c953103b5fe9f3c (patch) | |
| tree | f049c4a2543212e6d9b4bc60e3e2ab5c741fc4c4 | |
| parent | b7f756c3d014d303b9ba0f32ed426d1b529b49a4 (diff) | |
| parent | b06af550c55840e424b1bb83b94c478b04859da1 (diff) | |
Merge pull request #18208 from FRRouting/mergify/bp/stable/10.2/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 - |