Merge branch 'master' into 1.1

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 283ebd7127d2462a8cc3ff3b3ddedf3347f659b6..4a2ba4c09110394e8654f4ecc3728484878ddf3f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -22,7 +22,8 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -32,76 +33,49 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;   /* Meta connections */
+splay_tree_t *connection_tree; /* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
        return a < b ? -1 : a == b ? 0 : 1;
 }
 
-void init_connections(void)
-{
+void init_connections(void) {
        cp();
 
-       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);
        broadcast = new_connection();
        broadcast->name = xstrdup(_("everyone"));
        broadcast->hostname = xstrdup(_("BROADCAST"));
 }
 
-void exit_connections(void)
-{
+void exit_connections(void) {
        cp();
 
-       avl_delete_tree(connection_tree);
+       splay_delete_tree(connection_tree);
        free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
-       connection_t *c;
-
+connection_t *new_connection(void) {
        cp();
 
-       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)
-{
+void free_connection(connection_t *c) {
        cp();
 
+       if(!c)
+               return;
+
        if(c->name)
                free(c->name);
 
        if(c->hostname)
                free(c->hostname);
 
-       if(c->inkey)
-               free(c->inkey);
-
-       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);
+       cipher_close(&c->incipher);
+       cipher_close(&c->outcipher);
 
        if(c->hischallenge)
                free(c->hischallenge);
@@ -109,50 +83,46 @@ void free_connection(connection_t *c)
        if(c->config_tree)
                exit_configuration(&c->config_tree);
 
-       if(c->outbuf)
-               free(c->outbuf);
-
-       if(c->rsa_key)
-               RSA_free(c->rsa_key);
+       if(c->buffer)
+               bufferevent_free(c->buffer);
+       
+       if(event_initialized(&c->inevent))
+               event_del(&c->inevent);
 
        free(c);
 }
 
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
        cp();
 
-       avl_insert(connection_tree, c);
+       splay_insert(connection_tree, c);
 }
 
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
        cp();
 
-       avl_delete(connection_tree, c);
+       splay_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
-       avl_node_t *node;
+int dump_connections(struct evbuffer *out) {
+       splay_node_t *node;
        connection_t *c;
 
        cp();
 
-       logger(LOG_DEBUG, _("Connections:"));
-
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
-               logger(LOG_DEBUG, _(" %s at %s options %lx 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);
+               if(evbuffer_add_printf(out,
+                                  _(" %s at %s options %lx socket %d status %04x\n"),
+                                  c->name, c->hostname, c->options, c->socket,
+                                  bitfield_to_int(&c->status, sizeof c->status)) == -1)
+                       return errno;
        }
 
-       logger(LOG_DEBUG, _("End of connections."));
+       return 0;
 }
 
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
        char *fname;
        int x;