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

Merge pull request #2708 from ton31337/feature/default-originate_apply_route-maps

Browse Source 
bgpd: Set attributes according route-maps if applied for default-originate
This commit is contained in:
Russ White 2018-07-27 09:05:43 -04:00 committed by GitHub
commit 298de6ef18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bgpd/bgp_updgrp_adv.c
View File

@ -662,8 +662,7 @@ void subgroup_announce_route(struct update_subgroup *subgrp)
void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw) void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
{ {
struct bgp *bgp; struct bgp *bgp;
struct attr attr; struct bgp_info *info, init_info;
struct aspath *aspath;
struct prefix p; struct prefix p;
struct peer *from; struct peer *from;
struct bgp_node *rn; struct bgp_node *rn;
@ -686,48 +685,50 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
bgp = peer->bgp; bgp = peer->bgp;
from = bgp->peer_self; from = bgp->peer_self;
bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); init_info.attr = NULL;
aspath = attr.aspath; info = &init_info;
attr.local_pref = bgp->default_local_pref;
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
p.family = afi2family(afi); p.family = afi2family(afi);
p.prefixlen = 0; p.prefixlen = 0;
if ((afi == AFI_IP6) || peer_cap_enhe(peer, afi, safi)) {
/* IPv6 global nexthop must be included. */
attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL;
/* If the peer is on shared nextwork and we have link-local
nexthop set it. */
if (peer->shared_network
&& !IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_local))
attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
}
if (peer->default_rmap[afi][safi].name) { if (peer->default_rmap[afi][safi].name) {
SET_FLAG(bgp->peer_self->rmap_type, PEER_RMAP_TYPE_DEFAULT); SET_FLAG(bgp->peer_self->rmap_type, PEER_RMAP_TYPE_DEFAULT);
for (rn = bgp_table_top(bgp->rib[afi][safi]); rn; for (rn = bgp_table_top(bgp->rib[afi][safi]); rn;
rn = bgp_route_next(rn)) { rn = bgp_route_next(rn)) {
for (ri = rn->info; ri; ri = ri->next) { for (ri = rn->info; ri; ri = ri->next) {
struct attr dummy_attr; struct bgp_info tmp_info;
struct bgp_info info;
/* Provide dummy so the route-map can't modify tmp_info.peer = ri->peer;
* the attributes */ tmp_info.attr = ri->attr;
bgp_attr_dup(&dummy_attr, ri->attr);
info.peer = ri->peer; /* Reset attributes every time to avoid \
info.attr = &dummy_attr; * unexpected as-path prepends */
bgp_attr_default_set(tmp_info.attr,
BGP_ORIGIN_IGP);
if ((afi == AFI_IP6)
|| peer_cap_enhe(peer, afi, safi)) {
/* IPv6 global nexthop must be included.
*/
tmp_info.attr->mp_nexthop_len =
BGP_ATTR_NHLEN_IPV6_GLOBAL;
/* If the peer is on shared nextwork and
* we have link-local nexthop set it. */
if (peer->shared_network
&& !IN6_IS_ADDR_UNSPECIFIED(
&peer->nexthop.v6_local))
tmp_info.attr->mp_nexthop_len =
BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
}
ret = route_map_apply( ret = route_map_apply(
peer->default_rmap[afi][safi].map, peer->default_rmap[afi][safi].map,
&rn->p, RMAP_BGP, &info); &rn->p, RMAP_BGP, &tmp_info);
info = &tmp_info;
/* The route map might have set attributes. If
* we don't flush them
* here, they will be leaked. */
bgp_attr_flush(&dummy_attr);
if (ret != RMAP_DENYMATCH) if (ret != RMAP_DENYMATCH)
break; break;
} }
@ -749,12 +750,13 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
SUBGRP_STATUS_DEFAULT_ORIGINATE)) { SUBGRP_STATUS_DEFAULT_ORIGINATE)) {
if (bgp_flag_check(bgp, BGP_FLAG_GRACEFUL_SHUTDOWN)) { if (bgp_flag_check(bgp, BGP_FLAG_GRACEFUL_SHUTDOWN)) {
bgp_attr_add_gshut_community(&attr); bgp_attr_add_gshut_community(info->attr);
} }
SET_FLAG(subgrp->sflags, SET_FLAG(subgrp->sflags,
SUBGRP_STATUS_DEFAULT_ORIGINATE); SUBGRP_STATUS_DEFAULT_ORIGINATE);
subgroup_default_update_packet(subgrp, &attr, from); subgroup_default_update_packet(subgrp, info->attr,
from);
/* The 'neighbor x.x.x.x default-originate' default will /* The 'neighbor x.x.x.x default-originate' default will
* act as an * act as an
@ -774,8 +776,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE); BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE);
} }
} }
aspath_unintern(&aspath);
} }
/* /*