X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=dd86cf27de1ddae82cb5ab81e51a0f10f3efc92e;hb=1aa8ac8c41ab8580fce1956086d7e6c7e84a09ee;hp=78d4b76bff18b7fe4d12f3acb2a62d8a2cf6927a;hpb=3a149f7521dfff67e6a790c1a830afc649ae083e;p=tinc

diff --git a/src/net.c b/src/net.c
index 78d4b76b..dd86cf27 100644
--- a/src/net.c
+++ b/src/net.c
@@ -26,6 +26,7 @@
 #include "conf_net.h"
 #include "conf.h"
 #include "connection.h"
+#include "crypto.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -34,6 +35,7 @@
 #include "protocol.h"
 #include "subnet.h"
 #include "utils.h"
+#include "watchdog.h"
 
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
@@ -54,7 +56,7 @@ void purge(void) {
 		if(!n->status.reachable) {
 			logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
 
-			for splay_each(subnet_t, s, n->subnet_tree) {
+			for splay_each(subnet_t, s, &n->subnet_tree) {
 				send_del_subnet(everyone, s);
 
 				if(!strictsubnets) {
@@ -62,7 +64,7 @@ void purge(void) {
 				}
 			}
 
-			for splay_each(edge_t, e, n->edge_tree) {
+			for splay_each(edge_t, e, &n->edge_tree) {
 				if(!tunnelserver) {
 					send_del_edge(everyone, e);
 				}
@@ -81,7 +83,7 @@ void purge(void) {
 					return;
 				}
 
-			if(!autoconnect && (!strictsubnets || !n->subnet_tree->head))
+			if(!autoconnect && (!strictsubnets || !n->subnet_tree.head))
 				/* in strictsubnets mode do not delete nodes with subnets */
 			{
 				node_del(n);
@@ -159,7 +161,7 @@ void terminate_connection(connection_t *c, bool report) {
 		do_outgoing_connection(outgoing);
 	}
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 	/* Clean up dead proxy processes */
 
 	while(waitpid(-1, NULL, WNOHANG) > 0);
@@ -194,6 +196,9 @@ static void timeout_handler(void *data) {
 	         by default
 	*/
 	if(sleep_time > 2 * udp_discovery_timeout) {
+#ifdef HAVE_WATCHDOG
+		watchdog_ping();
+#endif
 		logger(DEBUG_ALWAYS, LOG_ERR, "Awaking from dead after %ld seconds of sleep", sleep_time);
 		/*
 		        Do not send any packets to tinc after we wake up.
@@ -256,7 +261,7 @@ static void timeout_handler(void *data) {
 	}
 
 	timeout_set(data, &(struct timeval) {
-		1, rand() % 100000
+		1, jitter()
 	});
 }
 
@@ -268,9 +273,7 @@ static void periodic_handler(void *data) {
 
 	if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
-		nanosleep(&(struct timespec) {
-			sleeptime, 0
-		}, NULL);
+		sleep_millis(sleeptime * 1000);
 		sleeptime *= 2;
 
 		if(sleeptime < 0) {
@@ -294,7 +297,7 @@ static void periodic_handler(void *data) {
 	}
 
 	timeout_set(data, &(struct timeval) {
-		5, rand() % 100000
+		5, jitter()
 	});
 }
 
@@ -309,7 +312,7 @@ void handle_meta_connection_data(connection_t *c) {
 	}
 }
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 static void sigterm_handler(void *data) {
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
 	event_exit();
@@ -391,7 +394,7 @@ int reload_configuration(void) {
 			}
 		}
 	} else { /* Only read our own subnets back in */
-		for splay_each(subnet_t, subnet, myself->subnet_tree)
+		for splay_each(subnet_t, subnet, &myself->subnet_tree)
 			if(!subnet->expires) {
 				subnet->expires = 1;
 			}
@@ -418,7 +421,7 @@ int reload_configuration(void) {
 			cfg = lookup_config_next(&config_tree, cfg);
 		}
 
-		for splay_each(subnet_t, subnet, myself->subnet_tree) {
+		for splay_each(subnet_t, subnet, &myself->subnet_tree) {
 			if(subnet->expires == 1) {
 				send_del_subnet(everyone, subnet);
 				subnet_update(myself, subnet, false);
@@ -482,13 +485,13 @@ void retry(void) {
 int main_loop(void) {
 	last_periodic_run_time = now;
 	timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval) {
-		pingtimeout, rand() % 100000
+		pingtimeout, jitter()
 	});
 	timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval) {
 		0, 0
 	});
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 	signal_t sighup = {0};
 	signal_t sigterm = {0};
 	signal_t sigquit = {0};
@@ -507,7 +510,7 @@ int main_loop(void) {
 		return 1;
 	}
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 	signal_del(&sighup);
 	signal_del(&sigterm);
 	signal_del(&sigquit);