X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=6fdd2bc4c5e413efba8e178a14a847b53db70c4f;hb=d3f4cf59ca917386e7c6358a98adbe3b8e9ce87a;hp=ee44e539acabadccf7a5818519a593eaec0b5495;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc

diff --git a/src/connection.c b/src/connection.c
index ee44e539..6fdd2bc4 100644
--- 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,16 +54,7 @@ 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);
@@ -73,11 +64,10 @@ void free_connection(connection_t *c) {
 	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,21 @@ void free_connection(connection_t *c) {
 	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);
 }