X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=aae73969001577a9f4110adcc528db47b90405d9;hb=79e9a4f743b7b59fed968575f6b36171cf4a0063;hp=9445b68a046d6f0489eba826c9c0647cbc003514;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc

diff --git a/src/net.c b/src/net.c
index 9445b68a..aae73969 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,8 +1,9 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
+		  2011      Loïc Grenié <loic.grenie@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,8 +22,6 @@
 
 #include "system.h"
 
-#include <openssl/rand.h>
-
 #include "utils.h"
 #include "splay_tree.h"
 #include "conf.h"
@@ -38,6 +37,9 @@
 #include "subnet.h"
 #include "xalloc.h"
 
+int contradicting_add_edge = 0;
+int contradicting_del_edge = 0;
+
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
 void purge(void) {
@@ -61,9 +63,9 @@ void purge(void) {
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
 				s = snode->data;
-				if(!tunnelserver)
-					send_del_subnet(broadcast, s);
-				subnet_del(n, s);
+				send_del_subnet(broadcast, s);
+				if(!strictsubnets)
+					subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
@@ -91,7 +93,8 @@ void purge(void) {
 					break;
 			}
 
-			if(!enode)
+			if(!enode && (!strictsubnets || !n->subnet_tree->head))
+				/* in strictsubnets mode do not delete nodes with subnets */
 				node_del(n);
 		}
 	}
@@ -164,14 +167,14 @@ static void timeout_handler(int fd, short events, void *event) {
 		next = node->next;
 		c = node->data;
 
-		if(c->last_ping_time + pingtimeout < now) {
+		if(c->last_ping_time + pingtimeout <= now) {
 			if(c->status.active) {
 				if(c->status.pinged) {
 					ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
 							   c->name, c->hostname, now - c->last_ping_time);
 					terminate_connection(c, true);
 					continue;
-				} else if(c->last_ping_time + pinginterval < now) {
+				} else if(c->last_ping_time + pinginterval <= now) {
 					send_ping(c);
 				}
 			} else {
@@ -190,6 +193,19 @@ static void timeout_handler(int fd, short events, void *event) {
 		}
 	}
 
+	if(contradicting_del_edge && contradicting_add_edge) {
+		logger(LOG_WARNING, "Possible node with same Name as us!");
+
+		if(rand() % 3 == 0) {
+			logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
+			event_loopexit(NULL);
+			return;
+		}
+
+		contradicting_add_edge = 0;
+		contradicting_del_edge = 0;
+	}
+
 	event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
@@ -228,6 +244,7 @@ static void sigterm_handler(int signal, short events, void *data) {
 
 static void sighup_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+	reopenlogger();
 	reload_configuration();
 }
 
@@ -271,6 +288,37 @@ int reload_configuration(void) {
 
 	last_config_check = time(NULL);
 
+	/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+	if(strictsubnets) {
+		subnet_t *subnet;
+
+
+		for(node = subnet_tree->head; node; node = node->next) {
+			subnet = node->data;
+			subnet->expires = 1;
+		}
+
+		load_all_subnets();
+
+		for(node = subnet_tree->head; node; node = next) {
+			next = node->next;
+			subnet = node->data;
+			if(subnet->expires == 1) {
+				send_del_subnet(broadcast, subnet);
+				if(subnet->owner->status.reachable)
+					subnet_update(subnet->owner, subnet, false);
+				subnet_del(subnet->owner, subnet);
+			} else if(subnet->expires == -1) {
+				subnet->expires = 0;
+			} else {
+				send_add_subnet(broadcast, subnet);
+				if(subnet->owner->status.reachable)
+					subnet_update(subnet->owner, subnet, true);
+			}
+		}
+	}
+
 	/* Try to make outgoing connections */
 	
 	try_outgoing_connections();
@@ -307,12 +355,19 @@ int main_loop(void) {
 
 	timeout_set(&timeout_event, timeout_handler, &timeout_event);
 	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+
+#ifdef SIGHUP
 	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
 	signal_add(&sighup_event, NULL);
+#endif
+#ifdef SIGTERM
 	signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
 	signal_add(&sigterm_event, NULL);
+#endif
+#ifdef SIGQUIT
 	signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
 	signal_add(&sigquit_event, NULL);
+#endif
 
 	if(event_loop(0) < 0) {
 		logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
@@ -322,7 +377,9 @@ int main_loop(void) {
 	signal_del(&sighup_event);
 	signal_del(&sigterm_event);
 	signal_del(&sigquit_event);
-	event_del(&timeout_event);
+
+	if(timeout_initialized(&timeout_event))
+		event_del(&timeout_event);
 
 	return 0;
 }