diff options
| -rw-r--r-- | bgpd/bgp_packet.c | 18 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 5 |
2 files changed, 9 insertions, 14 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 3d73e34235..cf7a265b11 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -1393,13 +1393,8 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size) || peer->afc_nego[AFI_IP][SAFI_ENCAP]) { if (peer->nexthop.v4.s_addr == INADDR_ANY) { #if defined(HAVE_CUMULUS) - flog_err( - EC_BGP_SND_FAIL, - "%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; + zlog_warn("%s: No local IPv4 addr, BGP routing may not work", + peer->host); #endif } } @@ -1410,13 +1405,8 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size) || peer->afc_nego[AFI_IP6][SAFI_ENCAP]) { if (IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_global)) { #if defined(HAVE_CUMULUS) - flog_err( - EC_BGP_SND_FAIL, - "%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; + zlog_warn("%s: No local IPv6 address, BGP routing may not work", + peer->host); #endif } } diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 9af9ad069f..ace4139551 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1720,11 +1720,16 @@ DEFUNSH(VTYSH_BGPD, address_family_evpn, address_family_evpn_cmd, } #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, "address-family evpn", "Enter Address Family command mode\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; return CMD_SUCCESS; } |