X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=7d27e706c4c1af656b4d7d581e97d5c4e27f2cbb;hb=1022812ed4b5c70162f2f0a9d9a96c716c936408;hp=58e2d355ff8a56dc11e4c073aa519503931c1f20;hpb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 58e2d355..7d27e706 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-2013 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,131 +14,106 @@
     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 "avl_tree.h"
-#include "conf.h"
 #include "list.h"
+#include "cipher.h"
+#include "conf.h"
+#include "control_common.h"
 #include "logger.h"
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
-#include "subnet.h"
+#include "net.h"
+#include "rsa.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
-connection_t *broadcast;
+list_t connection_list = {
+	.head = NULL,
+	.tail = NULL,
+	.count = 0,
+	.delete = (list_action_t) free_connection,
+};
 
-static int connection_compare(const connection_t *a, const connection_t *b) {
-	return (void *)a - (void *)b;
-}
+connection_t *everyone;
 
 void init_connections(void) {
-	cp();
-
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
-	broadcast = new_connection();
-	broadcast->name = xstrdup(_("everyone"));
-	broadcast->hostname = xstrdup(_("BROADCAST"));
+	everyone = new_connection();
+	everyone->name = xstrdup("everyone");
+	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-	cp();
+	list_empty_list(&connection_list);
 
-	avl_delete_tree(connection_tree);
-	free_connection(broadcast);
+	free_connection(everyone);
+	everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-	connection_t *c;
-
-	cp();
-
-	c = xmalloc_and_zero(sizeof(connection_t));
-
-	if(!c)
-		return NULL;
-
-	gettimeofday(&c->start, NULL);
-	event_set(&c->ev, -1, 0, NULL, NULL);
-
-	return c;
+	return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	cp();
-
-	if(!c)
+	if(!c) {
 		return;
+	}
+
+#ifndef DISABLE_LEGACY
+	cipher_close(&c->incipher);
+	digest_close(&c->indigest);
+	cipher_close(&c->outcipher);
+	digest_close(&c->outdigest);
+	rsa_free(c->rsa);
+#endif
 
-	if(c->name)
-		free(c->name);
+	sptps_stop(&c->sptps);
+	ecdsa_free(c->ecdsa);
 
-	if(c->hostname)
-		free(c->hostname);
+	free(c->hischallenge);
+	free(c->mychallenge);
 
-	if(c->inkey)
-		free(c->inkey);
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
 
-	if(c->outkey)
-		free(c->outkey);
+	io_del(&c->io);
 
-	if(c->mychallenge)
-		free(c->mychallenge);
+	if(c->socket > 0) {
+		if(c->status.tarpit) {
+			tarpit(c->socket);
+		} else {
+			closesocket(c->socket);
+		}
+	}
+
+	free(c->name);
+	free(c->hostname);
 
-	if(c->hischallenge)
-		free(c->hischallenge);
+	if(c->config_tree) {
+		exit_configuration(&c->config_tree);
+	}
 
-	event_del(&c->ev);
 	free(c);
 }
 
 void connection_add(connection_t *c) {
-	cp();
-
-	avl_insert(connection_tree, c);
+	list_insert_tail(&connection_list, c);
 }
 
 void connection_del(connection_t *c) {
-	cp();
-
-	avl_delete(connection_tree, c);
+	list_delete(&connection_list, c);
 }
 
-void dump_connections(void) {
-	avl_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 outbuf %d/%d/%d"),
-			   c->name, c->hostname, c->options, c->socket, c->status.value,
-			   c->outbufsize, c->outbufstart, c->outbuflen);
+bool dump_connections(connection_t *cdump) {
+	for list_each(connection_t, c, &connection_list) {
+		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)));
 	}
 
-	logger(LOG_DEBUG, _("End of connections."));
-}
-
-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);
-
-	return x == 0;
+	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }