X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fautoconnect.c;h=9f4abece64443335e59c111dca9fb68112082f5e;hb=e32d4f3db3f1ed3eebe2e11d57512b60a6c02fa6;hp=5651f54d1a4d3aa396d33be4f5b8c1c13a109dc6;hpb=0871c3095151bce6a4031a2662aa51b7193b855c;p=tinc

diff --git a/src/autoconnect.c b/src/autoconnect.c
index 5651f54d..9f4abece 100644
--- a/src/autoconnect.c
+++ b/src/autoconnect.c
@@ -20,15 +20,16 @@
 #include "system.h"
 
 #include "connection.h"
+#include "crypto.h"
 #include "logger.h"
 #include "node.h"
 #include "xalloc.h"
 
 static void make_new_connection() {
 	/* Select a random node we haven't connected to yet. */
-	int count = 0;
+	uint32_t count = 0;
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
 			continue;
 		}
@@ -40,14 +41,15 @@ static void make_new_connection() {
 		return;
 	}
 
-	int r = rand() % count;
+	uint32_t r = prng(count);
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
 			continue;
 		}
 
-		if(r--) {
+		if(r) {
+			--r;
 			continue;
 		}
 
@@ -80,9 +82,9 @@ static void connect_to_unreachable() {
 	 * are only a few reachable nodes, and many unreachable ones, we're
 	 * going to try harder to connect to them. */
 
-	unsigned int r = rand() % node_tree->count;
+	uint32_t r = prng(node_tree.count);
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		if(r--) {
 			continue;
 		}
@@ -111,10 +113,10 @@ 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;
+	uint32_t 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;
 		}
 
@@ -125,10 +127,10 @@ static void drop_superfluous_outgoing_connection() {
 		return;
 	}
 
-	int r = rand() % count;
+	uint32_t r = prng(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;
 		}
 
@@ -167,7 +169,7 @@ static void drop_superfluous_pending_connections() {
 
 void do_autoconnect() {
 	/* Count number of active connections. */
-	int nc = 0;
+	uint32_t nc = 0;
 
 	for list_each(connection_t, c, &connection_list) {
 		if(c->edge) {