X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=5beea4d97d0067a739cfea6bdae33716f6704c75;hb=601f3b2dd746ff5726eca256861f2ecf662b3a55;hp=18c03c7e8c808377e843f10e77b836296b876f36;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 18c03c7e..5beea4d9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -67,7 +67,9 @@ void free_connection(connection_t *c) {
 		free(c->hostname);
 
 	cipher_close(&c->incipher);
+	digest_close(&c->indigest);
 	cipher_close(&c->outcipher);
+	digest_close(&c->outdigest);
 
 	if(c->hischallenge)
 		free(c->hischallenge);
@@ -75,12 +77,15 @@ void free_connection(connection_t *c) {
 	if(c->config_tree)
 		exit_configuration(&c->config_tree);
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
 	
 	if(event_initialized(&c->inevent))
 		event_del(&c->inevent);
 
+	if(event_initialized(&c->outevent))
+		event_del(&c->outevent);
+
 	free(c);
 }
 
@@ -106,14 +111,3 @@ bool dump_connections(connection_t *cdump) {
 
 	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }
-
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	bool x;
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
-
-	return x;
-}