summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_network.c
diff options
context:
space:
mode:
authorPhilippe Guibert <philippe.guibert@6wind.com>2018-10-11 18:37:01 +0200
committerPhilippe Guibert <philippe.guibert@6wind.com>2018-11-13 15:29:11 +0100
commit0b014ea67566fa01c72ea7a068baaac1a7d3f50b (patch)
tree405d9713ec1c118cae9f933b665362b185427507 /bgpd/bgp_network.c
parentMerge pull request #3310 from adeg/bugfix/bgpd-mplsvpn-route-import-check (diff)
downloadfrr-0b014ea67566fa01c72ea7a068baaac1a7d3f50b.tar.xz
frr-0b014ea67566fa01c72ea7a068baaac1a7d3f50b.zip
bgpd: allow vrf validity and bgp vrf import/export, when zebra is off
if zebra is not started, then vrf identifiers are not available. This prevents import/exportation to be available. This commit permits having import/export available, even when zebra is not started. Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Diffstat (limited to 'bgpd/bgp_network.c')
-rw-r--r--bgpd/bgp_network.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 191b1641b..a310b7ba7 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -708,7 +708,9 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
gai_strerror(ret));
return -1;
}
-
+ if (bgp_option_check(BGP_OPT_NO_ZEBRA) &&
+ bgp->vrf_id != VRF_DEFAULT)
+ return -1;
count = 0;
for (ainfo = ainfo_save; ainfo; ainfo = ainfo->ai_next) {
int sock;