X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ddca1c9b9a8b8a29a9ea2a7225904cafebb08fab;hp=9e4829a35b75fcefba7eaaab3d044db8c2071d00;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hpb=67df7fb7e1c9eefe4bbc920fdc68b595ef28abd9

diff --git a/src/net.c b/src/net.c
index 9e4829a3..ddca1c9b 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-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 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,17 @@
     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 "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,27 +33,23 @@
 #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;
+static int sleeptime = 10;
+time_t last_config_check = 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"));
+	logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
 
 	/* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -66,22 +58,21 @@ static void purge(void)
 		n = nnode->data;
 
 		if(!n->status.reachable) {
-			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
-					   n->hostname);
+			logger(DEBUG_SCARY_THINGS, 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(everyone, s);
+				if(!strictsubnets)
+					subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
 				enext = enode->next;
 				e = enode->data;
 				if(!tunnelserver)
-					send_del_edge(broadcast, e);
+					send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
@@ -102,91 +93,34 @@ 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 in an fd_set array
-  While we're at it, purge stuff that needs to be removed.
-*/
-static int build_fdset(fd_set *readset, fd_set *writeset)
-{
-	avl_node_t *node, *next;
-	connection_t *c;
-	int i, max = 0;
-
-	cp();
-
-	FD_ZERO(readset);
-	FD_ZERO(writeset);
-
-	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();
-		} else {
-			FD_SET(c->socket, readset);
-			if(c->outbuflen > 0)
-				FD_SET(c->socket, writeset);
-			if(c->socket > max)
-				max = c->socket;
-		}
-	}
-
-	for(i = 0; i < listen_sockets; i++) {
-		FD_SET(listen_socket[i].tcp, readset);
-		if(listen_socket[i].tcp > max)
-			max = listen_socket[i].tcp;
-		FD_SET(listen_socket[i].udp, readset);
-		if(listen_socket[i].udp > max)
-			max = listen_socket[i].udp;
-	}
-
-	FD_SET(device_fd, readset);
-	if(device_fd > max)
-		max = device_fd;
-	
-	return max;
-}
-
 /*
   Terminate a connection:
-  - Close the socket
-  - Remove associated edge and tell other connections about it if report = true
+  - Mark it as inactive
+  - Remove the edge representing this connection
+  - Kill it with fire
   - Check if we need to retry making an outgoing connection
-  - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
-	cp();
+void terminate_connection(connection_t *c, bool report) {
+	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname);
 
-	if(c->status.remove)
-		return;
-
-	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)
+	if(c->node && c->node->connection == c)
 		c->node->connection = NULL;
 
-	if(c->socket)
-		closesocket(c->socket);
-
 	if(c->edge) {
 		if(report && !tunnelserver)
-			send_del_edge(broadcast, c->edge);
+			send_del_edge(everyone, c->edge);
 
 		edge_del(c->edge);
+		c->edge = NULL;
 
 		/* Run MST and SSSP algorithms */
 
@@ -199,24 +133,19 @@ void terminate_connection(connection_t *c, bool report)
 			e = lookup_edge(c->node, myself);
 			if(e) {
 				if(!tunnelserver)
-					send_del_edge(broadcast, e);
+					send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
 	}
 
-	/* Check if this was our outgoing connection */
+	outgoing_t *outgoing = c->outgoing;
+	connection_del(c);
 
-	if(c->outgoing) {
-		retry_outgoing(c->outgoing);
-		c->outgoing = NULL;
-	}
+	/* Check if this was our outgoing connection */
 
