X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconnection.c;h=9cc64914cd4ba217a85d824f9ff378e5f41884b1;hp=d39f43ff71ee4b163e2e3a6622065a40340512d5;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80

diff --git a/src/connection.c b/src/connection.c
index d39f43ff..9cc64914 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,8 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2008      Max Rijevski <maksuf@gmail.com>
+    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -22,85 +20,72 @@
 #include "system.h"
 
 #include "list.h"
-#include "cipher.h"
 #include "conf.h"
-#include "control_common.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "subnet.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-list_t *connection_list;
-connection_t *everyone;
+void init_connections(meshlink_handle_t *mesh) {
+	assert(!mesh->connections);
+	assert(!mesh->everyone);
 
-void init_connections(void) {
-	connection_list = list_alloc((list_action_t) free_connection);
-	everyone = new_connection();
-	everyone->name = xstrdup("everyone");
-	everyone->hostname = xstrdup("BROADCAST");
+	mesh->connections = list_alloc((list_action_t) free_connection);
+	mesh->everyone = new_connection();
+	mesh->everyone->name = xstrdup("mesh->everyone");
 }
 
-void exit_connections(void) {
-	list_delete_list(connection_list);
-	free_connection(everyone);
+void exit_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		list_delete_list(mesh->connections);
+	}
+
+	if(mesh->everyone) {
+		free_connection(mesh->everyone);
+	}
+
+	mesh->connections = NULL;
+	mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-	return xmalloc_and_zero(sizeof(connection_t));
+	return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	if(!c)
-		return;
-
-	cipher_close(&c->incipher);
-	digest_close(&c->indigest);
-	cipher_close(&c->outcipher);
-	digest_close(&c->outdigest);
+	assert(c);
 
 	sptps_stop(&c->sptps);
-	ecdsa_free(&c->ecdsa);
-	rsa_free(&c->rsa);
-
-	free(c->hischallenge);
+	ecdsa_free(c->ecdsa);
 
 	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->io.cb) {
+		abort();
+	}
 
-	if(c->socket > 0)
+	if(c->socket > 0) {
 		closesocket(c->socket);
+	}
 
 	free(c->name);
-	free(c->hostname);
-
-	if(c->config_tree)
-		exit_configuration(&c->config_tree);
 
 	free(c);
 }
 
-void connection_add(connection_t *c) {
-	list_insert_tail(connection_list, c);
-}
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
 
-void connection_del(connection_t *c) {
-	list_delete(connection_list, c);
+	c->mesh = mesh;
+	list_insert_tail(mesh->connections, c);
 }
 
-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));
-	}
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
 
-	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
+	io_del(&mesh->loop, &c->io);
+	list_delete(mesh->connections, c);
 }