Merge branch 'master' into 1.1

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 9587819d03e3d8bedf04890b8ad3bc526b9631ac..fafec5db7e85e8e5b4a50b7d0da7990146a4e1a3 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2008      Max Rijevski <maksuf@gmail.com>
 
@@ -54,30 +54,20 @@ connection_t *new_connection(void) {
        return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void free_connection(connection_t *c) {
-       if(!c)
-               return;
-
-       if(c->name)
-               free(c->name);
-
-       if(c->hostname)
-               free(c->hostname);
-
+void free_connection_partially(connection_t *c) {
        cipher_close(&c->incipher);
        digest_close(&c->indigest);
        cipher_close(&c->outcipher);
        digest_close(&c->outdigest);
 
-       ecdh_free(&c->ecdh);
+       sptps_stop(&c->sptps);
        ecdsa_free(&c->ecdsa);
        rsa_free(&c->rsa);
 
-       if(c->hischallenge)
+       if(c->hischallenge) {
                free(c->hischallenge);
-
-       if(c->config_tree)
-               exit_configuration(&c->config_tree);
+               c->hischallenge = NULL;
+       }
 
        buffer_clear(&c->inbuf);
        buffer_clear(&c->outbuf);
@@ -91,6 +81,25 @@ void free_connection(connection_t *c) {
        if(c->socket > 0)
                closesocket(c->socket);
 
+       c->socket = -1;
+
+       c->protocol_major = 0;
+       c->protocol_minor = 0;
+       c->allow_request = 0;
+}
+
+void free_connection(connection_t *c) {
+       if(!c)
+               return;
+
+       free_connection_partially(c);
+
+       free(c->name);
+       free(c->hostname);
+
+       if(c->config_tree)
+               exit_configuration(&c->config_tree);
+
        free(c);
 }
 
@@ -108,7 +117,7 @@ bool dump_connections(connection_t *cdump) {
 
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
-               send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+               send_request(cdump, "%d %d %s %s %x %d %x",
                                CONTROL, REQ_DUMP_CONNECTIONS,
                                c->name, c->hostname, c->options, c->socket,
                                bitfield_to_int(&c->status, sizeof c->status));