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

diff --git a/src/net.c b/src/net.c
index a1ca9ab9..aae73969 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,9 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 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
@@ -13,23 +15,18 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <openssl/rand.h>
-
 #include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,27 +34,21 @@
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
-bool do_purge = false;
-volatile bool running = false;
-
-time_t now = 0;
+int contradicting_add_edge = 0;
+int contradicting_del_edge = 0;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
-	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+void purge(void) {
+	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
 	subnet_t *s;
 
-	cp();
-
-	ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+	ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
 
 	/* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -66,15 +57,15 @@ static void purge(void)
 		n = nnode->data;
 
 		if(!n->status.reachable) {
-			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
 					   n->hostname);
 
 			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) {
@@ -102,38 +93,13 @@ static 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);
 		}
 	}
 }
 
-/*
-  put all file descriptors into events
-  While we're at it, purge stuf that needs to be removed.
-*/
-static int build_fdset(void)
-{
-	avl_node_t *node, *next;
-	connection_t *c;
-	int i, max = 0;
-
-	cp();
-
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
-
-		if(c->status.remove) {
-			connection_del(c);
-			if(!connection_tree->head)
-				purge();
-		}
-	}
-
-	return 0;
-}
-
 /*
   Terminate a connection:
   - Close the socket
@@ -141,17 +107,10 @@ static int build_fdset(void)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
-	cp();
-
-	if(c->status.remove)
-		return;
-
-	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
+void terminate_connection(connection_t *c, bool report) {
+	ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
 			   c->name, c->hostname);
 
-	c->status.remove = true;
 	c->status.active = false;
 
 	if(c->node)
@@ -160,8 +119,6 @@ void terminate_connection(connection_t *c, bool report)
 	if(c->socket)
 		closesocket(c->socket);
 
-	event_del(&c->ev);
-
 	if(c->edge) {
 		if(report && !tunnelserver)
 			send_del_edge(broadcast, c->edge);
@@ -187,16 +144,10 @@ void terminate_connection(connection_t *c, bool report)
 
 	/* Check if this was our outgoing connection */
 
-	if(c->outgoing) {
+	if(c->outgoing)
 		retry_outgoing(c->outgoing);
-		c->outgoing = NULL;
-	}
 
