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

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 18c03c7e8c808377e843f10e77b836296b876f36..62bfccb64c852d5537f992904b13d81f9548096f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -27,8 +27,6 @@
 #include "control_common.h"
 #include "list.h"
 #include "logger.h"
-#include "net.h"                               /* Don't ask. */
-#include "netutl.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -67,7 +65,9 @@ void free_connection(connection_t *c) {
                free(c->hostname);
 
        cipher_close(&c->incipher);
+       digest_close(&c->indigest);
        cipher_close(&c->outcipher);
+       digest_close(&c->outdigest);
 
        if(c->hischallenge)
                free(c->hischallenge);
@@ -75,12 +75,15 @@ void free_connection(connection_t *c) {
        if(c->config_tree)
                exit_configuration(&c->config_tree);
 
-       if(c->buffer)
-               bufferevent_free(c->buffer);
+       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);
+
        free(c);
 }
 
@@ -106,14 +109,3 @@ bool dump_connections(connection_t *cdump) {
 
        return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }
-
-bool read_connection_config(connection_t *c) {
-       char *fname;
-       bool x;
-
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       x = read_config_file(c->config_tree, fname);
-       free(fname);
-
-       return x;
-}