X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=2fa789bdf6ba01cb47eb7d3eed2a80085d4b11e4;hb=9de37fa18e63d71a4676e9d1c9820b09861c949b;hp=2372890dd393d6e9ff122a708f6ee2510c157d2a;hpb=c4afc481541bff4db7f57c81796b7a5f61cdb1b5;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 2372890d..2fa789bd 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -24,6 +24,7 @@
 #include "splay_tree.h"
 #include "cipher.h"
 #include "conf.h"
+#include "control_common.h"
 #include "list.h"
 #include "logger.h"
 #include "net.h"				/* Don't ask. */
@@ -74,11 +75,8 @@ void free_connection(connection_t *c) {
 	if(c->config_tree)
 		exit_configuration(&c->config_tree);
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
-	
-	if(event_initialized(&c->inevent))
-		event_del(&c->inevent);
+	if(c->thread)
+		thread_destroy(&c->thread);
 
 	free(c);
 }
@@ -91,29 +89,17 @@ void connection_del(connection_t *c) {
 	splay_delete(connection_tree, c);
 }
 
-int dump_connections(struct evbuffer *out) {
+bool dump_connections(connection_t *cdump) {
 	splay_node_t *node;
 	connection_t *c;
 
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
-		if(evbuffer_add_printf(out,
-				   " %s at %s options %x socket %d status %04x\n",
-				   c->name, c->hostname, c->options, c->socket,
-				   bitfield_to_int(&c->status, sizeof c->status)) == -1)
-			return errno;
+		send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+				CONTROL, REQ_DUMP_CONNECTIONS,
+				c->name, c->hostname, c->options, c->socket,
+				bitfield_to_int(&c->status, sizeof c->status));
 	}
 
-	return 0;
-}
-
-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;
+	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }