X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=1732b150fcfd499e57f810502266be83f5f10b90;hb=eb049936ffce049cf6b53de8ca0f39c98a360363;hp=6f9d9809399ce0de832b3e1aeae6386ef3da8fab;hpb=1ffa0e102dc0d036241ee1ea2a13df42526c0872;p=meshlink diff --git a/src/connection.c b/src/connection.c index 6f9d9809..1732b150 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,8 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000-2013 Guus Sliepen , - 2000-2005 Ivo Timmermans - 2008 Max Rijevski + Copyright (C) 2000-2013 Guus Sliepen 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,26 +22,23 @@ #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 "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"); + 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); + list_delete_list(mesh->connections); + free_connection(mesh->everyone); } connection_t *new_connection(void) { @@ -54,16 +49,8 @@ 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); @@ -83,20 +70,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); }