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

Revert "bgpd: accept bgp link-state capability"

Browse Source 
This reverts commit 67fe40676e.

(cherry picked from commit a4fcdc4e48)
This commit is contained in:
Donald Sharp 2023-10-10 16:45:24 -04:00 committed by Mergify
parent dc0da8df7e
commit f98f17d83a
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bgpd/bgp_open.c
View File

@ -1441,8 +1441,7 @@ int bgp_open_option_parse(struct peer *peer, uint16_t length,
&& !peer->afc_nego[AFI_IP6][SAFI_MPLS_VPN]
&& !peer->afc_nego[AFI_IP6][SAFI_ENCAP]
&& !peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC]
&& !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]
&& !peer->afc_nego[AFI_LINKSTATE][SAFI_LINKSTATE]) {
&& !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]) {
flog_err(EC_BGP_PKT_OPEN,
"%s [Error] Configured AFI/SAFIs do not overlap with received MP capabilities",
peer->host);

2
bgpd/bgp_packet.c
View File

@ -1896,8 +1896,6 @@ static int bgp_open_receive(struct peer_connection *connection,
peer->afc[AFI_L2VPN][SAFI_EVPN];
peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC] =
peer->afc[AFI_IP6][SAFI_FLOWSPEC];
peer->afc_nego[AFI_LINKSTATE][SAFI_LINKSTATE] =
peer->afc[AFI_LINKSTATE][SAFI_LINKSTATE];
}
/* Verify valid local address present based on negotiated