From 2c1981776fa248c614c739a80f5fe321f7d22c53 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 25 Jul 2024 07:50:32 -0400 Subject: 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 (cherry picked from commit c4b4c242ec8cfcdb23f0f90faaa0ff76577e1364) --- pimd/pim_msdp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pimd/pim_msdp.c') 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; -- cgit v1.2.3