X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=bc599e8ad927239c316b712efe64096b9a8edc72;hb=4ea5d218c5c8e5739071bc6e57cf8404db5323ef;hp=80fe84cac2876aff23b5e7826a5df7fdae3bb84a;hpb=2a18ac20efd8ed3e1fd76f11f6f816e77c099e47;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index 80fe84ca..bc599e8a 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -405,18 +405,18 @@ begin:
 
 	logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname);
 
-	if(!proxytype) {
+	if(!mesh->proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
-	} else if(proxytype == PROXY_EXEC) {
-		do_outgoing_pipe(c, proxyhost);
+	} else if(mesh->proxytype == PROXY_EXEC) {
+		do_outgoing_pipe(c, mesh->proxyhost);
 	} else {
-		proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
+		proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
 		if(!proxyai) {
 			free_connection(c);
 			goto begin;
 		}
-		logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
+		logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", mesh->proxyhost, mesh->proxyport);
 		c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
 	}
@@ -431,7 +431,7 @@ begin:
 	fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
 
-	if(proxytype != PROXY_EXEC) {
+	if(mesh->proxytype != PROXY_EXEC) {
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
 		int option = 1;
 		if(c->address.sa.sa_family == AF_INET6)
@@ -443,9 +443,9 @@ begin:
 
 	/* Connect */
 
-	if(!proxytype) {
+	if(!mesh->proxytype) {
 		result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
-	} else if(proxytype == PROXY_EXEC) {
+	} else if(mesh->proxytype == PROXY_EXEC) {
 		result = 0;
 	} else {
 		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);