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

diff --git a/src/connection.c b/src/connection.c
index 6fdd2bc4..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,15 +81,6 @@ void free_connection_partially(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);
 
@@ -113,7 +104,7 @@ bool dump_connections(connection_t *cdump) {
 
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
-		send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+		send_request(cdump, "%d %d %s %s %x %d %x",
 				CONTROL, REQ_DUMP_CONNECTIONS,
 				c->name, c->hostname, c->options, c->socket,
 				bitfield_to_int(&c->status, sizeof c->status));