diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-10 02:39:35 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-10 02:39:35 +0200 |
| commit | a1b4f854b0162077b12d8dc7ad4b9e85ba7f458c (patch) | |
| tree | 96058bfc2637f7bd261b600cf279e441a838d7e7 /bgpd | |
| parent | Merge pull request #480 from donaldsharp/agentx (diff) | |
| parent | Merge pull request #486 from LabNConsulting/working/3.0/patch/issue483 (diff) | |
| download | frr-a1b4f854b0162077b12d8dc7ad4b9e85ba7f458c.tar.xz frr-a1b4f854b0162077b12d8dc7ad4b9e85ba7f458c.zip | |
Merge remote-tracking branch 'origin/stable/3.0'
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgpd.c | 9 | ||||
| -rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 1c73fb940..955ed2ab5 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -2955,9 +2955,12 @@ bgp_create (as_t *as, const char *name, enum bgp_instance_type inst_type) bgp->as = *as; #if ENABLE_BGP_VNC - bgp->rfapi = bgp_rfapi_new(bgp); - assert(bgp->rfapi); - assert(bgp->rfapi_cfg); + if (inst_type != BGP_INSTANCE_TYPE_VRF) + { + bgp->rfapi = bgp_rfapi_new(bgp); + assert(bgp->rfapi); + assert(bgp->rfapi_cfg); + } #endif /* ENABLE_BGP_VNC */ if (name) diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 5ddccc906..4f4656590 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -4281,6 +4281,8 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) int write = 0; afi_t afi; int type; + if (bgp->rfapi == NULL || hc == NULL) + return write; vty_out (vty, "!%s", VTY_NEWLINE); for (ALL_LIST_ELEMENTS (hc->nve_groups_sequential, node, nnode, rfg)) |