]> git.proxmox.com Git - mirror_frr.git/blobdiff - bgpd/bgp_network.c
*: remove the configuration lock from all daemons
[mirror_frr.git] / bgpd / bgp_network.c
index d56fdd75cee62dcfed059eb89995c5cdd5d63cbf..e15b8f4ec38c356d7a418872e23fdc0d3d81bf47 100644 (file)
@@ -406,7 +406,6 @@ static int bgp_accept(struct thread *thread)
 
        peer = peer_create(&su, peer1->conf_if, peer1->bgp, peer1->local_as,
                           peer1->as, peer1->as_type, 0, 0, NULL);
-       peer->su = su;
        hash_release(peer->bgp->peerhash, peer);
        hash_get(peer->bgp->peerhash, peer, hash_alloc_intern);
 
@@ -709,7 +708,11 @@ 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) {
+               freeaddrinfo(ainfo_save);
+               return -1;
+       }
        count = 0;
        for (ainfo = ainfo_save; ainfo; ainfo = ainfo->ai_next) {
                int sock;