Drop libevent and use our own event handling again.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 3591f13..4798c5a 100644 (file)
--- 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,