bgpd: honor PEER_FLAG_DISABLE_CONNECTED_CHECK on bgp_scan

When neighbor disable-connected-check was used, bgpd would accept routes
with unconnected nexthop as indended, however those routes would be
invalidated on the next bgp_scan run as that function did not know about
disable-connected-check.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 4076fe4198f36f57d31f646ef8d7ad4ad5986c5e..17586bc816a1ccb08e9a6b312a5c58be4eb4766b 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -453,7 +453,8 @@ bgp_scan (afi_t afi, safi_t safi)
              changed = 0;
              metricchanged = 0;
 
-             if (bi->peer->sort == BGP_PEER_EBGP && bi->peer->ttl == 1)
+             if (bi->peer->sort == BGP_PEER_EBGP && bi->peer->ttl == 1
+                 && !CHECK_FLAG(bi->peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK))
                valid = bgp_nexthop_onlink (afi, bi->attr);
              else
                valid = bgp_nexthop_lookup (afi, bi->peer, bi,