X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=33d90da8137d861864f0e61a923562ce3acdfdbf;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hp=e1580e651ad4d202d1769112ee8a0b05a1c22302;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219;p=tinc

diff --git a/src/net.c b/src/net.c
index e1580e65..33d90da8 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.195 2003/07/29 22:59:00 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -29,7 +29,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,18 +36,12 @@
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
-bool do_purge = false;
-
-time_t now = 0;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
+static void purge(void) {
 	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
@@ -58,9 +51,11 @@ static void purge(void)
 
 	ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
 
+	/* Remove all edges and subnets owned by unreachable nodes. */
+
 	for(nnode = node_tree->head; nnode; nnode = nnext) {
 		nnext = nnode->next;
-		n = (node_t *) nnode->data;
+		n = nnode->data;
 
 		if(!n->status.reachable) {
 			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
@@ -68,66 +63,66 @@ static void purge(void)
 
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
-				s = (subnet_t *) snode->data;
-				send_del_subnet(broadcast, s);
+				s = snode->data;
+				if(!tunnelserver)
+					send_del_subnet(broadcast, s);
 				subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
 				enext = enode->next;
-				e = (edge_t *) enode->data;
-				send_del_edge(broadcast, e);
+				e = enode->data;
+				if(!tunnelserver)
+					send_del_edge(broadcast, e);
 				edge_del(e);
 			}
+		}
+	}
+
+	/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
 
-			node_del(n);
+	for(nnode = node_tree->head; nnode; nnode = nnext) {
+		nnext = nnode->next;
+		n = nnode->data;
+
+		if(!n->status.reachable) {
+			for(enode = edge_weight_tree->head; enode; enode = enext) {
+				enext = enode->next;
+				e = enode->data;
+
+				if(e->to == n)
+					break;
+			}
+
+			if(!enode)
+				node_del(n);
 		}
 	}
 }
 
 /*
-  put all file descriptors in an fd_set array
-  While we're at it, purge stuff that needs to be removed.
+  put all file descriptors into events
+  While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(fd_set * fs)
-{
+static int build_fdset(void) {
 	avl_node_t *node, *next;
 	connection_t *c;
 	int i, max = 0;
 
 	cp();
 
-	FD_ZERO(fs);
-
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->status.remove) {
 			connection_del(c);
 			if(!connection_tree->head)
 				purge();
-		} else {
-			FD_SET(c->socket, fs);
-			if(c->socket > max)
-				max = c->socket;
 		}
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		FD_SET(listen_socket[i].tcp, fs);
-		if(listen_socket[i].tcp > max)
-			max = listen_socket[i].tcp;
-		FD_SET(listen_socket[i].udp, fs);
-		if(listen_socket[i].udp > max)
-			max = listen_socket[i].udp;
-	}
-
-	FD_SET(device_fd, fs);
-	if(device_fd > max)
-		max = device_fd;
-	
-	return max;
+	return 0;
 }
 
 /*
@@ -137,8 +132,7 @@ static int build_fdset(fd_set * fs)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
 	cp();
 
 	if(c->status.remove)
@@ -156,8 +150,10 @@ void terminate_connection(connection_t *c, bool report)
 	if(c->socket)
 		closesocket(c->socket);
 
+	event_del(&c->ev);
+
 	if(c->edge) {
-		if(report)
+		if(report && !tunnelserver)
 			send_del_edge(broadcast, c->edge);
 
 		edge_del(c->edge);
@@ -165,6 +161,18 @@ void terminate_connection(connection_t *c, bool report)
 		/* Run MST and SSSP algorithms */
 
 		graph();
+
+		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+		if(report && !c->node->status.reachable) {
+			edge_t *e;
+			e = lookup_edge(c->node, myself);
+			if(e) {
+				if(!tunnelserver)
+					send_del_edge(broadcast, e);
+				edge_del(e);
+			}
+		}
 	}
 
 	/* Check if this was our outgoing connection */
@@ -173,6 +181,12 @@ void terminate_connection(connection_t *c, bool report)
 		retry_outgoing(c->outgoing);
 		c->outgoing = NULL;
 	}
+
+	free(c->outbuf);
+	c->outbuf = NULL;
+	c->outbuflen = 0;
+	c->outbufsize = 0;
+	c->outbufstart = 0;
 }
 
 /*
@@ -183,230 +197,239 @@ 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)
-{
+static void timeout_handler(int fd, short events, void *event) {
 	avl_node_t *node, *next;
 	connection_t *c;
+	time_t now = time(NULL);
 
 	cp();
 
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		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"),
-							   c->name, c->hostname);
+					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 {
+				} 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, *(uint32_t *)&c->status);
+						   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);
-				terminate_connection(c, false);
+				if(c->status.connecting) {
+					c->status.connecting = false;
+					closesocket(c->socket);
+					do_outgoing_connection(c);
+				} else {
+					terminate_connection(c, false);
+				}
 			}
 		}
 	}
-}
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * f)
-{
-	connection_t *c;
-	avl_node_t *node;
-	int result, i;
-	int len = sizeof(result);
-	vpn_packet_t packet;
+	event_add(event, &(struct timeval){pingtimeout, 0});
+}
 
-	cp();
+void handle_meta_connection_data(int fd, short events, void *data) {
+	connection_t *c = data;
+	int result;
+	socklen_t len = sizeof(result);
 
-	if(FD_ISSET(device_fd, f)) {
-		if(read_packet(&packet))
-			route_outgoing(&packet);
-	}
-
-	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
-
-		if(c->status.remove)
-			continue;
-
-		if(FD_ISSET(c->socket, f)) {
-			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;
-				}
-			}
+	if (c->status.remove)
+		return;
 
-			if(!receive_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
+	if(c->status.connecting) {
+		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));
+			c->status.connecting = false;
+			closesocket(c->socket);
+			do_outgoing_connection(c);
+			return;
 		}
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		if(FD_ISSET(listen_socket[i].udp, f))
-			handle_incoming_vpn_data(listen_socket[i].udp);
-
-		if(FD_ISSET(listen_socket[i].tcp, f))
-			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...
-*/
-void main_loop(void)
-{
-	fd_set fset;
-	struct timeval tv;
-	int r, maxfd;
-	time_t last_ping_check, last_config_check;
-	event_t *event;
-
-	cp();
+static void sigterm_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	event_loopexit(NULL);
+}
 
