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 956607c..dd52448 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>
 
@@ -32,7 +32,7 @@
 #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;
@@ -40,44 +40,33 @@ 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) {
        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);
 
+       sptps_stop(&c->sptps);
        ecdsa_free(&c->ecdsa);
        rsa_free(&c->rsa);
 
        if(c->hischallenge)
                free(c->hischallenge);
 
-       if(c->config_tree)
-               exit_configuration(&c->config_tree);
-
        buffer_clear(&c->inbuf);
        buffer_clear(&c->outbuf);
        
@@ -87,6 +76,24 @@ void free_connection(connection_t *c) {
        if(event_initialized(&c->outevent))
                event_del(&c->outevent);
 
+       if(c->socket > 0)
+               closesocket(c->socket);
+
+       c->socket = -1;
+}
+
+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);
 }