Merge pull request #4072 from chiragshah6/evpn_dev2

lib,bgpd: do not register nexthop 0.0.0.0 to nht
This commit is contained in:
Lou Berger 2019-04-04 10:20:43 -04:00 committed by GitHub
commit 9ffa0d2404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View File

@ -243,8 +243,10 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
if (bgp_route->inst_type == BGP_INSTANCE_TYPE_VIEW) {
SET_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED);
SET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
} else if (!CHECK_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED))
} else if (!CHECK_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED) &&
!is_default_host_route(&bnc->node->p))
register_zebra_rnh(bnc, is_bgp_static_route);
if (pi && pi->nexthop != bnc) {
/* Unlink from existing nexthop cache, if any. This will also
* free

View File

@ -511,6 +511,19 @@ static inline int is_host_route(struct prefix *p)
return 0;
}
static inline int is_default_host_route(struct prefix *p)
{
if (p->family == AF_INET) {
return (p->u.prefix4.s_addr == INADDR_ANY &&
p->prefixlen == IPV4_MAX_BITLEN);
} else if (p->family == AF_INET6) {
return ((!memcmp(&p->u.prefix6, &in6addr_any,
sizeof(struct in6_addr))) &&
p->prefixlen == IPV6_MAX_BITLEN);
}
return 0;
}
#ifdef __cplusplus
}
#endif