X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=9d4a0a2bf6e7bd889fff7b8d554bc9141feb7c56;hb=1065879c8c6e8cdf8d3755024241f31eaabd4138;hp=d78770e12c7da38c38339eba8d88d92a714bed96;hpb=ce976717ea9756aa985699547fdbf132b694748d;p=tinc

diff --git a/src/net.c b/src/net.c
index d78770e1..9d4a0a2b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -41,7 +41,7 @@
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void) {
+void purge(void) {
 	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
@@ -121,8 +121,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);
@@ -146,20 +144,12 @@ void terminate_connection(connection_t *c, bool report) {
 		}
 	}
 
-	free(c->outbuf);
-	c->outbuf = NULL;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
-
 	/* Check if this was our outgoing connection */
 
-	if(c->outgoing) {
+	if(c->outgoing)
 		retry_outgoing(c->outgoing);
-		c->outgoing = NULL;
-	} else {
-		connection_del(c);
-	}
+
+	connection_del(c);
 }
 
 /*
@@ -186,20 +176,20 @@ static void timeout_handler(int fd, short events, void *event) {
 				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);
 					continue;
 				} else if(c->last_ping_time + pinginterval < now) {
 					send_ping(c);
 				}
 			} else {
-				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;
 				}
@@ -216,6 +206,8 @@ void handle_meta_connection_data(int fd, short events, void *data) {
 	socklen_t len = sizeof(result);
 
 	if(c->status.connecting) {
+		c->status.connecting = false;
+
 		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
 		if(!result)
@@ -224,7 +216,6 @@ void handle_meta_connection_data(int fd, short events, void *data) {
 			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;
@@ -261,27 +252,9 @@ static void sigint_handler(int signal, short events, void *data) {
 	}
 }
 
-static void sigusr1_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	dump_connections();
-}
-
-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();
-}
-
-static void sigwinch_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	purge();
-}
-
 static void sighup_handler(int signal, short events, void *data) {
 	connection_t *c;
-	splay_node_t *node;
+	splay_node_t *node, *next;
 	char *fname;
 	struct stat s;
 	static time_t last_config_check = 0;
@@ -301,8 +274,9 @@ static void sighup_handler(int signal, short events, void *data) {
 
 	/* Close connections to hosts that have a changed or deleted host config file */
 	
-	for(node = connection_tree->head; node; node = node->next) {
+	for(node = connection_tree->head; node; node = next) {
 		c = node->data;
+		next = node->next;
 		
 		if(c->outgoing) {
 			free(c->outgoing->name);
@@ -354,9 +328,6 @@ int main_loop(void) {
 	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;
 
 	cp();
@@ -371,12 +342,6 @@ int main_loop(void) {
 	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);
 
@@ -389,9 +354,6 @@ int main_loop(void) {
 	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);