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

Merge pull request #7577 from donaldsharp/datacenter_stuff

Browse Source 
Datacenter stuff
This commit is contained in:
Donatas Abraitis 2020-11-24 10:02:39 +02:00 committed by GitHub
commit 9bcab3130b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_packet.c
View File

@ -1393,13 +1393,8 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
|| peer->afc_nego[AFI_IP][SAFI_ENCAP]) { || peer->afc_nego[AFI_IP][SAFI_ENCAP]) {
if (peer->nexthop.v4.s_addr == INADDR_ANY) { if (peer->nexthop.v4.s_addr == INADDR_ANY) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
flog_err( zlog_warn("%s: No local IPv4 addr, BGP routing may not work",
EC_BGP_SND_FAIL, peer->host);
"%s: No local IPv4 addr resetting connection, fd %d",
peer->host, peer->fd);
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_SUBCODE_UNSPECIFIC);
return BGP_Stop;
#endif #endif
} }
} }
@ -1410,13 +1405,8 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
|| peer->afc_nego[AFI_IP6][SAFI_ENCAP]) { || peer->afc_nego[AFI_IP6][SAFI_ENCAP]) {
if (IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_global)) { if (IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_global)) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
flog_err( zlog_warn("%s: No local IPv6 address, BGP routing may not work",
EC_BGP_SND_FAIL, peer->host);
"%s: No local IPv6 addr resetting connection, fd %d",
peer->host, peer->fd);
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_SUBCODE_UNSPECIFIC);
return BGP_Stop;
#endif #endif
} }
} }

5
vtysh/vtysh.c
View File

@ -1720,11 +1720,16 @@ DEFUNSH(VTYSH_BGPD, address_family_evpn, address_family_evpn_cmd,
} }
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
#if CONFDATE > 20211115
CPP_NOTICE("Use of `address-family evpn` is deprecated please remove don't forget frr-reload.py")
#endif
DEFUNSH_HIDDEN(VTYSH_BGPD, address_family_evpn2, address_family_evpn2_cmd, DEFUNSH_HIDDEN(VTYSH_BGPD, address_family_evpn2, address_family_evpn2_cmd,
"address-family evpn", "address-family evpn",
"Enter Address Family command mode\n" "Enter Address Family command mode\n"
"EVPN Address family\n") "EVPN Address family\n")
{ {
vty_out(vty,
"This command is deprecated please convert to `address-family l2vpn evpn`\n");
vty->node = BGP_EVPN_NODE; vty->node = BGP_EVPN_NODE;
return CMD_SUCCESS; return CMD_SUCCESS;
} }