-	free(c->outbuf);
-	c->outbuf = NULL;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
+	connection_del(c);
 }
 
 /*
@@ -207,77 +158,73 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void check_dead_connections(void)
-{
-	avl_node_t *node, *next;
+static void timeout_handler(int fd, short events, void *event) {
+	splay_node_t *node, *next;
 	connection_t *c;
-
-	cp();
+	time_t now = time(NULL);
 
 	for(node = connection_tree->head; node; node = next) {
 		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"),
+					ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
 							   c->name, c->hostname, now - c->last_ping_time);
-					c->status.timeout = true;
 					terminate_connection(c, true);
-				} else if(c->last_ping_time + pinginterval < now) {
+					continue;
+				} else if(c->last_ping_time + pinginterval <= now) {
 					send_ping(c);
 				}
 			} else {
-				if(c->status.remove) {
-					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-						   c->name, c->hostname, c->status.value);
-					connection_del(c);
-					continue;
-				}
-				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
-						   c->name, c->hostname);
 				if(c->status.connecting) {
+					ifdebug(CONNECTIONS)
+						logger(LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
 					c->status.connecting = false;
 					closesocket(c->socket);
 					do_outgoing_connection(c);
 				} else {
+					ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
 					terminate_connection(c, false);
+					continue;
 				}
 			}
 		}
+	}
 
-		if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
-			if(c->status.active) {
-				ifdebug(CONNECTIONS) logger(LOG_INFO,
-						_("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
-						c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
-				c->status.timeout = true;
-				terminate_connection(c, true);
-			}
+	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});
 }
 
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
 	connection_t *c = data;
 	int result;
-	socklen_t len = sizeof(result);
-
-	if (c->status.remove)
-		return;
+	socklen_t len = sizeof result;
 
 	if(c->status.connecting) {
 		c->status.connecting = false;
+
 		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
 		if(!result)
 			finish_connecting(c);
 		else {
 			ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-					   _("Error while connecting to %s (%s): %s"),
-					   c->name, c->hostname, strerror(result));
+					   "Error while connecting to %s (%s): %s",
+					   c->name, c->hostname, sockstrerror(result));
 			closesocket(c->socket);
 			do_outgoing_connection(c);
 			return;
@@ -290,147 +237,149 @@ void handle_meta_connection_data(int fd, short events, void *data)
 	}
 }
 
-static void dummy(int a, short b, void *c)
-{
+static void sigterm_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+	event_loopexit(NULL);
 }
 
-/*
-  this is where it all happens...
-*/
-int main_loop(void)
-{
-	struct timeval tv;
-	int r;
-	time_t last_ping_check, last_config_check;
-	tevent_t *event;
-	struct event timeout;
-
-	cp();
-
-	last_ping_check = now;
-	last_config_check = now;
-	
-	srand(now);
-
-	running = true;
-
-	while(running) {
-		now = time(NULL);
+static void sighup_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+	reopenlogger();
+	reload_configuration();
+}
 
-	//	tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
+int reload_configuration(void) {
+	connection_t *c;
+	splay_node_t *node, *next;
+	char *fname;
+	struct stat s;
+	static time_t last_config_check = 0;
 
-		/* XXX: libevent transition: old timeout code in this loop */
-		timeout_set(&timeout, dummy, NULL);
-		timeout_add(&timeout, &tv);
+	/* Reread our own configuration file */
 
-		r = build_fdset();
-		if(r < 0) {
-			logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
-
-		r = event_loop(EVLOOP_ONCE);
-		now = time(NULL);
-		if(r < 0) {
-			logger(LOG_ERR, _("Error while waiting for input: %s"),
-				   strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
+	exit_configuration(&config_tree);
+	init_configuration(&config_tree);
 
-		/* XXX: more libevent transition */
-		timeout_del(&timeout);
+	if(!read_server_config()) {
+		logger(LOG_ERR, "Unable to reread configuration file, exitting.");
+		event_loopexit(NULL);
+		return EINVAL;
+	}
 
-		if(do_purge) {
-			purge();
-			do_purge = false;
+	/* Close connections to hosts that have a changed or deleted host config file */
+	
+	for(node = connection_tree->head; node; node = next) {
+		c = node->data;
+		next = node->next;
+		
+		if(c->outgoing) {
+			free(c->outgoing->name);
+			if(c->outgoing->ai)
+				freeaddrinfo(c->outgoing->ai);
+			free(c->outgoing);
+			c->outgoing = NULL;
 		}
+		
+		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		if(stat(fname, &s) || s.st_mtime > last_config_check)
+			terminate_connection(c, c->status.active);
+		free(fname);
+	}
 
-		/* Let's check if everybody is still alive */
-
-		if(last_ping_check + pingtimeout < now) {
-			check_dead_connections();
-			last_ping_check = now;
+	last_config_check = time(NULL);
 
-			if(routing_mode == RMODE_SWITCH)
-				age_subnets();
+	/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
 
-			age_past_requests();
+	if(strictsubnets) {
+		subnet_t *subnet;
 
-			/* Should we regenerate our key? */
 
-			if(keyexpires < now) {
-				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+		for(node = subnet_tree->head; node; node = node->next) {
+			subnet = node->data;
+			subnet->expires = 1;
+		}
 
-				RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
-				if(myself->cipher)
-					EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
-				send_key_changed(broadcast, myself);
-				keyexpires = now + keylifetime;
+		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();
 
-		while((event = get_expired_tevent())) {
-			event->handler(event->data);
-			free_tevent(event);
-		}
+	return 0;
+}
 
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			flush_tevents();
-			sigalrm = false;
-		}
+void retry(void) {
+	connection_t *c;
+	splay_node_t *node;
 
-		if(sighup) {
-			connection_t *c;
-			avl_node_t *node;
-			char *fname;
-			struct stat s;
-			
-			sighup = false;
-			
-			/* Reread our own configuration file */
-
-			exit_configuration(&config_tree);
-			init_configuration(&config_tree);
-
-			if(!read_server_config()) {
-				logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-				return 1;
-			}
+	for(node = connection_tree->head; node; node = node->next) {
+		c = node->data;
+		
+		if(c->outgoing && !c->node) {
+			if(timeout_initialized(&c->outgoing->ev))
+				event_del(&c->outgoing->ev);
+			if(c->status.connecting)
+				close(c->socket);
+			c->outgoing->timeout = 0;
+			do_outgoing_connection(c);
+		}
+	}
+}
 
-			/* Close connections to hosts that have a changed or deleted host config file */
-			
-			for(node = connection_tree->head; node; node = node->next) {
-				c = node->data;
-				
-				if(c->outgoing) {
-					free(c->outgoing->name);
-					if(c->outgoing->ai)
-						freeaddrinfo(c->outgoing->ai);
-					free(c->outgoing);
-					c->outgoing = NULL;
-				}
-				
-				asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-				if(stat(fname, &s) || s.st_mtime > last_config_check)
-					terminate_connection(c, c->status.active);
-				free(fname);
-			}
+/*
+  this is where it all happens...
+*/
+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});
+
+#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));
+		return 1;
+	}
 
-			last_config_check = now;
+	signal_del(&sighup_event);
+	signal_del(&sigterm_event);
+	signal_del(&sigquit_event);
 
-			/* Try to make outgoing connections */
-			
-			try_outgoing_connections();
-		}
-	}
+	if(timeout_initialized(&timeout_event))
+		event_del(&timeout_event);
 
 	return 0;
 }