From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 20 Jan 2009 12:12:41 +0000 (+0100)
Subject: Use a global list to track outgoing connections.
X-Git-Tag: import-tinc-1.1~596^2~11
X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;ds=inline;h=503c32eb0ef9d6329e931559082f4ddf6d487dc6;hp=a7e793c94ec414eb71ec2aa3debc9e2e5ed5cfef;p=meshlink

Use a global list to track outgoing connections.

Previously an outgoing_t was maintained for each outgoing connection,
but the pointer to it was either stored in a connection_t or in an event_t.
This made it very hard to keep track of and to clean up.

Now a list is created when tinc starts and reads all the ConnectTo variables,
and which is recreated when tinc receives a HUP signal.
---

diff --git a/src/event.c b/src/event.c
index 5df05277..359fa428 100644
--- a/src/event.c
+++ b/src/event.c
@@ -124,7 +124,9 @@ event_t *get_expired_event(void)
 		event = event_tree->head->data;
 
 		if(event->time < now) {
-			avl_unlink_node(event_tree, event_tree->head);
+			avl_node_t *node = event_tree->head;
+			avl_unlink_node(event_tree, node);
+			free(node);
 			return event;
 		}
 	}
diff --git a/src/net.c b/src/net.c
index 1de5f1fb..ca9db7cf 100644
--- a/src/net.c
+++ b/src/net.c
@@ -457,14 +457,6 @@ int main_loop(void)
 			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);
diff --git a/src/net.h b/src/net.h
index d845f1a8..487fcae4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -103,6 +103,7 @@ typedef struct listen_socket_t {
 } listen_socket_t;
 
 #include "conf.h"
+#include "list.h"
 
 typedef struct outgoing_t {
 	char *name;
@@ -112,6 +113,8 @@ typedef struct outgoing_t {
 	struct addrinfo *aip;
 } outgoing_t;
 
+extern list_t *outgoing_list;
+
 extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
diff --git a/src/net_setup.c b/src/net_setup.c
index f52afb04..c413792a 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -571,18 +571,12 @@ void close_network_connections(void)
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
-
-		if(c->outgoing) {
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing->name);
-			free(c->outgoing);
-			c->outgoing = NULL;
-		}
-
+		c->outgoing = false;
 		terminate_connection(c, false);
 	}
 
+	list_delete_list(outgoing_list);
+
 	if(myself && myself->connection) {
 		subnet_update(myself, NULL, false);
 		terminate_connection(myself->connection, false);
diff --git a/src/net_socket.c b/src/net_socket.c
index f7781bc4..15988e82 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -49,6 +49,7 @@ int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
+list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
@@ -404,8 +405,6 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 	if(!outgoing->cfg) {
 		logger(LOG_ERR, _("No address specified for %s"), c->name);
 		free_connection(c);
-		free(outgoing->name);
-		free(outgoing);
 		return;
 	}
 
@@ -464,14 +463,37 @@ bool handle_new_meta_connection(int sock)
 	return true;
 }
 
+void free_outgoing(outgoing_t *outgoing) {
+	if(outgoing->ai)
+		freeaddrinfo(outgoing->ai);
+
+	if(outgoing->name)
+		free(outgoing->name);
+
+	free(outgoing);
+}
+
 void try_outgoing_connections(void)
 {
 	static config_t *cfg = NULL;
 	char *name;
 	outgoing_t *outgoing;
-
+	connection_t *c;
+	avl_node_t *node;
+	
 	cp();
 
+	if(outgoing_list) {
+		for(node = connection_tree->head; node; node = node->next) {
+			c = node->data;
+			c->outgoing = NULL;
+		}
+
+		list_delete_list(outgoing_list);
+	}
+
+	outgoing_list = list_alloc((list_action_t)free_outgoing);
+			
 	for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
 		get_config_string(cfg, &name);
 
@@ -485,6 +507,7 @@ void try_outgoing_connections(void)
 
 		outgoing = xmalloc_and_zero(sizeof(*outgoing));
 		outgoing->name = name;
+		list_insert_tail(outgoing_list, outgoing);
 		setup_outgoing_connection(outgoing);
 	}
 }
diff --git a/src/node.c b/src/node.c
index b0965301..20453612 100644
--- a/src/node.c
+++ b/src/node.c
@@ -102,10 +102,8 @@ void free_node(node_t *n)
 
 	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
 
-	if(n->mtuevent) {
+	if(n->mtuevent)
 		event_del(n->mtuevent);
-		free_event(n->mtuevent);
-	}
 	
 	if(n->hostname)
 		free(n->hostname);