diff options
| author | hasso <hasso> | 2005-02-02 14:50:11 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-02-02 14:50:11 +0000 |
| commit | 6ffd2079596c232856dda0d56fddd9610e8d61fe (patch) | |
| tree | d5c4906cbfb4af98a8c73be667a9ab2369a6c64b /bgpd/bgp_route.c | |
| parent | 93406d87e68a0e9cf5ce0240461395cd59c143b6 (diff) | |
* bgp_route.c, bgp_vty.c, bgp_zebra.c, bgpd.[ch]: "enforce-multihop"
-> "disable-connected-check".
[merge from GNU Zebra]
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 2453cffc..a3be9f0d 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1726,7 +1726,7 @@ bgp_update_main (struct peer *peer, struct prefix *p, struct attr *attr, discard it. */ if (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl == 1 && ! bgp_nexthop_check_ebgp (afi, &new_attr) - && ! CHECK_FLAG (peer->flags, PEER_FLAG_ENFORCE_MULTIHOP)) + && ! CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK)) { reason = "non-connected next-hop;"; goto filtered; @@ -1852,7 +1852,7 @@ bgp_update_main (struct peer *peer, struct prefix *p, struct attr *attr, && safi == SAFI_UNICAST && (peer_sort (peer) == BGP_PEER_IBGP || (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl != 1) - || CHECK_FLAG (peer->flags, PEER_FLAG_ENFORCE_MULTIHOP))) + || CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK))) { if (bgp_nexthop_lookup (afi, peer, ri, NULL, NULL)) SET_FLAG (ri->flags, BGP_INFO_VALID); @@ -1899,7 +1899,7 @@ bgp_update_main (struct peer *peer, struct prefix *p, struct attr *attr, && safi == SAFI_UNICAST && (peer_sort (peer) == BGP_PEER_IBGP || (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl != 1) - || CHECK_FLAG (peer->flags, PEER_FLAG_ENFORCE_MULTIHOP))) + || CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK))) { if (bgp_nexthop_lookup (afi, peer, new, NULL, NULL)) SET_FLAG (new->flags, BGP_INFO_VALID); |