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 519cf5b..9587819 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -27,14 +27,12 @@
 #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"
 
 splay_tree_t *connection_tree; /* Meta connections */
-connection_t *broadcast;
+connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
        return a < b ? -1 : a == b ? 0 : 1;
@@ -42,14 +40,14 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 
 void init_connections(void) {
        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");
+       everyone = new_connection();
+       everyone->name = xstrdup("everyone");
+       everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
        splay_delete_tree(connection_tree);
-       free_connection(broadcast);
+       free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
@@ -67,7 +65,13 @@ 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);
+
+       ecdh_free(&c->ecdh);
+       ecdsa_free(&c->ecdsa);
+       rsa_free(&c->rsa);
 
        if(c->hischallenge)
                free(c->hischallenge);
@@ -75,12 +79,18 @@ 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);
+
+       if(c->socket > 0)
+               closesocket(c->socket);
+
        free(c);
 }
 
@@ -106,14 +116,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;
-       int x;
-
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       x = read_config_file(c->config_tree, fname);
-       free(fname);
-
-       return x == 0;
-}