Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 0211845..9587819 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,14 +21,17 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
+#include "control_common.h"
+#include "list.h"
 #include "logger.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;   /* Meta connections */
+splay_tree_t *connection_tree; /* Meta connections */
 connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
@@ -36,55 +39,39 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 }
 
 void init_connections(void) {
-       connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+       connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
        everyone = new_connection();
        everyone->name = xstrdup("everyone");
        everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-       avl_delete_tree(connection_tree);
+       splay_delete_tree(connection_tree);
        free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
-       connection_t *c;
-
-       c = xmalloc_and_zero(sizeof(connection_t));
-
-       if(!c)
-               return NULL;
-
-       gettimeofday(&c->start, NULL);
-
-       return c;
+       return xmalloc_and_zero(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
+       if(!c)
+               return;
+
        if(c->name)
                free(c->name);
 
        if(c->hostname)
                free(c->hostname);
 
-       if(c->inkey)
-               free(c->inkey);
+       cipher_close(&c->incipher);
+       digest_close(&c->indigest);
+       cipher_close(&c->outcipher);
+       digest_close(&c->outdigest);
 
-       if(c->outkey)
-               free(c->outkey);
-
-       if(c->inctx) {
-               EVP_CIPHER_CTX_cleanup(c->inctx);
-               free(c->inctx);
-       }
-
-       if(c->outctx) {
-               EVP_CIPHER_CTX_cleanup(c->outctx);
-               free(c->outctx);
-       }
-
-       if(c->mychallenge)
-               free(c->mychallenge);
+       ecdh_free(&c->ecdh);
+       ecdsa_free(&c->ecdsa);
+       rsa_free(&c->rsa);
 
        if(c->hischallenge)
                free(c->hischallenge);
@@ -92,35 +79,40 @@ void free_connection(connection_t *c) {
        if(c->config_tree)
                exit_configuration(&c->config_tree);
 
-       if(c->outbuf)
-               free(c->outbuf);
+       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);
 
-       if(c->rsa_key)
-               RSA_free(c->rsa_key);
+       if(c->socket > 0)
+               closesocket(c->socket);
 
        free(c);
 }
 
 void connection_add(connection_t *c) {
-       avl_insert(connection_tree, c);
+       splay_insert(connection_tree, c);
 }
 
 void connection_del(connection_t *c) {
-       avl_delete(connection_tree, c);
+       splay_delete(connection_tree, c);
 }
 
-void dump_connections(void) {
-       avl_node_t *node;
+bool dump_connections(connection_t *cdump) {
+       splay_node_t *node;
        connection_t *c;
 
-       logger(LOG_DEBUG, "Connections:");
-
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
-               logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
-                          c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
-                          c->outbufsize, c->outbufstart, c->outbuflen);
+               send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+                               CONTROL, REQ_DUMP_CONNECTIONS,
+                               c->name, c->hostname, c->options, c->socket,
+                               bitfield_to_int(&c->status, sizeof c->status));
        }
 
-       logger(LOG_DEBUG, "End of connections.");
+       return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }