From 64c1a9b59bcbd4a551aa2a6111cc7b7d6dab376a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 1 Dec 2017 11:49:13 -0500 Subject: [PATCH] bgpd: Allow Address-Family activation to work in certain states If we are in OpenSent or OpenConfirm peer state and we receive a new address-family activation, we would end up ignoring the new activation and not tell our peer about it. You could notice this by seeing the fact that a 'show bgp neighbor' command returns a 'Not in any update group' for a particular family. This modifies the code such that we now notice that we are in either OpenSent or OpenConfirm state and reset the peer to allow us to send them the new capability. Ticket: CM-19021 Signed-off-by: Donald Sharp --- bgpd/bgpd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 8aaf19c7e1..8b27a0e905 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1882,6 +1882,11 @@ static int peer_activate_af(struct peer *peer, afi_t afi, safi_t safi) BGP_NOTIFY_CEASE_CONFIG_CHANGE); } } + if (peer->status == OpenSent || peer->status == OpenConfirm) { + peer->last_reset = PEER_DOWN_AF_ACTIVATE; + bgp_notify_send(peer, BGP_NOTIFY_CEASE, + BGP_NOTIFY_CEASE_CONFIG_CHANGE); + } } return 0; -- 2.39.5