proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 04:39:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bgpd: optimize bgp_interface_address_add"

Browse Source 
This reverts commit 8599fe2b5e.
This commit is contained in:
Donatas Abraitis 2024-08-14 20:14:20 +03:00
parent 0a7e971187
commit 8a7c4c023e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_zebra.c
View File

@ -335,11 +335,13 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6) if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)
&& !list_isempty(ifc->ifp->nbr_connected)) && !list_isempty(ifc->ifp->nbr_connected))
bgp_start_interface_nbrs(bgp, ifc->ifp); bgp_start_interface_nbrs(bgp, ifc->ifp);
else if (ifc->address->family == AF_INET6 && else {
!IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) {
addr = ifc->address; addr = ifc->address;
for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
if (addr->family == AF_INET)
continue;
/* /*
* If the Peer's interface name matches the * If the Peer's interface name matches the
* interface name for which BGP received the * interface name for which BGP received the
@ -353,6 +355,7 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
if ((peer->conf_if && if ((peer->conf_if &&
(strcmp(peer->conf_if, ifc->ifp->name) == (strcmp(peer->conf_if, ifc->ifp->name) ==
0)) && 0)) &&
!IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6) &&
((IS_MAPPED_IPV6( ((IS_MAPPED_IPV6(
&peer->nexthop.v6_global)) || &peer->nexthop.v6_global)) ||
IN6_IS_ADDR_LINKLOCAL( IN6_IS_ADDR_LINKLOCAL(