X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=0e61132c9182a637278b8fe87053962ef23481a8;hp=3591f13e4350bea2055b24e6627e535e1fcf39ab;hb=390d25f0b80dd7418e147de3561c70461628574d;hpb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60 diff --git a/src/connection.c b/src/connection.c index 3591f13e..0e61132c 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) { @@ -47,32 +48,30 @@ 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); +#ifndef DISABLE_LEGACY + cipher_close(c->incipher); + digest_close(c->indigest); + cipher_close(c->outcipher); + digest_close(c->outdigest); + rsa_free(c->rsa); +#endif sptps_stop(&c->sptps); - ecdsa_free(&c->ecdsa); - rsa_free(&c->rsa); + ecdsa_free(c->ecdsa); 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,18 +90,11 @@ void connection_add(connection_t *c) { } void connection_del(connection_t *c) { - for(list_node_t *node = connection_list->head; node; node = node->next) { - if(node->data == c) { - list_delete_node(connection_list, node); - return; - } - } + list_delete(connection_list, c); } bool dump_connections(connection_t *cdump) { - for(list_node_t *node = connection_list->head, *next; node; node = next) { - next = node->next; - connection_t *c = node->data; + 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,