proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 19:43:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16476 from FRRouting/mergify/bp/dev/10.1/pr-16472

Browse Source 
pimd: Fix msdp setting of sa->rp (backport #16472)
This commit is contained in:
Donald Sharp 2024-07-26 07:33:45 -04:00 committed by GitHub
commit 04d00cdae6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_msdp.c
View File

@ -412,11 +412,9 @@ void pim_msdp_sa_ref(struct pim_instance *pim, struct pim_msdp_peer *mp,
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",
} }