X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=767e91e92b30ba92d1af9ded372760ed2647ce72;hp=0a4dd9a0f6abd68ee2e776f6311dfa710eaca565;hb=cef40b8b978694fc0e7c02e292fcbb60806bf028;hpb=86a99c6b999671ed444711139db1937617e802a0

diff --git a/src/net_socket.c b/src/net_socket.c
index 0a4dd9a0..767e91e9 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -43,8 +43,8 @@
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
-int udp_rcvbuf = 0;
-int udp_sndbuf = 0;
+int udp_rcvbuf = 1024 * 1024;
+int udp_sndbuf = 1024 * 1024;
 int max_connection_burst = 100;
 
 listen_socket_t listen_socket[MAXSOCKETS];
@@ -388,7 +388,7 @@ static void handle_meta_write(connection_t *c) {
 			logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, sockstrerror(sockerrno));
 		}
 
-		terminate_connection(c, c->status.active);
+		terminate_connection(c, c->edge);
 		return;
 	}
 
@@ -401,30 +401,38 @@ static void handle_meta_io(void *data, int flags) {
 	connection_t *c = data;
 
 	if(c->status.connecting) {
-		/* The event loop does not protect against spurious events. Verify that we are actually connected. */
-		if (connect(c->socket, &c->address.sa, sizeof(c->address)) == 0)
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): redundant connect() unexpectedly succeeded", c->name, c->hostname);
-		else if (!sockisconn(sockerrno)) {
-			if (!sockalready(sockerrno)) {
-				logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while checking connection status for %s (%s): %s", c->name, c->hostname, sockstrerror(sockerrno));
+		/*
+		   The event loop does not protect against spurious events. Verify that we are actually connected
+		   by issuing an empty send() call.
+
+		   Note that the behavior of send() on potentially unconnected sockets differ between platforms:
+		   +------------+-----------+-------------+-----------+
+		   |   Event    |   POSIX   |    Linux    |  Windows  |
+		   +------------+-----------+-------------+-----------+
+		   | Spurious   | ENOTCONN  | EWOULDBLOCK | ENOTCONN  |
+		   | Failed     | ENOTCONN  | (cause)     | ENOTCONN  |
+		   | Successful | (success) | (success)   | (success) |
+		   +------------+-----------+-------------+-----------+
+		*/
+		if (send(c->socket, NULL, 0, 0) != 0) {
+			if (sockwouldblock(sockerrno))
+				return;
+			int socket_error;
+			if (!socknotconn(sockerrno))
+				socket_error = sockerrno;
+			else {
+				socklen_t len = sizeof socket_error;
+				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&socket_error, &len);
+			}
+			if (socket_error) {
+				logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(socket_error));
 				terminate_connection(c, false);
 			}
 			return;
 		}
 
 		c->status.connecting = false;
-
-		int result;
-		socklen_t len = sizeof result;
-		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
-
-		if(!result)
-			finish_connecting(c);
-		else {
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
-			terminate_connection(c, false);
-			return;
-		}
+		finish_connecting(c);
 	}
 
 	if(flags & IO_WRITE)
@@ -541,8 +549,10 @@ begin:
 
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->name);
+#ifndef DISABLE_LEGACY
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
+#endif
 	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 	c->last_ping_time = now.tv_sec;
@@ -594,9 +604,12 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
 	if(n && n->connection) {
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
-
-		n->connection->outgoing = outgoing;
-		return;
+		if(!n->connection->outgoing) {
+			n->connection->outgoing = outgoing;
+			return;
+		} else {
+			goto remove;
+		}
 	}
 
 	init_configuration(&outgoing->config_tree);
@@ -607,12 +620,16 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 		if(n)
 			outgoing->aip = outgoing->ai = get_known_addresses(n);
 		if(!outgoing->ai) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "No address known for %s", outgoing->name);
-			return;
+			logger(DEBUG_ALWAYS, LOG_DEBUG, "No address known for %s", outgoing->name);
+			goto remove;
 		}
 	}
 
 	do_outgoing_connection(outgoing);
+	return;
+
+remove:
+	list_delete(outgoing_list, outgoing);
 }
 
 /*
@@ -688,8 +705,10 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	c = new_connection();
 	c->name = xstrdup("<unknown>");
+#ifndef DISABLE_LEGACY
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
+#endif
 	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 
@@ -788,6 +807,11 @@ void try_outgoing_connections(void) {
 			continue;
 		}
 
+		if(!strcmp(name, myself->name)) {
+			free(name);
+			continue;
+		}
+
 		bool found = false;
 
 		for list_each(outgoing_t, outgoing, outgoing_list) {
@@ -812,7 +836,7 @@ void try_outgoing_connections(void) {
 		if(c->outgoing && c->outgoing->timeout == -1) {
 			c->outgoing = NULL;
 			logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name);
-			terminate_connection(c, c->status.active);
+			terminate_connection(c, c->edge);
 		}
 	}