diff options
| author | Russ White <russ@riw.us> | 2018-07-10 22:46:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 22:46:00 +0200 |
| commit | 96257ced27478b46b1f488eae0c843ca2ff2906f (patch) | |
| tree | a15992023398c29886d0e68221fd7ffad5f6446a /bgpd/bgp_vty.c | |
| parent | Merge pull request #2553 from opensourcerouting/release_proc (diff) | |
| parent | bgpd: fix NULL dereference in vrf-vpn leak config if before default instance (diff) | |
| download | frr-96257ced27478b46b1f488eae0c843ca2ff2906f.tar.xz frr-96257ced27478b46b1f488eae0c843ca2ff2906f.zip | |
Merge pull request #2591 from LabNConsulting/working/master/bgp-delayed-default-instance
bgpd: fix NULL dereference in vrf-vpn leak config if before default instance
Diffstat (limited to 'bgpd/bgp_vty.c')
| -rw-r--r-- | bgpd/bgp_vty.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 641628d4b..e9d9a846a 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -928,6 +928,14 @@ DEFUN_NOSH (router_bgp, return CMD_WARNING_CONFIG_FAILED; } + /* + * If we just instantiated the default instance, complete + * any pending VRF-VPN leaking that was configured via + * earlier "router bgp X vrf FOO" blocks. + */ + if (inst_type == BGP_INSTANCE_TYPE_DEFAULT) + vpn_leak_postchange_all(); + /* Pending: handle when user tries to change a view to vrf n vv. */ } |