proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:09:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2325 from donaldsharp/aggregate

Browse Source 
bgpd: Add null0 route back for aggregate-address route created.
This commit is contained in:
Renato Westphal 2018-05-31 12:05:48 -03:00 committed by GitHub
commit d8f638e09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_zebra.c
View File

@ -1235,13 +1235,6 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
tag = info->attr->tag; tag = info->attr->tag;
/*
* When we create an aggregate route we must also install a
* Null0 route in the RIB
*/
if (info->sub_type == BGP_ROUTE_AGGREGATE)
zapi_route_set_blackhole(&api, BLACKHOLE_NULL);
/* If the route's source is EVPN, flag as such. */ /* If the route's source is EVPN, flag as such. */
is_evpn = is_route_parent_evpn(info); is_evpn = is_route_parent_evpn(info);
if (is_evpn) if (is_evpn)
@ -1323,7 +1316,7 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
&mpinfo_cp->attr->nexthop, &mpinfo_cp->attr->nexthop,
mpinfo_cp->attr, is_evpn, api_nh); mpinfo_cp->attr, is_evpn, api_nh);
} else { } else {
ifindex_t ifindex; ifindex_t ifindex = IFINDEX_INTERNAL;
struct in6_addr *nexthop; struct in6_addr *nexthop;
if (bgp->table_map[afi][safi].name) { if (bgp->table_map[afi][safi].name) {
@ -1381,7 +1374,14 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
if (has_valid_label && !(CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE))) if (has_valid_label && !(CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE)))
SET_FLAG(api.message, ZAPI_MESSAGE_LABEL); SET_FLAG(api.message, ZAPI_MESSAGE_LABEL);
if (info->sub_type != BGP_ROUTE_AGGREGATE) /*
* When we create an aggregate route we must also
* install a Null0 route in the RIB, so overwrite
* what was written into api with a blackhole route
*/
if (info->sub_type == BGP_ROUTE_AGGREGATE)
zapi_route_set_blackhole(&api, BLACKHOLE_NULL);
else
api.nexthop_num = valid_nh_count; api.nexthop_num = valid_nh_count;
SET_FLAG(api.message, ZAPI_MESSAGE_METRIC); SET_FLAG(api.message, ZAPI_MESSAGE_METRIC);