Merge branch 'master' into 1.1

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 21cb6aa93398229ad9bb848134d23557104c6ac9..4a2ba4c09110394e8654f4ecc3728484878ddf3f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -36,7 +37,7 @@ splay_tree_t *connection_tree;        /* Meta connections */
 connection_t *broadcast;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
-       return (void *)a - (void *)b;
+       return a < b ? -1 : a == b ? 0 : 1;
 }
 
 void init_connections(void) {
@@ -73,18 +74,15 @@ void free_connection(connection_t *c) {
        if(c->hostname)
                free(c->hostname);
 
-       if(c->inkey)
-               free(c->inkey);
-
-       if(c->outkey)
-               free(c->outkey);
-
-       if(c->mychallenge)
-               free(c->mychallenge);
+       cipher_close(&c->incipher);
+       cipher_close(&c->outcipher);
 
        if(c->hischallenge)
                free(c->hischallenge);
 
+       if(c->config_tree)
+               exit_configuration(&c->config_tree);
+
        if(c->buffer)
                bufferevent_free(c->buffer);
        
@@ -106,21 +104,22 @@ void connection_del(connection_t *c) {
        splay_delete(connection_tree, c);
 }
 
-void dump_connections(void) {
+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"),
-                          c->name, c->hostname, c->options, c->socket, c->status.value);
+               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) {
@@ -129,7 +128,7 @@ bool read_connection_config(connection_t *c) {
 
        cp();
 
-       asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
        x = read_config_file(c->config_tree, fname);
        free(fname);