commit c9cc52af9edf0f23a1434c944812064de220a7bf
author Timo Teräs <timo.teras@iki.fi> Wed Oct 19 16:02:33 2016 +0300
committer Paul Jakma <paul@quagga.net> Mon Jan 23 18:51:51 2017 +0000
tree 0d74b412ef0e02ebbcfdadc21dcf3a8067369073
parent b41bb62e039454f53e54959b2c3f7eea816e6422

bgpd: honor disable-connected-check option with next hop tracking

Make bgpd ignore connected state again if configured to do so.

bgpd/bgp_fsm.c

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 2e07d93..7da63ea 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -716,7 +716,8 @@
     }
 
   /* Register to be notified on peer up */
-  if ((peer->ttl == 1) || (peer->gtsm_hops == 1))
+  if ((peer->ttl == 1 || peer->gtsm_hops == 1) &&
+      ! CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK))
     connected = 1;
 
   bgp_find_or_add_nexthop(family2afi(peer->su.sa.sa_family), NULL, peer,