X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=fbafc22bb86cd34dcc9b2e298fc84a7a4cbdfb50;hb=3d5dd72aa41f162fd5d4d6dd13f46c0fca5a14a9;hp=a2bc5b9301e98bf3efadd820fc9ecd5af1ca9c10;hpb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index a2bc5b93..fbafc22b 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -23,6 +23,7 @@
 #include "connection.h"
 #include "list.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -40,10 +41,6 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 int max_connection_burst = 100;
 
-listen_socket_t listen_socket[MAXSOCKETS];
-int listen_sockets;
-list_t *outgoing_list = NULL;
-
 /* Setup sockets */
 
 static void configure_tcp(connection_t *c) {
@@ -77,8 +74,8 @@ static void configure_tcp(connection_t *c) {
 static bool bind_to_address(connection_t *c) {
 	int s = -1;
 
-	for(int i = 0; i < listen_sockets && listen_socket[i].bindto; i++) {
-		if(listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
+	for(int i = 0; i < mesh->listen_sockets && mesh->listen_socket[i].bindto; i++) {
+		if(mesh->listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
 			continue;
 		if(s >= 0)
 			return false;
@@ -88,7 +85,7 @@ static bool bind_to_address(connection_t *c) {
 	if(s < 0)
 		return false;
 
-	sockaddr_t sa = listen_socket[s].sa;
+	sockaddr_t sa = mesh->listen_socket[s].sa;
 	if(sa.sa.sa_family == AF_INET)
 		sa.in.sin_port = 0;
 	else if(sa.sa.sa_family == AF_INET6)
@@ -129,25 +126,6 @@ int setup_listen_socket(const sockaddr_t *sa) {
 		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
 #endif
 
-	if(get_config_string
-	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-		struct ifreq ifr;
-
-		memset(&ifr, 0, sizeof ifr);
-		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
-
-		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) {
-			closesocket(nfd);
-			logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface,
-				   strerror(sockerrno));
-			return -1;
-		}
-#else
-		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface");
-#endif
-	}
-
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
 		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
@@ -217,12 +195,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #endif
 
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
-	if(myself->options & OPTION_PMTU_DISCOVERY) {
+	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = IP_PMTUDISC_DO;
 		setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
 #elif defined(IPPROTO_IP) && defined(IP_DONTFRAGMENT)
-	if(myself->options & OPTION_PMTU_DISCOVERY) {
+	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
 	}
@@ -231,12 +209,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #endif
 
 #if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
-	if(myself->options & OPTION_PMTU_DISCOVERY) {
+	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = IPV6_PMTUDISC_DO;
 		setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
 #elif defined(IPPROTO_IPV6) && defined(IPV6_DONTFRAG)
-	if(myself->options & OPTION_PMTU_DISCOVERY) {
+	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
 	}
@@ -311,7 +289,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 	setenv("REMOTEADDRESS", host, true);
 	setenv("REMOTEPORT", port, true);
 	setenv("NODE", c->name, true);
-	setenv("NAME", myself->name, true);
+	setenv("NAME", mesh->self->name, true);
 
 	int result = system(command);
 	if(result < 0)
@@ -394,6 +372,7 @@ begin:
 			port = xstrdup(space + 1);
 			*space = 0;
 		} else {
+			// TODO: Only allow Address statements?
 			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port))
 				port = xstrdup("655");
 		}
@@ -423,18 +402,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);
 	}
@@ -449,7 +428,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)
@@ -461,9 +440,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);
@@ -481,10 +460,7 @@ begin:
 
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->name);
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-	c->outmaclength = myself->connection->outmaclength;
-	c->outcompression = myself->connection->outcompression;
+	c->outcompression = mesh->self->connection->outcompression;
 	c->last_ping_time = now.tv_sec;
 
 	connection_add(c);
@@ -628,10 +604,7 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	c = new_connection();
 	c->name = xstrdup("<unknown>");
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-	c->outmaclength = myself->connection->outmaclength;
-	c->outcompression = myself->connection->outcompression;
+	c->outcompression = mesh->self->connection->outcompression;
 
 	c->address = sa;
 	c->hostname = sockaddr2hostname(&sa);
@@ -668,16 +641,17 @@ static void free_outgoing(outgoing_t *outgoing) {
 void try_outgoing_connections(void) {
 	/* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
-	if(!outgoing_list) {
-		outgoing_list = list_alloc((list_action_t)free_outgoing);
+	if(!mesh->outgoings) {
+		mesh->outgoings = list_alloc((list_action_t)free_outgoing);
 	} else {
-		for list_each(outgoing_t, outgoing, outgoing_list)
+		for list_each(outgoing_t, outgoing, mesh->outgoings)
 			outgoing->timeout = -1;
 	}
 
 	/* Make sure there is one outgoing_t in the list for each ConnectTo. */
 
-	for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+	// TODO: Drop support for ConnectTo since AutoConnect is now always on?
+	for(config_t *cfg = lookup_config(mesh->config, "ConnectTo"); cfg; cfg = lookup_config_next(mesh->config, cfg)) {
 		char *name;
 		get_config_string(cfg, &name);
 
@@ -691,7 +665,7 @@ void try_outgoing_connections(void) {
 
 		bool found = false;
 
-		for list_each(outgoing_t, outgoing, outgoing_list) {
+		for list_each(outgoing_t, outgoing, mesh->outgoings) {
 			if(!strcmp(outgoing->name, name)) {
 				found = true;
 				outgoing->timeout = 0;
@@ -702,14 +676,14 @@ void try_outgoing_connections(void) {
 		if(!found) {
 			outgoing_t *outgoing = xzalloc(sizeof *outgoing);
 			outgoing->name = name;
-			list_insert_tail(outgoing_list, outgoing);
+			list_insert_tail(mesh->outgoings, outgoing);
 			setup_outgoing_connection(outgoing);
 		}
 	}
 
 	/* Terminate any connections whose outgoing_t is to be deleted. */
 
-	for list_each(connection_t, c, connection_list) {
+	for list_each(connection_t, c, mesh->connections) {
 		if(c->outgoing && c->outgoing->timeout == -1) {
 			c->outgoing = NULL;
 			logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name);
@@ -719,7 +693,7 @@ void try_outgoing_connections(void) {
 
 	/* Delete outgoing_ts for which there is no ConnectTo. */
 
-	for list_each(outgoing_t, outgoing, outgoing_list)
+	for list_each(outgoing_t, outgoing, mesh->outgoings)
 		if(outgoing->timeout == -1)
-			list_delete_node(outgoing_list, node);
+			list_delete_node(mesh->outgoings, node);
 }