X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconnection.c;h=dd5244860bfea4df1ff31d0f8cb9711b8409f027;hp=9b752fadaa3d1b292e36702c933ffbcf08897bf5;hb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;hpb=b23681dddb8987571f04d46fc14f0ba012a7929c

diff --git a/src/connection.c b/src/connection.c
index 9b752fad..dd524486 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,14 +21,17 @@
 
 #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 "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
+splay_tree_t *connection_tree;	/* Meta connections */
 connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
@@ -36,70 +39,53 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 }
 
 void init_connections(void) {
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+	connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
 	everyone = new_connection();
 	everyone->name = xstrdup("everyone");
 	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-	avl_delete_tree(connection_tree);
+	splay_delete_tree(connection_tree);
 	free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
-	connection_t *c;
+	return xmalloc_and_zero(sizeof(connection_t));
+}
 
-	c = xmalloc_and_zero(sizeof(connection_t));
+void free_connection_partially(connection_t *c) {
+	cipher_close(&c->incipher);
+	digest_close(&c->indigest);
+	cipher_close(&c->outcipher);
+	digest_close(&c->outdigest);
 
-	if(!c)
-		return NULL;
+	sptps_stop(&c->sptps);
+	ecdsa_free(&c->ecdsa);
+	rsa_free(&c->rsa);
 
-	gettimeofday(&c->start, NULL);
+	if(c->hischallenge)
+		free(c->hischallenge);
 
-	return c;
-}
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
+	
+	if(event_initialized(&c->inevent))
+		event_del(&c->inevent);
 
-void free_connection_partially(connection_t *c) {
-	free(c->inkey);
-	free(c->outkey);
-	free(c->mychallenge);
-	free(c->hischallenge);
-	free(c->outbuf);
-
-	c->inkey = NULL;
-	c->outkey = NULL;
-	c->mychallenge = NULL;
-	c->hischallenge = NULL;
-	c->outbuf = NULL;
-
-	c->buflen = 0;
-	c->reqlen = 0;
-	c->tcplen = 0;
-	c->allow_request = 0;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
-
-	if(c->inctx) {
-		EVP_CIPHER_CTX_cleanup(c->inctx);
-		free(c->inctx);
-		c->inctx = NULL;
-	}
+	if(event_initialized(&c->outevent))
+		event_del(&c->outevent);
 
-	if(c->outctx) {
-		EVP_CIPHER_CTX_cleanup(c->outctx);
-		free(c->outctx);
-		c->outctx = NULL;
-	}
+	if(c->socket > 0)
+		closesocket(c->socket);
 
-	if(c->rsa_key) {
-		RSA_free(c->rsa_key);
-		c->rsa_key = NULL;
-	}
+	c->socket = -1;
 }
 
 void free_connection(connection_t *c) {
+	if(!c)
+		return;
+
 	free_connection_partially(c);
 
 	free(c->name);
@@ -112,25 +98,24 @@ void free_connection(connection_t *c) {
 }
 
 void connection_add(connection_t *c) {
-	avl_insert(connection_tree, c);
+	splay_insert(connection_tree, c);
 }
 
 void connection_del(connection_t *c) {
-	avl_delete(connection_tree, 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;
 
-	logger(LOG_DEBUG, "Connections:");
-
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
-		logger(LOG_DEBUG, " %s at %s options %x 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.");
+	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }