diff options
| author | Russ White <russ@riw.us> | 2021-05-11 13:28:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 13:28:42 +0200 |
| commit | 6099bb989dc97a199cb0c9ee95813a72a5550b1e (patch) | |
| tree | c44da021633218d3b9e2b3cb724cbffafbbab85c /bgpd/bgp_main.c | |
| parent | Merge pull request #8406 from adharkar/frr-es_rd (diff) | |
| parent | bgpd: deregister bgp instance from zebra when vrf is deleted (diff) | |
| download | frr-6099bb989dc97a199cb0c9ee95813a72a5550b1e.tar.xz frr-6099bb989dc97a199cb0c9ee95813a72a5550b1e.zip | |
Merge pull request #8650 from idryzhov/bgp-fix-redist
bgpd: fix redistribution in vrf
Diffstat (limited to 'bgpd/bgp_main.c')
| -rw-r--r-- | bgpd/bgp_main.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index ddc5c61ee..d545becde 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -314,9 +314,6 @@ static int bgp_vrf_enable(struct vrf *vrf) bgp_vrf_link(bgp, vrf); bgp_handle_socket(bgp, vrf, old_vrf_id, true); - /* Update any redistribution if vrf_id changed */ - if (old_vrf_id != bgp->vrf_id) - bgp_redistribute_redo(bgp); bgp_instance_up(bgp); vpn_leak_zebra_vrf_label_update(bgp, AFI_IP); vpn_leak_zebra_vrf_label_update(bgp, AFI_IP6); @@ -336,7 +333,6 @@ static int bgp_vrf_enable(struct vrf *vrf) static int bgp_vrf_disable(struct vrf *vrf) { struct bgp *bgp; - vrf_id_t old_vrf_id; if (vrf->vrf_id == VRF_DEFAULT) return 0; @@ -358,15 +354,11 @@ static int bgp_vrf_disable(struct vrf *vrf) vpn_leak_prechange(BGP_VPN_POLICY_DIR_FROMVPN, AFI_IP6, bgp_get_default(), bgp); - old_vrf_id = bgp->vrf_id; bgp_handle_socket(bgp, vrf, VRF_UNKNOWN, false); /* We have instance configured, unlink from VRF and make it * "down". */ - bgp_vrf_unlink(bgp, vrf); - /* Delete any redistribute vrf bitmaps if the vrf_id changed */ - if (old_vrf_id != bgp->vrf_id) - bgp_unset_redist_vrf_bitmaps(bgp, old_vrf_id); bgp_instance_down(bgp); + bgp_vrf_unlink(bgp, vrf); } /* Note: This is a callback, the VRF will be deleted by the caller. */ |