From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Wed, 13 Jun 2018 09:56:35 +0000 (+0200)
Subject: bgpd: do not add default route for flowspec for each FS entry
X-Git-Tag: frr-6.1-dev~217^2~15
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1a1f4a4c69f5ea36a72a6c824fe7c0f797d41649;p=matthieu%2Ffrr.git

bgpd: do not add default route for flowspec for each FS entry

Because the Flowspec entries are parsed first, then injected to Zebra,
there are cases where the install feedback from zebra is not received.
This leads to unnecessary add route events, whereas one should be
enough.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c
index bf09a999d4..779bf2de6d 100644
--- a/bgpd/bgp_pbr.c
+++ b/bgpd/bgp_pbr.c
@@ -1393,7 +1393,7 @@ static void bgp_pbr_policyroute_add_to_zebra(struct bgp *bgp,
 	 * it will be suppressed subsequently
 	 */
 	/* ip rule add */
-	if (!bpa->installed) {
+	if (!bpa->installed && !bpa->install_in_progress) {
 		bgp_send_pbr_rule_action(bpa, true);
 		bgp_zebra_announce_default(bgp, nh,
 					   AFI_IP, bpa->table_id, true);