bgpd: [GR] Start select deferral timer if startup timer is running

Problem:
if -K option is not specified then BGP was not starting the select
deferral timer for any of the GR supported afi-safis though
startup timer was running.

Fix:
Modified the check to skip starting select-deferral timer
only if -K option is not specified in daemons file and t_startup
timer is not running.

Signed-off-by: Pooja Jagadeesh Doijode <[email protected]>

Author: Pdoijode

bgpd/bgpd.c

@@ -9080,12 +9080,13 @@ static int peer_unshut_after_cfg(struct bgp *bgp)
 		 bgp_in_graceful_restart(), global_gr_mode, gr_cfgd_at_nbr);
 
 	/*
-	 * If BGP is not in GR
+	 * If BGP is not in GR and startup timer is not running
 	 * OR
 	 * If this VRF doesn't have GR configured at global and neighbor level
 	 * then return
 	 */
-	if (!bgp_in_graceful_restart() || (global_gr_mode != GLOBAL_GR && !gr_cfgd_at_nbr))
+	if ((!bgp_in_graceful_restart() && !bgp->t_startup) ||
+	    (global_gr_mode != GLOBAL_GR && !gr_cfgd_at_nbr))
 		return 0;
 
 	/*