From: vivek <vivek@cumulusnetworks.com>
Date: Thu, 14 Apr 2016 01:41:58 +0000 (-0700)
Subject: BGP: Register with correct VRF id for redistribution
X-Git-Tag: frr-2.0-rc1~967^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9585bba7647707921c9d4b05ca496b781c902b8b;p=matthieu%2Ffrr.git

BGP: Register with correct VRF id for redistribution

When doing a redistribution re-registration upon route-map
updates, the correct VRF id was not being used. Fixed.

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

Ticket: CM-10311
Reviewed By: Trivial
Testing Done: Manual - verified failed scenario
---

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 878c755f8c..d8427307ce 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1859,9 +1859,9 @@ bgp_redistribute_resend (struct bgp *bgp, afi_t afi, int type, u_short instance)
 
   /* Send distribute add message to zebra. */
   zebra_redistribute_send (ZEBRA_REDISTRIBUTE_DELETE, zclient, afi, type,
-                           instance, VRF_DEFAULT);
+                           instance, bgp->vrf_id);
   zebra_redistribute_send (ZEBRA_REDISTRIBUTE_ADD, zclient, afi, type,
-                           instance, VRF_DEFAULT);
+                           instance, bgp->vrf_id);
 
   return 0;
 }