proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 00:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix msdp setting of sa->rp

Browse Source 
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 c4b4c242ec)
This commit is contained in:
Donald Sharp 2024-07-25 07:50:32 -04:00 committed by Mergify
parent c717390e8e
commit b239c90c76
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pimd/pim_msdp.c
View File

@ -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); pim_addr_to_prefix(&grp, sa->sg.grp);
rp_info = pim_rp_find_match_group(pim, &grp); rp_info = pim_rp_find_match_group(pim, &grp);
if (rp_info) { if (rp_info) {
sa->rp = rp_info->rp.rpf_addr; sa->rp = rp_info->rp.rpf_addr;
} else } else {
{ sa->rp = pim->msdp.originator_id;
sa->rp = pim->msdp.originator_id;
} }
sa->rp = pim->msdp.originator_id;
pim_msdp_pkt_sa_tx_one(sa); pim_msdp_pkt_sa_tx_one(sa);
} }
sa->flags &= ~PIM_MSDP_SAF_STALE; sa->flags &= ~PIM_MSDP_SAF_STALE;

4
tests/topotests/msdp_topo1/test_msdp_topo1.py
View File

@ -359,7 +359,7 @@ def test_msdp():
"192.168.10.100": { "192.168.10.100": {
"source": "192.168.10.100", "source": "192.168.10.100",
"group": "229.1.2.3", "group": "229.1.2.3",
"rp": "192.168.1.1", "rp": "10.254.254.1",
"local": "no", "local": "no",
"sptSetup": "no", "sptSetup": "no",
} }
@ -394,7 +394,7 @@ def test_msdp():
"192.168.10.100": { "192.168.10.100": {
"source": "192.168.10.100", "source": "192.168.10.100",
"group": "229.1.2.3", "group": "229.1.2.3",
"rp": "192.168.1.1", "rp": "10.254.254.1",
"local": "no", "local": "no",
"sptSetup": "yes", "sptSetup": "yes",
} }