X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=fafec5db7e85e8e5b4a50b7d0da7990146a4e1a3;hb=6dfdb323612184529b4b83c1be914dda8262de47;hp=fecb48d42d141d37a1830e039fd91e8d629736d9;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

diff --git a/src/connection.c b/src/connection.c
index fecb48d4..fafec5db 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2009 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>
 
@@ -27,14 +27,12 @@
 #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;
+connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
 	return a < b ? -1 : a == b ? 0 : 1;
@@ -42,45 +40,66 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 
 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");
+	everyone = new_connection();
+	everyone->name = xstrdup("everyone");
+	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
 	splay_delete_tree(connection_tree);
-	free_connection(broadcast);
+	free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
 	return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void free_connection(connection_t *c) {
-	if(!c)
-		return;
-
-	if(c->name)
-		free(c->name);
-
-	if(c->hostname)
-		free(c->hostname);
-
+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->hischallenge)
-		free(c->hischallenge);
+	sptps_stop(&c->sptps);
+	ecdsa_free(&c->ecdsa);
+	rsa_free(&c->rsa);
 
-	if(c->config_tree)
-		exit_configuration(&c->config_tree);
+	if(c->hischallenge) {
+		free(c->hischallenge);
+		c->hischallenge = NULL;
+	}
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
+	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->socket > 0)
+		closesocket(c->socket);
+
+	c->socket = -1;
+
+	c->protocol_major = 0;
+	c->protocol_minor = 0;
+	c->allow_request = 0;
+}
+
+void free_connection(connection_t *c) {
+	if(!c)
+		return;
+
+	free_connection_partially(c);
+
+	free(c->name);
+	free(c->hostname);
+
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
+
 	free(c);
 }
 
@@ -98,7 +117,7 @@ bool dump_connections(connection_t *cdump) {
 
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
-		send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+		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));