X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=7999b6fb08a28ef1146324f2890f11f93f43ff57;hp=0293100e709400b39afae9d79724db76ec0e5c43;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hpb=d93a37928b75b17ac5e1eae5c2d62fd0760a6608

diff --git a/src/connection.c b/src/connection.c
index 0293100e..7999b6fb 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -54,7 +54,10 @@ connection_t *new_connection(void) {
 	return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void free_connection_partially(connection_t *c) {
+void free_connection(connection_t *c) {
+	if(!c)
+		return;
+
 	cipher_close(&c->incipher);
 	digest_close(&c->indigest);
 	cipher_close(&c->outcipher);
@@ -64,10 +67,7 @@ void free_connection_partially(connection_t *c) {
 	ecdsa_free(&c->ecdsa);
 	rsa_free(&c->rsa);
 
-	if(c->hischallenge) {
-		free(c->hischallenge);
-		c->hischallenge = NULL;
-	}
+	free(c->hischallenge);
 
 	buffer_clear(&c->inbuf);
 	buffer_clear(&c->outbuf);
@@ -81,31 +81,6 @@ void free_connection_partially(connection_t *c) {
 	if(c->socket > 0)
 		closesocket(c->socket);
 
-	c->socket = -1;
-
-	c->options = 0;
-	c->status.pinged = false;
-	c->status.connecting = false;
-	c->status.encryptout = false;
-	c->status.decryptin = false;
-	c->status.mst = false;
-	c->status.control = false;
-	c->status.pcap = false;
-	c->status.log = false;
-
-	c->protocol_major = 0;
-	c->protocol_minor = 0;
-	c->allow_request = 0;
-	c->tcplen = 0;
-	c->last_ping_time = 0;
-}
-
-void free_connection(connection_t *c) {
-	if(!c)
-		return;
-
-	free_connection_partially(c);
-
 	free(c->name);
 	free(c->hostname);