diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2019-11-27 09:37:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 09:37:11 +0100 |
| commit | 3e1cc63a5fb4ed5241868c235df05f51762ec3bb (patch) | |
| tree | 97b5b53707e9e81d6958b728faaa493965be5839 /bgpd | |
| parent | Merge pull request #5284 from sworleys/PBR-Add-NH-Table-2 (diff) | |
| parent | bgpd: Do not perform "connected" check for EVPN nexthop (diff) | |
| download | frr-3e1cc63a5fb4ed5241868c235df05f51762ec3bb.tar.xz frr-3e1cc63a5fb4ed5241868c235df05f51762ec3bb.zip | |
Merge pull request #5419 from adharkar/frr-master-nh_connected
bgpd: Do not perform "connected" check for EVPN nexthop
Diffstat (limited to '')
| -rw-r--r-- | bgpd/bgp_route.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index adc4a32d4..7f258932b 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -3454,7 +3454,8 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id, && (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST)) || (safi == SAFI_EVPN && bgp_evpn_is_prefix_nht_supported(p))) { - if (peer->sort == BGP_PEER_EBGP && peer->ttl == 1 + if (safi != SAFI_EVPN + && peer->sort == BGP_PEER_EBGP && peer->ttl == 1 && !CHECK_FLAG(peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK) && !bgp_flag_check( @@ -3596,7 +3597,8 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id, if (((afi == AFI_IP || afi == AFI_IP6) && (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST)) || (safi == SAFI_EVPN && bgp_evpn_is_prefix_nht_supported(p))) { - if (peer->sort == BGP_PEER_EBGP && peer->ttl == 1 + if (safi != SAFI_EVPN + && peer->sort == BGP_PEER_EBGP && peer->ttl == 1 && !CHECK_FLAG(peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK) && !bgp_flag_check(bgp, BGP_FLAG_DISABLE_NH_CONNECTED_CHK)) |