Move connection_list to mesh->connections.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 4798c5a4867b3b5f1a6294d91662f72652f1bc63..c38bc4a071ca7cb205a5d85a5e7a9b91a4957191 100644 (file)
--- 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
@@ -24,46 +22,37 @@
 #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(void) {
-       connection_list = list_alloc((list_action_t) free_connection);
+       mesh->connections = list_alloc((list_action_t) free_connection);
        everyone = new_connection();
        everyone->name = xstrdup("everyone");
        everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-       list_delete_list(connection_list);
+       list_delete_list(mesh->connections);
        free_connection(everyone);
 }
 
 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);
-
        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);
@@ -83,20 +72,9 @@ void free_connection(connection_t *c) {
 }
 
 void connection_add(connection_t *c) {
-       list_insert_tail(connection_list, c);
+       list_insert_tail(mesh->connections, c);
 }
 
 void connection_del(connection_t *c) {
-       list_delete(connection_list, 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);
+       list_delete(mesh->connections, c);
 }