-	free(c->outbuf);
-	c->outbuf = NULL;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
+	if(outgoing)
+		do_outgoing_connection(outgoing);
 }
 
 /*
@@ -227,265 +156,266 @@ 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;
-	connection_t *c;
+static void timeout_handler(int fd, short events, void *event) {
+	time_t now = time(NULL);
 
-	cp();
-
-	for(node = connection_tree->head; node; node = next) {
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
 		next = node->next;
-		c = node->data;
+		connection_t *c = node->data;
+
+		if(c->status.control)
+			continue;
 
-		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);
-					c->status.timeout = true;
-					terminate_connection(c, true);
-				} else if(c->last_ping_time + pinginterval < now) {
+					logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)now - c->last_ping_time);
+				} 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) {
-					c->status.connecting = false;
-					closesocket(c->socket);
-					do_outgoing_connection(c);
 				} else {
-					terminate_connection(c, false);
+					continue;
 				}
+			} else {
+				if(c->status.connecting)
+					logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
+				else
+					logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
 			}
-		}
-
-		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);
-			}
+			terminate_connection(c, c->status.active);
 		}
 	}
-}
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
-{
-	connection_t *c;
-	avl_node_t *node;
-	int result, i;
-	socklen_t len = sizeof(result);
-	vpn_packet_t packet;
-
-	cp();
-
-	/* check input from kernel */
-	if(FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet)) {
-			packet.priority = 0;
-			route(myself, &packet);
-		}
+	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);
+		usleep(sleeptime * 1000000LL);
+		sleeptime *= 2;
+		if(sleeptime < 0)
+			sleeptime = 3600;
+	} else {
+		sleeptime /= 2;
+		if(sleeptime < 10)
+			sleeptime = 10;
 	}
 
-	/* check meta connections */
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	contradicting_add_edge = 0;
+	contradicting_del_edge = 0;
 
-		if(c->status.remove)
-			continue;
+	event_add(event, &(struct timeval){pingtimeout, 0});
+}
 
