From: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
Date: Wed, 21 Feb 2018 08:36:58 +0000 (-0800)
Subject: Merge branch 'master' into evpn-bug-fixes
X-Git-Tag: frr-5.0-dev~191^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f487dcaf74c9bd7a716a749d15281d5b92d363d4;p=matthieu%2Ffrr.git

Merge branch 'master' into evpn-bug-fixes
---

f487dcaf74c9bd7a716a749d15281d5b92d363d4
diff --cc bgpd/bgp_evpn.c
index 9b1ff8f6a9,ec8e2907a6..fbb2ff101d
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@@ -3299,8 -3274,20 +3299,20 @@@ void bgp_evpn_advertise_type5_routes(st
  		 * TODO: Support for AddPath for EVPN.
  		 */
  		for (ri = rn->info; ri; ri = ri->next) {
 -			if (CHECK_FLAG(ri->flags, BGP_INFO_SELECTED)) {
 +			if (CHECK_FLAG(ri->flags, BGP_INFO_SELECTED) &&
 +			    (!ri->extra || !ri->extra->parent)) {
+ 
+ 				/* apply the route-map */
+ 				if (bgp_vrf->adv_cmd_rmap[afi][safi].map) {
+ 					int ret = 0;
+ 
+ 					ret =
+ 						route_map_apply(
+ 							bgp_vrf->adv_cmd_rmap[afi][safi].map,
+ 							&rn->p, RMAP_BGP, ri);
+ 					if (ret == RMAP_DENYMATCH)
+ 						continue;
+ 				}
 -
  				bgp_evpn_advertise_type5_route(bgp_vrf, &rn->p,
  							       ri->attr,
  							       afi, safi);