X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=38b3ccfe1b91c675fd5e7783b89474a5c2778c67;hp=0211845b89521aa6a077a20a4a9b3bd83559f7a4;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=ea415ccc1690d6e5864a7500977b181e5c8faafe

diff --git a/src/connection.c b/src/connection.c
index 0211845b..38b3ccfe 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-2016 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2008      Max Rijevski <maksuf@gmail.com>
 
@@ -28,7 +28,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
+avl_tree_t *connection_tree;    /* Meta connections */
 connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
@@ -52,51 +52,76 @@ connection_t *new_connection(void) {
 
 	c = xmalloc_and_zero(sizeof(connection_t));
 
-	if(!c)
+	if(!c) {
 		return NULL;
+	}
 
 	gettimeofday(&c->start, NULL);
 
 	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->mychallenge)
-		free(c->mychallenge);
-
-	if(c->hischallenge)
-		free(c->hischallenge);
+	if(c->rsa_key) {
+		RSA_free(c->rsa_key);
+		c->rsa_key = NULL;
+	}
+}
 
-	if(c->config_tree)
-		exit_configuration(&c->config_tree);
+void free_connection(connection_t *c) {
+	free_connection_partially(c);
 
-	if(c->outbuf)
-		free(c->outbuf);
+	free(c->name);
+	free(c->hostname);
 
-	if(c->rsa_key)
-		RSA_free(c->rsa_key);
+	if(c->config_tree) {
+		exit_configuration(&c->config_tree);
+	}
 
 	free(c);
 }
@@ -118,8 +143,8 @@ void dump_connections(void) {
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
 		logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
-			   c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
-			   c->outbufsize, c->outbufstart, c->outbuflen);
+		       c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof(c->status)),
+		       c->outbufsize, c->outbufstart, c->outbuflen);
 	}
 
 	logger(LOG_DEBUG, "End of connections.");