X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=3591f13e4350bea2055b24e6627e535e1fcf39ab;hp=84d2ac4de2f743fa6f106507794d35756266dd3e;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hpb=046158a216e78a0412186ec8463157f6bce45d5d

diff --git a/src/connection.c b/src/connection.c
index 84d2ac4d..3591f13e 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,8 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
+                  2008      Max Rijevski <maksuf@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,121 +14,100 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include "splay_tree.h"
+#include "list.h"
 #include "cipher.h"
 #include "conf.h"
+#include "control_common.h"
 #include "list.h"
 #include "logger.h"
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *connection_tree;	/* Meta connections */
-connection_t *broadcast;
-
-static int connection_compare(const connection_t *a, const connection_t *b) {
-	return (void *)a - (void *)b;
-}
+list_t *connection_list;	/* Meta connections */
+connection_t *everyone;
 
 void init_connections(void) {
-	cp();
-
-	connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
-	broadcast = new_connection();
-	broadcast->name = xstrdup(_("everyone"));
-	broadcast->hostname = xstrdup(_("BROADCAST"));
+	connection_list = list_alloc((list_action_t) free_connection);
+	everyone = new_connection();
+	everyone->name = xstrdup("everyone");
+	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-	cp();
-
-	splay_delete_tree(connection_tree);
-	free_connection(broadcast);
+	list_delete_list(connection_list);
+	free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
-	cp();
-
 	return xmalloc_and_zero(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	cp();
-
 	if(!c)
 		return;
 
-	if(c->name)
-		free(c->name);
-
-	if(c->hostname)
-		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);
+	sptps_stop(&c->sptps);
+	ecdsa_free(&c->ecdsa);
+	rsa_free(&c->rsa);
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
+	free(c->hischallenge);
+
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
 	
 	if(event_initialized(&c->inevent))
 		event_del(&c->inevent);
 
-	free(c);
-}
+	if(event_initialized(&c->outevent))
+		event_del(&c->outevent);
 
-void connection_add(connection_t *c) {
-	cp();
+	if(c->socket > 0)
+		closesocket(c->socket);
 
-	splay_insert(connection_tree, c);
-}
+	free(c->name);
+	free(c->hostname);
 
-void connection_del(connection_t *c) {
-	cp();
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
 
-	splay_delete(connection_tree, c);
+	free(c);
 }
 
-int dump_connections(struct evbuffer *out) {
-	splay_node_t *node;
-	connection_t *c;
-
-	cp();
+void connection_add(connection_t *c) {
+	list_insert_tail(connection_list, c);
+}
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-		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;
+void connection_del(connection_t *c) {
+	for(list_node_t *node = connection_list->head; node; node = node->next) {
+		if(node->data == c) {
+			list_delete_node(connection_list, node);
+			return;
+		}
 	}
-
-	return 0;
 }
 
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	int x;
-
-	cp();
-
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
+bool dump_connections(connection_t *cdump) {
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
+		next = node->next;
+		connection_t *c = node->data;
+		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));
+	}
 
-	return x == 0;
+	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }