From: Philippe Guibert Date: Tue, 6 Mar 2018 17:10:27 +0000 (+0100) Subject: bgpd: permit bgp vrf socket creation on some cases X-Git-Tag: frr-5.0-dev~188^2~1 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=85f87e0e3ebffaf88ba90ef31e931ad6e57e0df3;p=matthieu%2Ffrr.git bgpd: permit bgp vrf socket creation on some cases When VRF is not yet available at startup, the check for main socket presence must be done. As the main socket creation is made in a separate place from vrf socket for netns, ths main socket creation must not be prevented when a BGP VRF relies on vrf lite mechanism. Signed-off-by: Philippe Guibert --- diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index c06339aad9..e8ea2b717f 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -108,7 +108,8 @@ static int bgp_check_main_socket(bool create, struct bgp *bgp) struct listnode *bgpnode, *nbgpnode; struct bgp *bgp_temp; - if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF) + if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF && + vrf_is_mapped_on_netns(bgp->vrf_id)) return 0; if (create == true) { if (bgp_server_main_created)