X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=cbe7a9d610277e0f9c1ef57910ced33f7b9a956c;hb=efbdf1564bb6a8f17ca28e61ccc6a507f1159994;hp=496f6747fc05a738709f10e8c3783300c2685074;hpb=5b07039b0712bee0f19749d63116a10fb08a2d8b;p=meshlink

diff --git a/src/connection.c b/src/connection.c
index 496f6747..cbe7a9d6 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,8 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2013 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,29 +20,29 @@
 #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 "rsa.h"
-#include "subnet.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-list_t *connection_list;
-connection_t *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");
+void init_connections(meshlink_handle_t *mesh) {
+	mesh->connections = list_alloc((list_action_t) free_connection);
+	mesh->everyone = new_connection();
+	mesh->everyone->name = xstrdup("mesh->everyone");
+	mesh->everyone->hostname = xstrdup("BROADCAST");
 }
 
-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);
+
+	free_connection(mesh->everyone);
+
+	mesh->connections = NULL;
+	mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
@@ -55,21 +53,14 @@ 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);
-
 	sptps_stop(&c->sptps);
 	ecdsa_free(c->ecdsa);
-	rsa_free(c->rsa);
-
-	free(c->hischallenge);
 
 	buffer_clear(&c->inbuf);
 	buffer_clear(&c->outbuf);
 
-	io_del(&c->io);
+	if(c->io.cb)
+		abort();
 
 	if(c->socket > 0)
 		closesocket(c->socket);
@@ -83,21 +74,12 @@ void free_connection(connection_t *c) {
 	free(c);
 }
 
-void connection_add(connection_t *c) {
-	list_insert_tail(connection_list, c);
-}
-
-void connection_del(connection_t *c) {
-	list_delete(connection_list, c);
+void connection_add(meshlink_handle_t *mesh, connection_t *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));
-	}
-
-	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	io_del(&mesh->loop, &c->io);
+	list_delete(mesh->connections, c);
 }