proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 05:58:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16299 from opensourcerouting/pim-logic-braces-20240625

Browse Source 
pimd: fix misplaced braces/logic error in pim_rp_set_upstream_addr
This commit is contained in:
Donald Sharp 2024-06-27 14:00:47 -04:00 committed by GitHub
commit 453cbf6503
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pimd/pim_rp.c
View File

@ -1107,16 +1107,17 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
pim_addr source, pim_addr group) pim_addr source, pim_addr group)
{ {
struct rp_info *rp_info; struct rp_info *rp_info;
struct prefix g; struct prefix g = {};
memset(&g, 0, sizeof(g)); if (!pim_addr_is_any(source)) {
*up = source;
return 1;
}
pim_addr_to_prefix(&g, group); pim_addr_to_prefix(&g, group);
rp_info = pim_rp_find_match_group(pim, &g); rp_info = pim_rp_find_match_group(pim, &g);
if (!rp_info || ((pim_rpf_addr_is_inaddr_any(&rp_info->rp)) && if (!rp_info || pim_rpf_addr_is_inaddr_any(&rp_info->rp)) {
(pim_addr_is_any(source)))) {
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug("%s: Received a (*,G) with no RP configured", zlog_debug("%s: Received a (*,G) with no RP configured",
__func__); __func__);
@ -1124,11 +1125,7 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
return 0; return 0;
} }
if (pim_addr_is_any(source)) *up = rp_info->rp.rpf_addr;
*up = rp_info->rp.rpf_addr;
else
*up = source;
return 1; return 1;
} }