From: Christian Franke Date: Thu, 11 Apr 2013 08:24:30 +0000 (+0000) Subject: bgpd: honor PEER_FLAG_DISABLE_CONNECTED_CHECK on bgp_scan X-Git-Tag: frr-2.0-rc1~1653 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a0f6ce5b41dcfa059074d72c8fc61896d3e996a9;p=mirror_frr.git 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 Signed-off-by: David Lamparter --- diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 4076fe419..17586bc81 100644 --- 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,