X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=4798c5a4867b3b5f1a6294d91662f72652f1bc63;hb=1be7dc759a64d436fd7586aad43b545f2dc665b5;hp=3591f13e4350bea2055b24e6627e535e1fcf39ab;hpb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 3591f13e..4798c5a4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -31,7 +31,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-list_t *connection_list;	/* Meta connections */
+list_t *connection_list;
 connection_t *everyone;
 
 void init_connections(void) {
@@ -67,12 +67,8 @@ void free_connection(connection_t *c) {
 
 	buffer_clear(&c->inbuf);
 	buffer_clear(&c->outbuf);
-	
-	if(event_initialized(&c->inevent))
-		event_del(&c->inevent);
 
-	if(event_initialized(&c->outevent))
-		event_del(&c->outevent);
+	io_del(&c->io);
 
 	if(c->socket > 0)
 		closesocket(c->socket);
@@ -91,18 +87,11 @@ void connection_add(connection_t *c) {
 }
 
 void connection_del(connection_t *c) {
-	for(list_node_t *node = connection_list->head; node; node = node->next) {
-		if(node->data == c) {
-			list_delete_node(connection_list, node);
-			return;
-		}
-	}
+	list_delete(connection_list, c);
 }
 
 bool dump_connections(connection_t *cdump) {
-	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) {
 		send_request(cdump, "%d %d %s %s %x %d %x",
 				CONTROL, REQ_DUMP_CONNECTIONS,
 				c->name, c->hostname, c->options, c->socket,