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

Merge pull request #17247 from FRRouting/mergify/bp/stable/10.0/pr-17217

Browse Source 
pimd: allow resolving bsr via directly connected secondary address (backport) (backport #17217)
This commit is contained in:
Jafar Al-Gharaibeh 2024-10-27 23:43:35 -05:00 committed by GitHub
commit c66186f646
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pimd/pim_nht.c
View File

@ -313,7 +313,19 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
if (!nbr) if (!nbr)
continue; continue;
return znh->ifindex == src_ifp->ifindex; /* Are we on the correct interface? */
if (znh->ifindex == src_ifp->ifindex) {
/* Do we have the correct NH ? */
if (!pim_addr_cmp(znh->nexthop_addr, src_ip))
return true;
/*
* check If the packet came from the neighbor,
* and the dst is a secondary address on the connected interface
*/
return (!pim_addr_cmp(nbr->source_addr, src_ip) &&
pim_if_connected_to_source(ifp, znh->nexthop_addr));
}
return false;
} }
return false; return false;
} }
@ -380,7 +392,19 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
if (!nbr) if (!nbr)
continue; continue;
return nh->ifindex == src_ifp->ifindex; /* Are we on the correct interface? */
if (nh->ifindex == src_ifp->ifindex) {
/* Do we have the correct NH ? */
if (!pim_addr_cmp(nhaddr, src_ip))
return true;
/*
* check If the packet came from the neighbor,
* and the dst is a secondary address on the connected interface
*/
return (!pim_addr_cmp(nbr->source_addr, src_ip) &&
pim_if_connected_to_source(ifp, nhaddr));
}
return false;
} }
return false; return false;
} }