X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=bda92ebe2438b3bc9b5ae15c41b41c262ddcc5f0;hb=92fdabc439bdb5e16f64a4bf2ed1deda54f7c544;hp=577b11fde99a503be495586399c2d2bbe9e199fe;hpb=9d0e86683cdb7d53263569ad2e49dd87bd217939;p=tinc

diff --git a/src/net.c b/src/net.c
index 577b11fd..bda92ebe 100644
--- a/src/net.c
+++ b/src/net.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "utils.h"
+#include "autoconnect.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
@@ -34,6 +34,7 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "subnet.h"
+#include "utils.h"
 #include "xalloc.h"
 
 int contradicting_add_edge = 0;
@@ -94,29 +95,31 @@ void purge(void) {
 void terminate_connection(connection_t *c, bool report) {
 	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname);
 
-	if(c->node && c->node->connection == c)
-		c->node->connection = NULL;
+	if(c->node) {
+		if(c->node->connection == c)
+			c->node->connection = NULL;
 
-	if(c->edge) {
-		if(report && !tunnelserver)
-			send_del_edge(everyone, c->edge);
+		if(c->edge) {
+			if(report && !tunnelserver)
+				send_del_edge(everyone, c->edge);
 
-		edge_del(c->edge);
-		c->edge = NULL;
+			edge_del(c->edge);
+			c->edge = NULL;
 
-		/* Run MST and SSSP algorithms */
+			/* Run MST and SSSP algorithms */
 
-		graph();
+			graph();
 
-		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+			/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
-		if(report && !c->node->status.reachable) {
-			edge_t *e;
-			e = lookup_edge(c->node, myself);
-			if(e) {
-				if(!tunnelserver)
-					send_del_edge(everyone, e);
-				edge_del(e);
+			if(report && !c->node->status.reachable) {
+				edge_t *e;
+				e = lookup_edge(c->node, myself);
+				if(e) {
+					if(!tunnelserver)
+						send_del_edge(everyone, e);
+					edge_del(e);
+				}
 			}
 		}
 	}
@@ -207,7 +210,7 @@ static void timeout_handler(void *data) {
 
 		// timeout during ping
 		if(c->status.pinged) {
-			logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)now.tv_sec - c->last_ping_time);
+			logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)(now.tv_sec - c->last_ping_time));
 			terminate_connection(c, c->edge);
 			continue;
 		}
@@ -243,105 +246,9 @@ static void periodic_handler(void *data) {
 
 	/* If AutoConnect is set, check if we need to make or break connections. */
 
-	if(autoconnect && node_tree->count > 1) {
-		/* Count number of active connections */
-		int nc = 0;
-		for list_each(connection_t, c, connection_list) {
-			if(c->edge)
-				nc++;
-		}
-
-		if(nc < 3) {
-			/* Not enough active connections, try to add one.
-			   Choose a random node, if we don't have a connection to it,
-			   and we are not already trying to make one, create an
-			   outgoing connection to this node.
-			*/
-			int count = 0;
-			for splay_each(node_t, n, node_tree) {
-				if(n == myself || n->connection || !(n->status.has_address || n->status.reachable))
-					continue;
-				count++;
-			}
-
-			if(!count)
-				goto end;
-
-			int r = rand() % count;
-
-			for splay_each(node_t, n, node_tree) {
-				if(n == myself || n->connection || !(n->status.has_address || n->status.reachable))
-					continue;
-
-				if(r--)
-					continue;
-
-				bool found = false;
-
-				for list_each(outgoing_t, outgoing, outgoing_list) {
-					if(!strcmp(outgoing->name, n->name)) {
-						found = true;
-						break;
-					}
-				}
-
-				if(!found) {
-					logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
-					outgoing_t *outgoing = xzalloc(sizeof *outgoing);
-					outgoing->name = xstrdup(n->name);
-					list_insert_tail(outgoing_list, outgoing);
-					setup_outgoing_connection(outgoing);
-				}
-
-				break;
-			}
-		} else if(nc > 3) {
-			/* Too many active connections, try to remove one.
-			   Choose a random outgoing connection to a node
-			   that has at least one other connection.
-			*/
-			int r = rand() % nc;
-			int i = 0;
-
-			for list_each(connection_t, c, connection_list) {
-				if(!c->edge)
-					continue;
-
-				if(i++ != r)
-					continue;
-
-				if(!c->outgoing || !c->node || c->node->edge_tree->count < 2)
-					break;
-
-				logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
-				list_delete(outgoing_list, c->outgoing);
-				c->outgoing = NULL;
-				terminate_connection(c, c->edge);
-				break;
-			}
-		}
-
-		if(nc >= 3) {
-			/* If we have enough active connections,
-			   remove any pending outgoing connections.
-			*/
-			for list_each(outgoing_t, o, outgoing_list) {
-				bool found = false;
-				for list_each(connection_t, c, connection_list) {
-					if(c->outgoing == o) {
-						found = true;
-						break;
-					}
-				}
-				if(!found) {
-					logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name);
-					list_delete_node(outgoing_list, node);
-				}
-			}
-		}
-	}
+	if(autoconnect && node_tree->count > 1)
+		do_autoconnect();
 
-end:
 	timeout_set(data, &(struct timeval){5, rand() % 100000});
 }