-	last_ping_check = now;
-	last_config_check = now;
-	srand(now);
+static void sigint_handler(int signal, short events, void *data) {
+	static int saved_debug_level = -1;
+
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+	if(saved_debug_level != -1) {
+		logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+			saved_debug_level);
+		debug_level = saved_debug_level;
+		saved_debug_level = -1;
+	} else {
+		logger(LOG_NOTICE,
+			_("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
+			debug_level);
+		saved_debug_level = debug_level;
+		debug_level = 5;
+	}
+}
 
-	for(;;) {
-		now = time(NULL);
+static void sigusr1_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	dump_connections();
+}
 
-		tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-		tv.tv_usec = 0;
+static void sigusr2_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	dump_device_stats();
+	dump_nodes();
+	dump_edges();
+	dump_subnets();
+}
 
-		maxfd = build_fdset(&fset);
+static void sigwinch_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	purge();
+}
 
-		r = select(maxfd + 1, &fset, NULL, NULL, &tv);
+static void sighup_handler(int signal, short events, void *data) {
+	connection_t *c;
+	avl_node_t *node;
+	char *fname;
+	struct stat s;
+	static time_t last_config_check = 0;
+	
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
-		if(r < 0) {
-			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, _("Error while waiting for input: %s"),
-					   strerror(errno));
-				cp_trace();
-				dump_connections();
-				return;
-			}
+	/* Reread our own configuration file */
 
-			continue;
-		}
+	exit_configuration(&config_tree);
+	init_configuration(&config_tree);
 
-		check_network_activity(&fset);
+	if(!read_server_config()) {
+		logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+		event_loopexit(NULL);
+		return;
+	}
 
-		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 = 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);
+	}
 
-		/* Let's check if everybody is still alive */
-
-		if(last_ping_check + pingtimeout < now) {
-			check_dead_connections();
-			last_ping_check = now;
-
-			if(routing_mode == RMODE_SWITCH)
-				age_mac();
-
-			age_past_requests();
-
-			/* Should we regenerate our key? */
-
-			if(keyexpires < now) {
-				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
-				RAND_pseudo_bytes(myself->key, myself->keylength);
-				if(myself->cipher)
-					EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
-				send_key_changed(broadcast, myself);
-				keyexpires = now + keylifetime;
-			}
-		}
+	last_config_check = time(NULL);
 
+	/* Try to make outgoing connections */
+	
+	try_outgoing_connections();
+}
 
-		while((event = get_expired_event())) {
-			event->handler(event->data);
-			free(event);
-		}
+static void sigalrm_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
+	connection_t *c;
+	avl_node_t *node;
 
-			while(event_tree->head) {
-				event = (event_t *) event_tree->head->data;
-				event->handler(event->data);
-				event_del(event);
-			}
-			sigalrm = false;
+	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);
 		}
+	}
+}
 
-		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."));
-				exit(1);
-			}
-
-			/* Close connections to hosts that have a changed or deleted host config file */
-			
-			for(node = connection_tree->head; node; node = node->next) {
-				c = (connection_t *) node->data;
-				
-				if(c->outgoing) {
-					free(c->outgoing->name);
-					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 timeval tv;
+	int r;
+	struct event timeout_event;
+	struct event sighup_event;
+	struct event sigint_event;
+	struct event sigterm_event;
+	struct event sigquit_event;
+	struct event sigusr1_event;
+	struct event sigusr2_event;
+	struct event sigwinch_event;
+	struct event sigalrm_event;
 
-			last_config_check = now;
+	cp();
 
-			/* Try to make outgoing connections */
-			
-			try_outgoing_connections();
-						
-			continue;
-		}
+	timeout_set(&timeout_event, timeout_handler, &timeout_event);
+	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+	signal_add(&sighup_event, NULL);
+	signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
+	signal_add(&sigint_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(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
+	signal_add(&sigusr1_event, NULL);
+	signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
+	signal_add(&sigusr2_event, NULL);
+	signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
+	signal_add(&sigwinch_event, NULL);
+	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
+	signal_add(&sigalrm_event, NULL);
+
+	if(event_loop(0) < 0) {
+		logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+		return 1;
 	}
+
+	signal_del(&sighup_event);
+	signal_del(&sigint_event);
+	signal_del(&sigterm_event);
+	signal_del(&sigquit_event);
+	signal_del(&sigusr1_event);
+	signal_del(&sigusr2_event);
+	signal_del(&sigwinch_event);
+	signal_del(&sigalrm_event);
+	event_del(&timeout_event);
+
+	return 0;
 }