mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-06-02 19:32:53 +00:00
pimd: allow resolving bsr via directly connected secondary address
This only matters to single hop nodes that are adjacent to the bsr. More common with IPv6 where LL address is used in PIM as the primary address. If the BSR IP happens to be an address on the same interface, the receiving pim router rejects the BSR address because it expects the BSR IP to resolve via the LL address even if we have a connected route for the same BSR IP subnet. Effectively, we want to allow rpf to be resolved via secondary IPs with connected routes on the same interface, and not limit them to primary addresses. Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
parent
be50cd1ee0
commit
d23a7d0949
@ -313,7 +313,19 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
|
||||
if (!nbr)
|
||||
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;
|
||||
}
|
||||
@ -380,7 +392,19 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
|
||||
if (!nbr)
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user