X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fautoconnect.c;h=d25d65e30f528e0c237df8e4b70493bdf512e3c3;hb=de7d5a03c2b956ab5753faf63b8148a279a71f29;hp=e97a33ceeb1a812c0188bcf260c95a5a0aa84138;hpb=3a316823b971396a428f020f401b9fe41252d98d;p=tinc

diff --git a/src/autoconnect.c b/src/autoconnect.c
index e97a33ce..d25d65e3 100644
--- a/src/autoconnect.c
+++ b/src/autoconnect.c
@@ -27,28 +27,34 @@
 static void make_new_connection() {
 	/* Select a random node we haven't connected to yet. */
 	int count = 0;
+
 	for splay_each(node_t, n, node_tree) {
-		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable))
+		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
 			continue;
+		}
+
 		count++;
 	}
 
-	if(!count)
+	if(!count) {
 		return;
+	}
 
 	int r = rand() % count;
 
 	for splay_each(node_t, n, node_tree) {
-		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable))
+		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
 			continue;
+		}
 
-		if(r--)
+		if(r--) {
 			continue;
+		}
 
 		bool found = false;
 
 		for list_each(outgoing_t, outgoing, outgoing_list) {
-			if(!strcmp(outgoing->name, n->name)) {
+			if(outgoing->node == n) {
 				found = true;
 				break;
 			}
@@ -57,9 +63,9 @@ static void make_new_connection() {
 		if(!found) {
 			logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
 			outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
-			outgoing->name = xstrdup(n->name);
+			outgoing->node = n;
 			list_insert_tail(outgoing_list, outgoing);
-			setup_outgoing_connection(outgoing);
+			setup_outgoing_connection(outgoing, false);
 		}
 
 		break;
@@ -77,23 +83,27 @@ static void connect_to_unreachable() {
 	int r = rand() % node_tree->count;
 
 	for splay_each(node_t, n, node_tree) {
-		if(r--)
+		if(r--) {
 			continue;
+		}
 
 		/* Is it unreachable and do we know an address for it? If not, return. */
-		if(n == myself || n->connection || n->status.reachable || !n->status.has_address)
+		if(n == myself || n->connection || n->status.reachable || !n->status.has_address) {
 			return;
+		}
 
-		/* Are we already trying to make an outgoing connection to it? If not, return. */
-		for list_each(outgoing_t, outgoing, outgoing_list)
-			if(!strcmp(outgoing->name, n->name))
+		/* Are we already trying to make an outgoing connection to it? If so, return. */
+		for list_each(outgoing_t, outgoing, outgoing_list) {
+			if(outgoing->node == n) {
 				return;
+			}
+		}
 
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
 		outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
-		outgoing->name = xstrdup(n->name);
+		outgoing->node = n;
 		list_insert_tail(outgoing_list, outgoing);
-		setup_outgoing_connection(outgoing);
+		setup_outgoing_connection(outgoing, false);
 
 		return;
 	}
@@ -102,23 +112,29 @@ static void connect_to_unreachable() {
 static void drop_superfluous_outgoing_connection() {
 	/* Choose a random outgoing connection to a node that has at least one other connection. */
 	int count = 0;
+
 	for list_each(connection_t, c, connection_list) {
-		if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2)
+		if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2) {
 			continue;
+		}
+
 		count++;
 	}
 
-	if(!count)
+	if(!count) {
 		return;
+	}
 
 	int r = rand() % count;
 
 	for list_each(connection_t, c, connection_list) {
-		if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2)
+		if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2) {
 			continue;
-		
-		if(r--)
+		}
+
+		if(r--) {
 			continue;
+		}
 
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
 		list_delete(outgoing_list, c->outgoing);
@@ -132,6 +148,7 @@ static void drop_superfluous_pending_connections() {
 	for list_each(outgoing_t, o, outgoing_list) {
 		/* Only look for connections that are waiting to be retried later. */
 		bool found = false;
+
 		for list_each(connection_t, c, connection_list) {
 			if(c->outgoing == o) {
 				found = true;
@@ -139,10 +156,11 @@ static void drop_superfluous_pending_connections() {
 			}
 		}
 
-		if(found)
+		if(found) {
 			continue;
+		}
 
-		logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name);
+		logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->node->name);
 		list_delete_node(outgoing_list, node);
 	}
 }
@@ -150,9 +168,11 @@ static void drop_superfluous_pending_connections() {
 void do_autoconnect() {
 	/* Count number of active connections. */
 	int nc = 0;
+
 	for list_each(connection_t, c, connection_list) {
-		if(c->edge)
+		if(c->edge) {
 			nc++;
+		}
 	}
 
 	/* Less than 3 connections? Eagerly try to make a new one. */
@@ -160,15 +180,15 @@ void do_autoconnect() {
 		make_new_connection();
 		return;
 	}
-	
+
 	/* More than 3 connections? See if we can get rid of a superfluous one. */
-	if(nc > 3)
+	if(nc > 3) {
 		drop_superfluous_outgoing_connection();
+	}
 
+	/* Drop pending outgoing connections from the outgoing list. */
+	drop_superfluous_pending_connections();
 
 	/* Check if there are unreachable nodes that we should try to connect to. */
 	connect_to_unreachable();
-
-	/* Drop pending outgoing connections from the outgoing list. */
-	drop_superfluous_pending_connections();
 }