From: vivek <vivek@cumulusnetworks.com>
Date: Thu, 28 Feb 2019 11:18:10 +0000 (+0000)
Subject: bgpd: Remove route sub-type checks in route-leak withdraw
X-Git-Tag: 7.1_pulled~171^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=abf386be5edbd3ca2ce13a2f275edc1625f0993a;p=matthieu%2Ffrr.git

bgpd: Remove route sub-type checks in route-leak withdraw

The check on which routes are exportable is a superset, so remove the
route sub-type checks. Also, this change is needed to handle EVPN-imported
leaked routes correctly.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 1e2706f152..39b0e2f1c8 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -901,15 +901,6 @@ void vpn_leak_from_vrf_withdraw(struct bgp *bgp_vpn,		/* to */
 			path_vrf->type, path_vrf->sub_type);
 	}
 
-	if (path_vrf->sub_type != BGP_ROUTE_NORMAL
-	    && path_vrf->sub_type != BGP_ROUTE_STATIC
-	    && path_vrf->sub_type != BGP_ROUTE_REDISTRIBUTE) {
-
-		if (debug)
-			zlog_debug("%s: wrong sub_type %d", __func__,
-				   path_vrf->sub_type);
-		return;
-	}
 	if (!bgp_vpn)
 		return;