Revert "Use metric for default-originate with route-map if applied"

This commit is contained in:
Russ White 2018-07-23 17:08:24 -04:00 committed by GitHub
parent 4dbfa73b17
commit db711a8fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -690,7 +690,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
aspath = attr.aspath;
attr.local_pref = bgp->default_local_pref;
attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC);
memset(&p, 0, sizeof(p));
p.family = afi2family(afi);
@ -725,8 +724,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
peer->default_rmap[afi][safi].map,
&rn->p, RMAP_BGP, &info);
attr.med = info.attr->med;
/* The route map might have set attributes. If
* we don't flush them
* here, they will be leaked. */