X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=8259a3672ba8a71403045fc3b7b4e3ec6262d4be;hb=0f6f54ff8aa96d981f68b5b71c7126b8fdbead6c;hp=a21850afd0c692038e244f8c37837325e6ee68a1;hpb=228e7a5c8f0e517dcede50f886965a44fca39853;p=tinc

diff --git a/src/net.c b/src/net.c
index a21850af..8259a367 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.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
@@ -29,7 +29,7 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
+#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -109,10 +109,10 @@ static void purge(void)
 }
 
 /*
-  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 *readset, fd_set *writeset)
+static int build_fdset(void)
 {
 	avl_node_t *node, *next;
 	connection_t *c;
@@ -120,9 +120,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
 
 	cp();
 
-	FD_ZERO(readset);
-	FD_ZERO(writeset);
-
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
@@ -131,29 +128,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
 			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;
+	return 0;
 }
 
 /*
@@ -182,6 +160,8 @@ 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);
@@ -241,7 +221,7 @@ static void check_dead_connections(void)
 		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 %d 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);
@@ -251,7 +231,7 @@ static void check_dead_connections(void)
 			} 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;
 				}
@@ -270,7 +250,7 @@ static void check_dead_connections(void)
 		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 %d seconds (%d bytes remaining)"),
+						_("%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);
@@ -279,88 +259,58 @@ static void check_dead_connections(void)
 	}
 }
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
+void handle_meta_connection_data(int fd, short events, void *data)
 {
-	connection_t *c;
-	avl_node_t *node;
-	int result, i;
-	int len = sizeof(result);
-	vpn_packet_t packet;
-
-	cp();
+	connection_t *c = data;
+	int result;
+	socklen_t len = sizeof(result);
 
-	/* check input from kernel */
-	if(FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet))
-			route(myself, &packet);
-	}
-
-	/* check meta connections */
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-
-		if(c->status.remove)
-			continue;
-
-		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;
-				}
-			}
-
-			if(!receive_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
-		}
+	if (c->status.remove)
+		return;
 
-		if(FD_ISSET(c->socket, writeset)) {
-			if(!flush_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
+	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);
+			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;
 	}
 }
 
+static void dummy(int a, short b, void *c)
+{
+}
+
 /*
   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;
-	event_t *event;
+	int r;
+	time_t last_ping_check, last_config_check, last_graph_dump;
+	tevent_t *event;
+	struct event timeout;
 
 	cp();
 
 	last_ping_check = now;
 	last_config_check = now;
+	last_graph_dump = now;
+	
 	srand(now);
 
 	running = true;
@@ -372,23 +322,30 @@ int main_loop(void)
 		tv.tv_sec = 1;
 		tv.tv_usec = 0;
 
-		maxfd = build_fdset(&readset, &writeset);
-
-		r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+		/* XXX: libevent transition: old timeout code in this loop */
+		timeout_set(&timeout, dummy, NULL);
+		timeout_add(&timeout, &tv);
 
+		r = build_fdset();
 		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;
-			}
+			logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
+			cp_trace();
+			dump_connections();
+			return 1;
+		}
 
-			continue;
+		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;
 		}
 
-		check_network_activity(&readset, &writeset);
+		/* XXX: more libevent transition */
+		timeout_del(&timeout);
 
 		if(do_purge) {
 			purge();
@@ -411,28 +368,23 @@ int main_loop(void)
 			if(keyexpires < now) {
 				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
 
-				RAND_pseudo_bytes(myself->key, myself->keylength);
+				RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
 				if(myself->cipher)
-					EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+					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;
 			}
 		}
 
 
-		while((event = get_expired_event())) {
+		while((event = get_expired_tevent())) {
 			event->handler(event->data);
-			free(event);
+			free_tevent(event);
 		}
 
 		if(sigalrm) {
 			logger(LOG_INFO, _("Flushing event queue"));
-
-			while(event_tree->head) {
-				event = event_tree->head->data;
-				event->handler(event->data);
-				event_del(event);
-			}
+			flush_tevents();
 			sigalrm = false;
 		}
 
@@ -461,7 +413,8 @@ int main_loop(void)
 				
 				if(c->outgoing) {
 					free(c->outgoing->name);
-					freeaddrinfo(c->outgoing->ai);
+					if(c->outgoing->ai)
+						freeaddrinfo(c->outgoing->ai);
 					free(c->outgoing);
 					c->outgoing = NULL;
 				}
@@ -478,6 +431,13 @@ int main_loop(void)
 			
 			try_outgoing_connections();
 		}
+		
+		/* Dump graph if wanted every 60 seconds*/
+
+		if(last_graph_dump + 60 < now) {
+			dump_graph();
+			last_graph_dump = now;
+		}
 	}
 
 	return 0;