X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=9c459787eabbb5bc94a200a2dc01e3effbc1be58;hb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;hp=cbe704b537e24c246df59a5af43bd3f3e05456a1;hpb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;p=meshlink diff --git a/src/connection.c b/src/connection.c index cbe704b5..9c459787 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,6 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000-2012 Guus Sliepen , + Copyright (C) 2000-2013 Guus Sliepen , 2000-2005 Ivo Timmermans 2008 Max Rijevski @@ -27,11 +27,12 @@ #include "control_common.h" #include "list.h" #include "logger.h" +#include "rsa.h" #include "subnet.h" #include "utils.h" #include "xalloc.h" -list_t *connection_list; /* Meta connections */ +list_t *connection_list; connection_t *everyone; void init_connections(void) { @@ -54,25 +55,21 @@ 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); + 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); + ecdsa_free(c->ecdsa); + rsa_free(c->rsa); free(c->hischallenge); 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); + io_del(&c->io); if(c->socket > 0) closesocket(c->socket); @@ -91,12 +88,7 @@ void connection_add(connection_t *c) { } void connection_del(connection_t *c) { - for list_each(connection_t, c, connection_list) { - if(node->data == c) { - list_delete_node(connection_list, node); - return; - } - } + list_delete(connection_list, c); } bool dump_connections(connection_t *cdump) {