From: Guus Sliepen Date: Sun, 30 Jul 2017 14:14:14 +0000 (+0200) Subject: Don't try to bind Proxy = exec sockets to an address. X-Git-Tag: release-1.0.32~1 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=5029350be5d61484970eb41a85bbc809698adaff;p=tinc Don't try to bind Proxy = exec sockets to an address. --- diff --git a/src/net_socket.c b/src/net_socket.c index 60dd81da..9d5837f9 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -472,32 +472,32 @@ connect: #endif bind_to_interface(c->socket); - } - int b = -1; + int b = -1; - for(int i = 0; i < listen_sockets; i++) { - if(listen_socket[i].sa.sa.sa_family == c->address.sa.sa_family) { - if(b == -1) { - b = i; - } else { - b = -1; - break; + for(int i = 0; i < listen_sockets; i++) { + if(listen_socket[i].sa.sa.sa_family == c->address.sa.sa_family) { + if(b == -1) { + b = i; + } else { + b = -1; + break; + } } } - } - if(b != -1) { - sockaddr_t sa = listen_socket[b].sa; - if(sa.sa.sa_family == AF_INET) - sa.in.sin_port = 0; - else if(sa.sa.sa_family == AF_INET6) - sa.in6.sin6_port = 0; - - if(bind(c->socket, &sa.sa, SALEN(sa.sa))) { - char *addrstr = sockaddr2hostname(&sa); - logger(LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno)); - free(addrstr); + if(b != -1) { + sockaddr_t sa = listen_socket[b].sa; + if(sa.sa.sa_family == AF_INET) + sa.in.sin_port = 0; + else if(sa.sa.sa_family == AF_INET6) + sa.in6.sin6_port = 0; + + if(bind(c->socket, &sa.sa, SALEN(sa.sa))) { + char *addrstr = sockaddr2hostname(&sa); + logger(LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno)); + free(addrstr); + } } }