X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=06f51b50aac3e4b55dfe14ffa89d7c0321a83ee6;hb=d82fcc88f355e3c8144478a860dfae0b299004a9;hp=a369cb83d900827a5741c77343de39bc64c5dafe;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc

diff --git a/src/connection.c b/src/connection.c
index a369cb83..06f51b50 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,7 +23,6 @@
 #include "system.h"
 
 #include "splay_tree.h"
-#include "cipher.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -74,8 +73,14 @@ void free_connection(connection_t *c) {
 	if(c->hostname)
 		free(c->hostname);
 
-	cipher_close(&c->incipher);
-	cipher_close(&c->outcipher);
+	if(c->inkey)
+		free(c->inkey);
+
+	if(c->outkey)
+		free(c->outkey);
+
+	if(c->mychallenge)
+		free(c->mychallenge);
 
 	if(c->hischallenge)
 		free(c->hischallenge);
@@ -101,21 +106,22 @@ void connection_del(connection_t *c) {
 	splay_delete(connection_tree, c);
 }
 
-void dump_connections(void) {
+int dump_connections(struct evbuffer *out) {
 	splay_node_t *node;
 	connection_t *c;
 
 	cp();
 
-	logger(LOG_DEBUG, _("Connections:"));
-
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
-		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
-			   c->name, c->hostname, c->options, c->socket, c->status.value);
+		if(evbuffer_add_printf(out,
+							   _(" %s at %s options %lx socket %d status %04x\n"),
+							   c->name, c->hostname, c->options, c->socket,
+							   c->status.value) == -1)
+			return errno;
 	}
 
-	logger(LOG_DEBUG, _("End of connections."));
+	return 0;
 }
 
 bool read_connection_config(connection_t *c) {