X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=3c79ceeabacd401210c4ba3a21c004cb251c3874;hb=6834b882015a9323672e9fce8811aa4283f196f0;hp=2e6b068552d3838cbeb175c32f97637cf7d83fcc;hpb=a9445e38f25bd24eca289768fc46e44e36b842ac;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 2e6b0685..3c79ceea 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -22,10 +22,9 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "event.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -56,28 +55,14 @@ list_t *outgoing_list = NULL;
 static void configure_tcp(connection_t *c) {
 	int option;
 
-#ifdef O_NONBLOCK
-	int flags = fcntl(c->socket, F_GETFL);
-
-	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-		logger(LOG_ERR, "fcntl for %s: %s", c->hostname, strerror(errno));
-	}
-#elif defined(WIN32)
-	unsigned long arg = 1;
-
-	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-		logger(LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno));
-	}
-#endif
-
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	option = 1;
-	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof(option));
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option));
+	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof option);
 #endif
 }
 
@@ -183,7 +168,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	/* Optimize TCP settings */
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
 
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
 	if(sa->sa.sa_family == AF_INET6)
@@ -195,10 +180,10 @@ int setup_listen_socket(const sockaddr_t *sa) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 		struct ifreq ifr;
 
-		memset(&ifr, 0, sizeof(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))) {
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) {
 			closesocket(nfd);
 			logger(LOG_ERR, "Can't bind to interface %s: %s", iface,
 				   strerror(sockerrno));
@@ -238,30 +223,8 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 		return -1;
 	}
 
-#ifdef O_NONBLOCK
-	{
-		int flags = fcntl(nfd, F_GETFL);
-
-		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-			closesocket(nfd);
-			logger(LOG_ERR, "System call `%s' failed: %s", "fcntl",
-				   strerror(errno));
-			return -1;
-		}
-	}
-#elif defined(WIN32)
-	{
-		unsigned long arg = 1;
-		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
-			closesocket(nfd);
-			logger(LOG_ERR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
-			return -1;
-		}
-	}
-#endif
-
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
 
 	if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf)))
 		logger(LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno));
@@ -322,19 +285,19 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 	return nfd;
 } /* int setup_vpn_in_socket */
 
+static void retry_outgoing_handler(void *data) {
+	setup_outgoing_connection(data);
+}
+
 void retry_outgoing(outgoing_t *outgoing) {
 	outgoing->timeout += 5;
 
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	if(outgoing->event)
-		event_del(outgoing->event);
-	outgoing->event = new_event();
-	outgoing->event->handler = (event_handler_t) setup_outgoing_connection;
-	outgoing->event->time = now + outgoing->timeout;
-	outgoing->event->data = outgoing;
-	event_add(outgoing->event);
+	outgoing->ev.handler = retry_outgoing_handler;
+	outgoing->ev.time = time(NULL) + outgoing->timeout;
+	event_add(&outgoing->ev);
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
 			   "Trying to re-establish outgoing connection in %d seconds",
@@ -346,7 +309,8 @@ void finish_connecting(connection_t *c) {
 
 	configure_tcp(c);
 
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
+	c->status.connecting = false;
 
 	send_id(c);
 }
@@ -365,9 +329,9 @@ begin:
 		if(!c->outgoing->cfg) {
 			ifdebug(CONNECTIONS) logger(LOG_ERR, "Could not set up a meta connection to %s",
 					   c->name);
-			c->status.remove = true;
 			retry_outgoing(c->outgoing);
 			c->outgoing = NULL;
+			connection_del(c);
 			return;
 		}
 
@@ -454,7 +418,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	connection_t *c;
 	node_t *n;
 
-	outgoing->event = NULL;
+	event_del(&outgoing->ev);
 
 	n = lookup_node(outgoing->name);
 
@@ -485,54 +449,67 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	}
 
 	c->outgoing = outgoing;
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
 	connection_add(c);
 
 	do_outgoing_connection(c);
+
+	if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+		logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+		abort();
+	}
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-bool handle_new_meta_connection(int sock) {
+void handle_new_meta_connection(void *data) {
+	listen_socket_t *l = data;
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof(sa);
+	socklen_t len = sizeof sa;
 
-	fd = accept(sock, &sa.sa, &len);
+	while(true) {
+		fd = accept(l->tcp, &sa.sa, &len);
 
-	if(fd < 0) {
-		logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-		return false;
-	}
+		if(fd < 0) {
+			logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+			return;
+		}
 
-	sockaddrunmap(&sa);
+		sockaddrunmap(&sa);
 
-	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 = 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->address = sa;
-	c->hostname = sockaddr2hostname(&sa);
-	c->socket = fd;
-	c->last_ping_time = now;
+		c->address = sa;
+		c->hostname = sockaddr2hostname(&sa);
+		c->socket = fd;
+		c->last_ping_time = time(NULL);
 
-	ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
+		ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
 
-	configure_tcp(c);
+		configure_tcp(c);
 
-	connection_add(c);
+		mutex_lock(&mutex);
+		connection_add(c);
 
-	c->allow_request = ID;
-	send_id(c);
+		c->allow_request = ID;
+		send_id(c);
 
-	return true;
+		if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+			logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+			abort();
+		}
+		mutex_unlock(&mutex);
+	}
 }
 
 void free_outgoing(outgoing_t *outgoing) {
@@ -563,7 +540,7 @@ void try_outgoing_connections(void) {
 			continue;
 		}
 
-		outgoing = xmalloc_and_zero(sizeof(*outgoing));
+		outgoing = xmalloc_and_zero(sizeof *outgoing);
 		outgoing->name = name;
 		list_insert_tail(outgoing_list, outgoing);
 		setup_outgoing_connection(outgoing);