summaryrefslogtreecommitdiff
path: root/pimd/pim_msdp.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2024-07-25 07:50:32 -0400
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-07-25 18:10:22 +0000
commit2c1981776fa248c614c739a80f5fe321f7d22c53 (patch)
tree29eeb021c78e03e46e2d6c0b305c83a2510a6af6 /pimd/pim_msdp.c
parent52b95312f3890ed8464eb5e87d2284b0518eac7d (diff)
pimd: Fix msdp setting of sa->rp
The code is clearly incorrect. After consultation with the original author this is the decided change. Signed-off-by: Donald Sharp <sharpd@nvidia.com> (cherry picked from commit c4b4c242ec8cfcdb23f0f90faaa0ff76577e1364)
Diffstat (limited to 'pimd/pim_msdp.c')
-rw-r--r--pimd/pim_msdp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 623c14bb03..ea8c84cca5 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -411,12 +411,10 @@ void pim_msdp_sa_ref(struct pim_instance *pim, struct pim_msdp_peer *mp,
pim_addr_to_prefix(&grp, sa->sg.grp);
rp_info = pim_rp_find_match_group(pim, &grp);
if (rp_info) {
- sa->rp = rp_info->rp.rpf_addr;
- } else
- {
- sa->rp = pim->msdp.originator_id;
+ sa->rp = rp_info->rp.rpf_addr;
+ } else {
+ sa->rp = pim->msdp.originator_id;
}
- sa->rp = pim->msdp.originator_id;
pim_msdp_pkt_sa_tx_one(sa);
}
sa->flags &= ~PIM_MSDP_SAF_STALE;