X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fconnection.c;h=8966d65dac02fc591b45d4a60aa32db40a9dd59f;hp=e7ea9b2aec91d93d55a673b359f545a1ef49e85d;hb=42ed8fd4cf3b3e527a38c03d713739fcdc6bf520;hpb=64771f73ebbff04262defcde59263e98f89f0fa1

diff --git a/src/connection.c b/src/connection.c
index e7ea9b2..8966d65 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>
 
@@ -29,7 +29,7 @@
 #include "xalloc.h"
 
 avl_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;
@@ -37,14 +37,14 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 
 void init_connections(void) {
 	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_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) {
 	avl_delete_tree(connection_tree);
-	free_connection(broadcast);
+	free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
@@ -60,44 +60,67 @@ connection_t *new_connection(void) {
 	return c;
 }
 
-void free_connection(connection_t *c) {
-	if(c->name)
-		free(c->name);
-
-	if(c->hostname)
-		free(c->hostname);
-
-	if(c->inkey)
-		free(c->inkey);
-
-	if(c->outkey)
-		free(c->outkey);
+void free_connection_partially(connection_t *c) {
+	free(c->inkey);
+	free(c->outkey);
+	free(c->mychallenge);
+	free(c->hischallenge);
+	free(c->outbuf);
+
+	c->inkey = NULL;
+	c->outkey = NULL;
+	c->mychallenge = NULL;
+	c->hischallenge = NULL;
+	c->outbuf = NULL;
+
+	c->status.pinged = false;
+	c->status.active = false;
+	c->status.connecting = false;
+	c->status.timeout = false;
+	c->status.encryptout = false;
+	c->status.decryptin = false;
+	c->status.mst = false;
+
+	c->options = 0;
+	c->buflen = 0;
+	c->reqlen = 0;
+	c->tcplen = 0;
+	c->allow_request = 0;
+	c->outbuflen = 0;
+	c->outbufsize = 0;
+	c->outbufstart = 0;
+	c->last_ping_time = 0;
+	c->last_flushed_time = 0;
+	c->inbudget = 0;
+	c->outbudget = 0;
 
 	if(c->inctx) {
 		EVP_CIPHER_CTX_cleanup(c->inctx);
 		free(c->inctx);
+		c->inctx = NULL;
 	}
 
 	if(c->outctx) {
 		EVP_CIPHER_CTX_cleanup(c->outctx);
 		free(c->outctx);
+		c->outctx = NULL;
+	}
+
+	if(c->rsa_key) {
+		RSA_free(c->rsa_key);
+		c->rsa_key = NULL;
 	}
+}
 
-	if(c->mychallenge)
-		free(c->mychallenge);
+void free_connection(connection_t *c) {
+	free_connection_partially(c);
 
-	if(c->hischallenge)
-		free(c->hischallenge);
+	free(c->name);
+	free(c->hostname);
 
 	if(c->config_tree)
 		exit_configuration(&c->config_tree);
 
-	if(c->outbuf)
-		free(c->outbuf);
-
-	if(c->rsa_key)
-		RSA_free(c->rsa_key);
-
 	free(c);
 }