X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=713a40cbfc12fb76147345291264c1e64f78dd4c;hp=6d77cb560aba0497f9f32fc3012e7d42307cdf23;hb=d1cd3c81455ecb32149cbaa424b7870075b2b2fc;hpb=c23fcf555ee4b69f03b76a0ffb731c3a475a77e7

diff --git a/src/connection.c b/src/connection.c
index 6d77cb56..713a40cb 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2,6 +2,7 @@
     connection.c -- connection list management
     Copyright (C) 2000-2009 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,70 +14,49 @@
     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 "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. */
-#include "netutl.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
+splay_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
 	return a < b ? -1 : a == b ? 0 : 1;
 }
 
-void init_connections(void)
-{
-	cp();
-
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+void init_connections(void) {
+	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"));
+	broadcast->name = xstrdup("everyone");
+	broadcast->hostname = xstrdup("BROADCAST");
 }
 
-void exit_connections(void)
-{
-	cp();
-
-	avl_delete_tree(connection_tree);
+void exit_connections(void) {
+	splay_delete_tree(connection_tree);
 	free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
-	connection_t *c;
-
-	cp();
-
-	c = xmalloc_and_zero(sizeof(connection_t));
-
-	if(!c)
-		return NULL;
-
-	gettimeofday(&c->start, NULL);
-
-	return c;
+connection_t *new_connection(void) {
+	return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void free_connection(connection_t *c)
-{
-	cp();
+void free_connection(connection_t *c) {
+	if(!c)
+		return;
 
 	if(c->name)
 		free(c->name);
@@ -84,24 +64,13 @@ void free_connection(connection_t *c)
 	if(c->hostname)
 		free(c->hostname);
 
-	if(c->inkey)
-		free(c->inkey);
-
-	if(c->outkey)
-		free(c->outkey);
-
-	if(c->inctx) {
-		EVP_CIPHER_CTX_cleanup(c->inctx);
-		free(c->inctx);
-	}
-
-	if(c->outctx) {
-		EVP_CIPHER_CTX_cleanup(c->outctx);
-		free(c->outctx);
-	}
+	cipher_close(&c->incipher);
+	digest_close(&c->indigest);
+	cipher_close(&c->outcipher);
+	digest_close(&c->outdigest);
 
-	if(c->mychallenge)
-		free(c->mychallenge);
+	ecdsa_free(&c->ecdsa);
+	rsa_free(&c->rsa);
 
 	if(c->hischallenge)
 		free(c->hischallenge);
@@ -109,58 +78,40 @@ void free_connection(connection_t *c)
 	if(c->config_tree)
 		exit_configuration(&c->config_tree);
 
-	if(c->outbuf)
-		free(c->outbuf);
+	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);
 
-	if(c->rsa_key)
-		RSA_free(c->rsa_key);
+	if(c->socket > 0)
+		closesocket(c->socket);
 
 	free(c);
 }
 
-void connection_add(connection_t *c)
-{
-	cp();
-
-	avl_insert(connection_tree, c);
+void connection_add(connection_t *c) {
+	splay_insert(connection_tree, c);
 }
 
-void connection_del(connection_t *c)
-{
-	cp();
-
-	avl_delete(connection_tree, c);
+void connection_del(connection_t *c) {
+	splay_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
-	avl_node_t *node;
+bool dump_connections(connection_t *cdump) {
+	splay_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, bitfield_to_int(&c->status, sizeof c->status),
-			   c->outbufsize, c->outbufstart, c->outbuflen);
+		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));
 	}
 
-	logger(LOG_DEBUG, _("End of connections."));
-}
-
-bool read_connection_config(connection_t *c)
-{
-	char *fname;
-	int x;
-
-	cp();
-
-	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);
 }