From 9a5be111916cecf6b4c9c680c52634271c4bf9cc Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Sat, 18 Jan 2025 14:54:20 +0200 Subject: [PATCH] bgpd: Set last reset `No AFI/SAFI activated for peer` after we do defaults Move checking if the peer is active only after we apply defaults for address families. If the family got activated after applying the defaults we should reset last_reset reason. Signed-off-by: Donatas Abraitis --- bgpd/bgpd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index c2254ae791..db74dd68d0 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -2026,8 +2026,11 @@ struct peer *peer_create(union sockunion *su, const char *conf_if, if (bgp->autoshutdown) peer_flag_set(peer, PEER_FLAG_SHUTDOWN); /* Set up peer's events and timers. */ - else if (!active && peer_active(peer->connection)) + else if (!active && peer_active(peer->connection)) { + if (peer->last_reset == PEER_DOWN_NOAFI_ACTIVATED) + peer->last_reset = 0; bgp_timer_set(peer->connection); + } bgp_peer_gr_flags_update(peer); BGP_GR_ROUTER_DETECT_AND_SEND_CAPABILITY_TO_ZEBRA(bgp, bgp->peer); -- 2.39.5