X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=7fbb0fc03a177ebc1823b0cc0afdf12653f56a0a;hb=4d440336c3ce68719e23b2fc51fac368e23352ad;hp=519cf5b39bb507f0b1b997d149aa7608b6e08b6b;hpb=edebf579f2ea29e6e84360cb13731f5858a1555b;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 519cf5b3..7fbb0fc0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -75,12 +75,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 +109,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;
-	int x;
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
-
-	return x == 0;
-}