diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2024-07-25 13:50:32 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2024-07-25 13:50:32 +0200 |
| commit | c4b4c242ec8cfcdb23f0f90faaa0ff76577e1364 (patch) | |
| tree | 465143d30a5e1d3cd23e5bfc7fb49be8c4fd4937 /pimd/pim_msdp.c | |
| parent | Merge pull request #16094 from opensourcerouting/pkgs-with-grpc (diff) | |
| download | frr-c4b4c242ec8cfcdb23f0f90faaa0ff76577e1364.tar.xz frr-c4b4c242ec8cfcdb23f0f90faaa0ff76577e1364.zip | |
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>
Diffstat (limited to 'pimd/pim_msdp.c')
| -rw-r--r-- | pimd/pim_msdp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 623c14bb0..ea8c84cca 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; |