Close meta connection socket after cleaning up event structures.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index ce4c753..713a40c 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -24,10 +24,9 @@
 #include "splay_tree.h"
 #include "cipher.h"
 #include "conf.h"
+#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"
@@ -66,7 +65,12 @@ 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);
+
+       ecdsa_free(&c->ecdsa);
+       rsa_free(&c->rsa);
 
        if(c->hischallenge)
                free(c->hischallenge);
@@ -74,12 +78,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);
 }
 
@@ -91,29 +101,17 @@ void connection_del(connection_t *c) {
        splay_delete(connection_tree, c);
 }
 
-int dump_connections(struct evbuffer *out) {
+bool dump_connections(connection_t *cdump) {
        splay_node_t *node;
        connection_t *c;
 
        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,
-                                  bitfield_to_int(&c->status, sizeof c->status)) == -1)
-                       return errno;
+               send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+                               CONTROL, REQ_DUMP_CONNECTIONS,
+                               c->name, c->hostname, c->options, c->socket,
+                               bitfield_to_int(&c->status, sizeof c->status));
        }
 
-       return 0;
-}
-
-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;
+       return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }