From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 18 Oct 2017 14:19:58 +0000 (-0400)
Subject: bgpd: Allow 'match peer' for all route-map types
X-Git-Tag: frr-4.0-dev~178^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7aacfd1b4633e47ef71fff34cf90bbad1e16f8fb;p=matthieu%2Ffrr.git

bgpd: Allow 'match peer' for all route-map types

There are multiple places that we use route-maps in bgp
There is no need to limit the route-map 'match peer ...' command
to just import and export route-map types.  I see need for
using this in table-maps as well.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 75688e55c2..f26498fb03 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -249,10 +249,6 @@ static route_map_result_t route_match_peer(void *rule, struct prefix *prefix,
 		su = &pc->su;
 		peer = ((struct bgp_info *)object)->peer;
 
-		if (!CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IMPORT)
-		    && !CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_EXPORT))
-			return RMAP_NOMATCH;
-
 		if (pc->interface) {
 			if (!peer->conf_if)
 				return RMAP_NOMATCH;