Merge branch 'master' into 1.1

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 06f51b50aac3e4b55dfe14ffa89d7c0321a83ee6..230ec4ede6b48ca3ae3560ba3ae0844c5407f647 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"
@@ -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);
        
@@ -115,9 +113,9 @@ int dump_connections(struct evbuffer *out) {
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
                if(evbuffer_add_printf(out,
-                                                          _(" %s at %s options %lx socket %d status %04x\n"),
-                                                          c->name, c->hostname, c->options, c->socket,
-                                                          c->status.value) == -1)
+                                  _(" %s at %s options %lx socket %d status %04x\n"),
+                                  c->name, c->hostname, c->options, c->socket,
+                                  c->status.value) == -1)
                        return errno;
        }