X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=9d5837f99053b43e4993a5325c48675820fbc9e1;hp=284bab74c576bfead8dd956e846f1374adfcf983;hb=5029350be5d61484970eb41a85bbc809698adaff;hpb=9a5e289493541c80890700b03b93ba5a1ba91905

diff --git a/src/net_socket.c b/src/net_socket.c
index 284bab74..9d5837f9 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -442,6 +442,7 @@ connect:
 	if(!proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 	} else if(proxytype == PROXY_EXEC) {
+		c->status.proxy_passed = true;
 		do_outgoing_pipe(c, proxyhost);
 	} else {
 		proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
@@ -471,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);
+			}
 		}
 	}