Merge pull request #4970 from shikenghua/prefer_global

bgpd: prefer-global command not working on IPv4 peers
This commit is contained in:
Russ White 2019-09-17 07:33:05 -04:00 committed by GitHub
commit 1fcc189f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2748,10 +2748,8 @@ route_set_ipv6_nexthop_prefer_global(void *rule, const struct prefix *prefix,
path = object;
peer = path->peer;
if ((CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IN)
|| CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IMPORT))
&& peer->su_remote
&& sockunion_family(peer->su_remote) == AF_INET6) {
if (CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IN)
|| CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IMPORT)) {
/* Set next hop preference to global */
path->attr->mp_nexthop_prefer_global = true;
SET_FLAG(path->attr->rmap_change_flags,