X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=a7c781529c16fe99f990ca0a20b26b89fbcacb93;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=a39c2d2813f8532e32634ca01907cbf53fd3c8ee;hpb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index a39c2d28..a7c78152 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -24,6 +24,7 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "list.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -554,7 +555,7 @@ void handle_new_meta_connection(int sock, short events, void *data) {
 	event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
 	event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
 	event_add(&c->inevent, NULL);
-		
+
 	configure_tcp(c);
 
 	connection_add(c);
@@ -570,6 +571,9 @@ static void free_outgoing(outgoing_t *outgoing) {
 	if(outgoing->ai)
 		freeaddrinfo(outgoing->ai);
 
+	if(outgoing->config_tree)
+		exit_configuration(&outgoing->config_tree);
+
 	if(outgoing->name)
 		free(outgoing->name);
 
@@ -577,24 +581,19 @@ static void free_outgoing(outgoing_t *outgoing) {
 }
 
 void try_outgoing_connections(void) {
-	static config_t *cfg = NULL;
-	char *name;
-	outgoing_t *outgoing;
-	
 	/* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
 	if(!outgoing_list) {
 		outgoing_list = list_alloc((list_action_t)free_outgoing);
 	} else {
-		for(list_node_t *i = outgoing_list->head; i; i = i->next) {
-			outgoing = i->data;
+		for list_each(outgoing_t, outgoing, outgoing_list)
 			outgoing->timeout = -1;
-		}
 	}
 
 	/* Make sure there is one outgoing_t in the list for each ConnectTo. */
 
-	for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+	for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		char *name;
 		get_config_string(cfg, &name);
 
 		if(!check_id(name)) {
@@ -607,8 +606,7 @@ void try_outgoing_connections(void) {
 
 		bool found = false;
 
-		for(list_node_t *i = outgoing_list->head; i; i = i->next) {
-			outgoing = i->data;
+		for list_each(outgoing_t, outgoing, outgoing_list) {
 			if(!strcmp(outgoing->name, name)) {
 				found = true;
 				outgoing->timeout = 0;
@@ -617,7 +615,7 @@ void try_outgoing_connections(void) {
 		}
 
 		if(!found) {
-			outgoing = xmalloc_and_zero(sizeof *outgoing);
+			outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
 			outgoing->name = name;
 			list_insert_tail(outgoing_list, outgoing);
 			setup_outgoing_connection(outgoing);
@@ -626,9 +624,7 @@ void try_outgoing_connections(void) {
 
 	/* Terminate any connections whose outgoing_t is to be deleted. */
 
-	for(list_node_t *node = connection_list->head, *next; node; node = next) {
-		next = node->next;
-		connection_t *c = node->data;
+	for list_each(connection_t, c, connection_list) {
 		if(c->outgoing && c->outgoing->timeout == -1) {
 			c->outgoing = NULL;
 			logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name);
@@ -638,10 +634,7 @@ void try_outgoing_connections(void) {
 
 	/* Delete outgoing_ts for which there is no ConnectTo. */
 
-	for(list_node_t *node = outgoing_list->head, *next; node; node = next) {
-		next = node->next;
-		outgoing = node->data;
+	for list_each(outgoing_t, outgoing, outgoing_list)
 		if(outgoing->timeout == -1)
 			list_delete_node(outgoing_list, node);
-	}
 }