X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=d25159e6438c2102b4d7747377ed0e3eba7dac01;hb=2956559f7d12caa9779207525419801e0e9ab3e3;hp=4798c5a4867b3b5f1a6294d91662f72652f1bc63;hpb=6bc5d626a8726fc23365ee705761a3c666a08ad4;p=meshlink diff --git a/src/connection.c b/src/connection.c index 4798c5a4..d25159e6 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,8 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000-2012 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,10 +22,9 @@ #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 "utils.h" #include "xalloc.h" @@ -47,23 +44,15 @@ void exit_connections(void) { } 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); @@ -89,14 +78,3 @@ void connection_add(connection_t *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); -}