-		if(FD_ISSET(c->socket, readset)) {
-			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));
-					closesocket(c->socket);
-					do_outgoing_connection(c);
-					continue;
-				}
-			}
+void handle_meta_connection_data(int fd, short events, void *data) {
+	connection_t *c = data;
+	int result;
+	socklen_t len = sizeof result;
 
-			if(!receive_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
-		}
+	if(c->status.connecting) {
+		c->status.connecting = false;
 
-		if(FD_ISSET(c->socket, writeset)) {
-			if(!flush_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
+		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+
+		if(!result)
+			finish_connecting(c);
+		else {
+			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
+			terminate_connection(c, false);
+			return;
 		}
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		if(FD_ISSET(listen_socket[i].udp, readset))
-			handle_incoming_vpn_data(listen_socket[i].udp);
-
-		if(FD_ISSET(listen_socket[i].tcp, readset))
-			handle_new_meta_connection(listen_socket[i].tcp);
+	if (!receive_meta(c)) {
+		terminate_connection(c, c->status.active);
+		return;
 	}
 }
 
-/*
-  this is where it all happens...
-*/
-int main_loop(void)
-{
-	fd_set readset, writeset;
-	struct timeval tv;
-	int r, maxfd;
-	time_t last_ping_check, last_config_check, last_graph_dump;
-	event_t *event;
-
-	cp();
-
-	last_ping_check = now;
-	last_config_check = now;
-	last_graph_dump = now;
-	
-	srand(now);
+static void sigterm_handler(int signal, short events, void *data) {
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
+	event_loopexit(NULL);
+}
 
-	running = true;
+static void sighup_handler(int signal, short events, void *data) {
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
+	reopenlogger();
+	reload_configuration();
+}
 
-	while(running) {
-		now = time(NULL);
+static void sigalrm_handler(int signal, short events, void *data) {
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
+	retry();
+}
 
-	//	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) {
+	char *fname;
 
-		maxfd = build_fdset(&readset, &writeset);
+	/* Reread our own configuration file */
 
-		r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+	exit_configuration(&config_tree);
+	init_configuration(&config_tree);
 
-		if(r < 0) {
-			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, _("Error while waiting for input: %s"),
-					   strerror(errno));
-				cp_trace();
-				dump_connections();
-				return 1;
-			}
+	if(!read_server_config()) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file, exitting.");
+		event_loopexit(NULL);
+		return EINVAL;
+	}
 
-			continue;
-		}
+	read_config_options(config_tree, NULL);
 
-		check_network_activity(&readset, &writeset);
+        xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
+        read_config_file(config_tree, fname);
+	free(fname);	
 
-		if(do_purge) {
-			purge();
-			do_purge = false;
-		}
+	/* Parse some options that are allowed to be changed while tinc is running */
 
-		/* Let's check if everybody is still alive */
+	setup_myself_reloadable();
 
-		if(last_ping_check + pingtimeout < now) {
-			check_dead_connections();
-			last_ping_check = now;
+	/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
 
-			if(routing_mode == RMODE_SWITCH)
-				age_subnets();
+	if(strictsubnets) {
+		for(splay_node_t *node = subnet_tree->head; node; node = node->next) {
+			subnet_t *subnet = node->data;
+			subnet->expires = 1;
+		}
 
-			age_past_requests();
+		load_all_subnets();
+
+		for(splay_node_t *node = subnet_tree->head, *next; node; node = next) {
+			next = node->next;
+			subnet_t *subnet = node->data;
+			if(subnet->expires == 1) {
+				send_del_subnet(everyone, 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(everyone, subnet);
+				if(subnet->owner->status.reachable)
+					subnet_update(subnet->owner, subnet, true);
+			}
+		}
+	} else { /* Only read our own subnets back in */
+		for(splay_node_t *node = myself->subnet_tree->head; node; node = node->next) {
+			subnet_t *subnet = node->data;
+			if(!subnet->expires)
+				subnet->expires = 1;
+		}
 
-			/* Should we regenerate our key? */
+		config_t *cfg = lookup_config(config_tree, "Subnet");
 
-			if(keyexpires < now) {
-				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+		while(cfg) {
+			subnet_t *subnet, *s2;
 
-				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;
-			}
-		}
+			if(!get_config_subnet(cfg, &subnet))
+				continue;
 
+			if((s2 = lookup_subnet(myself, subnet))) {
+				if(s2->expires == 1)
+					s2->expires = 0;
 
-		while((event = get_expired_event())) {
-			event->handler(event->data);
-			free_event(event);
-		}
+				free_subnet(subnet);
+			} else {
+				subnet_add(myself, subnet);
+				send_add_subnet(everyone, subnet);
+				subnet_update(myself, subnet, true);
+			}
 
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			flush_events();
-			sigalrm = false;
+			cfg = lookup_config_next(config_tree, cfg);
 		}
 
-		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(splay_node_t *node = myself->subnet_tree->head, *next; node; node = next) {
+			next = node->next;
+			subnet_t *subnet = node->data;
+			if(subnet->expires == 1) {
+				send_del_subnet(everyone, subnet);
+				subnet_update(myself, subnet, false);
+				subnet_del(myself, subnet);
 			}
+		}
+	}
 
-			/* 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);
-			}
+	/* Try to make outgoing connections */
+	
+	try_outgoing_connections();
+
+	/* Close connections to hosts that have a changed or deleted host config file */
 
-			last_config_check = now;
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
+		connection_t *c = node->data;
+		next = node->next;
 
-			/* Try to make outgoing connections */
-			
-			try_outgoing_connections();
+		if(c->status.control)
+			continue;
+
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+		struct stat s;
+		if(stat(fname, &s) || s.st_mtime > last_config_check) {
+			logger(DEBUG_CONNECTIONS, LOG_INFO, "Host config file of %s has been changed", c->name);
+			terminate_connection(c, c->status.active);
 		}
-		
-		/* Dump graph if wanted every 60 seconds*/
+		free(fname);
+	}
+
+	last_config_check = time(NULL);
 
-		if(last_graph_dump + 60 < now) {
-			dump_graph();
-			last_graph_dump = now;
+	return 0;
+}
+
+void retry(void) {
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
+		next = node->next;
+		connection_t *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;
+			terminate_connection(c, c->status.active);
 		}
 	}
+}
+
+/*
+  this is where it all happens...
+*/
+int main_loop(void) {
+	struct event timeout_event;
+
+	timeout_set(&timeout_event, timeout_handler, &timeout_event);
+	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+
+#ifndef HAVE_MINGW
+	struct event sighup_event;
+	struct event sigterm_event;
+	struct event sigquit_event;
+	struct event sigalrm_event;
+
+	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+	signal_add(&sighup_event, NULL);
+	signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
+	signal_add(&sigterm_event, NULL);
+	signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
+	signal_add(&sigquit_event, NULL);
+	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
+	signal_add(&sigalrm_event, NULL);
+#endif
+
+	if(event_loop(0) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+		return 1;
+	}
+
+#ifndef HAVE_MINGW
+	signal_del(&sighup_event);
+	signal_del(&sigterm_event);
+	signal_del(&sigquit_event);
+	signal_del(&sigalrm_event);
+#endif
+
+	event_del(&timeout_event);
 
 	return 0;
 }