summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2021-05-09 21:28:36 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2021-05-09 21:28:36 +0200
commitd9083050c8b9e300b091a8591b59f0810304e509 (patch)
treeb7d20d8e23e26ea8daede1445c585b5c781a3bea /bgpd
parentMerge pull request #8581 from qlyoung/bgp-fix-last-reset-buffer-size (diff)
downloadfrr-d9083050c8b9e300b091a8591b59f0810304e509.tar.xz
frr-d9083050c8b9e300b091a8591b59f0810304e509.zip
Revert "bgpd: vrf route leaking, fix vrf redistribute"
This reverts commit 6b2433c63f7fd3027cea8e06ca45f85bd3eea6f2.
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_zebra.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 288c2851b..c300fc7b1 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1700,6 +1700,9 @@ int bgp_redistribute_set(struct bgp *bgp, afi_t afi, int type,
redist_add_instance(&zclient->mi_redist[afi][type], instance);
} else {
+ if (vrf_bitmap_check(zclient->redist[afi][type], bgp->vrf_id))
+ return CMD_WARNING;
+
#ifdef ENABLE_BGP_VNC
if (EVPN_ENABLED(bgp) && type == ZEBRA_ROUTE_VNC_DIRECT) {
vnc_export_bgp_enable(