Merge branch 'master' into dirtydebug

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index cbe704b537e24c246df59a5af43bd3f3e05456a1..55a7c981d3e7d46ef91e5a6aafe36474d42d8fbe 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2008      Max Rijevski <maksuf@gmail.com>
 
@@ -24,14 +24,14 @@
 #include "list.h"
 #include "cipher.h"
 #include "conf.h"
-#include "control_common.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "subnet.h"
+#include "rsa.h"
 #include "utils.h"
 #include "xalloc.h"
 
-list_t *connection_list;       /* Meta connections */
+list_t *connection_list;
 connection_t *everyone;
 
 void init_connections(void) {
@@ -47,32 +47,28 @@ void exit_connections(void) {
 }
 
 connection_t *new_connection(void) {
-       return xmalloc_and_zero(sizeof(connection_t));
+       return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
        if(!c)
                return;
 
-       cipher_close(&c->incipher);
-       digest_close(&c->indigest);
-       cipher_close(&c->outcipher);
-       digest_close(&c->outdigest);
+       cipher_close(c->incipher);
+       digest_close(c->indigest);
+       cipher_close(c->outcipher);
+       digest_close(c->outdigest);
 
        sptps_stop(&c->sptps);
-       ecdsa_free(&c->ecdsa);
-       rsa_free(&c->rsa);
+       ecdsa_free(c->ecdsa);
+       rsa_free(c->rsa);
 
        free(c->hischallenge);
 
        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,21 +87,5 @@ void connection_add(connection_t *c) {
 }
 
 void connection_del(connection_t *c) {
-       for list_each(connection_t, c, connection_list) {
-               if(node->data == c) {
-                       list_delete_node(connection_list, node);
-                       return;
-               }
-       }
-}
-
-bool dump_connections(connection_t *cdump) {
-       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,
-                               bitfield_to_int(&c->status, sizeof c->status));
-       }
-
-       return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
+       list_delete(connection_list, c);
 }