X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=39b467df7bccf11ed79a36e1998cf485b90881a2;hb=965710e7337523fc8605310d74c6f9240d76e7ce;hp=0e5823641de349b1bb2321623be9820e0a37891c;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

diff --git a/src/net.c b/src/net.c
index 0e582364..39b467df 100644
--- a/src/net.c
+++ b/src/net.c
@@ -36,6 +36,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) {
@@ -154,7 +157,8 @@ void terminate_connection(connection_t *c, bool report) {
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void timeout_handler(int fd, short events, void *event) {
+static void timeout_handler(void *arg) {
+	event_t *event = arg;
 	splay_node_t *node, *next;
 	connection_t *c;
 	time_t now = time(NULL);
@@ -189,10 +193,24 @@ static void timeout_handler(int fd, short events, void *event) {
 		}
 	}
 
-	event_add(event, &(struct timeval){pingtimeout, 0});
+	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!");
+			abort();
+			return;
+		}
+
+		contradicting_add_edge = 0;
+		contradicting_del_edge = 0;
+	}
+
+	event->time = now + pingtimeout;
+	event_add(event);
 }
 
-void handle_meta_connection_data(int fd, short events, void *data) {
+void handle_meta_connection_data(void *data) {
 	connection_t *c = data;
 	int result;
 	socklen_t len = sizeof result;
@@ -214,15 +232,17 @@ void handle_meta_connection_data(int fd, short events, void *data) {
 		}
 	}
 
-	if (!receive_meta(c)) {
-		terminate_connection(c, c->status.active);
-		return;
+	while(true) {
+		if (!receive_meta(c)) {
+			terminate_connection(c, c->status.active);
+			return;
+		}
 	}
 }
 
 static void sigterm_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
-	event_loopexit(NULL);
+	exit(0);
 }
 
 static void sighup_handler(int signal, short events, void *data) {
@@ -244,7 +264,7 @@ int reload_configuration(void) {
 
 	if(!read_server_config()) {
 		logger(LOG_ERR, "Unable to reread configuration file, exitting.");
-		event_loopexit(NULL);
+		abort();
 		return EINVAL;
 	}
 
@@ -275,6 +295,7 @@ int reload_configuration(void) {
 	if(strictsubnets) {
 		subnet_t *subnet;
 
+
 		for(node = subnet_tree->head; node; node = node->next) {
 			subnet = node->data;
 			subnet->expires = 1;
@@ -315,8 +336,7 @@ void retry(void) {
 		c = node->data;
 		
 		if(c->outgoing && !c->node) {
-			if(timeout_initialized(&c->outgoing->ev))
-				event_del(&c->outgoing->ev);
+			event_del(&c->outgoing->ev);
 			if(c->status.connecting)
 				close(c->socket);
 			c->outgoing->timeout = 0;
@@ -330,34 +350,31 @@ void retry(void) {
 */
 int main_loop(void) {
 	struct event timeout_event;
-	struct event sighup_event;
-	struct event sigterm_event;
-	struct event sigquit_event;
 
-	timeout_set(&timeout_event, timeout_handler, &timeout_event);
-	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+	timeout_event.time = time(NULL) + pingtimeout;
+	timeout_event.handler = timeout_handler;
+	timeout_event.data = &timeout_event;
+
+	event_add(&timeout_event);
 
 #ifdef SIGHUP
-	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
-	signal_add(&sighup_event, NULL);
+	signal(SIGHUP, sighup_handler);
 #endif
 #ifdef SIGTERM
-	signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
-	signal_add(&sigterm_event, NULL);
+	signal(SIGTERM, sigterm_handler);
 #endif
 #ifdef SIGQUIT
-	signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
-	signal_add(&sigquit_event, NULL);
+	signal(SIGQUIT, sigterm_handler);
 #endif
 
-	if(event_loop(0) < 0) {
-		logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
-		return 1;
+	while(true) {
+		usleep(1000);
+		struct event *event;
+		while((event = get_expired_event())) {
+			event->handler(event->data);
+		}
 	}
 
-	signal_del(&sighup_event);
-	signal_del(&sigterm_event);
-	signal_del(&sigquit_event);
 	event_del(&timeout_event);
 
 	return 0;