X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=3591f13e4350bea2055b24e6627e535e1fcf39ab;hp=4d6e30b2c3f0d2d6726ed05582208e7f5bb63e26;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/connection.c b/src/connection.c index 4d6e30b2..3591f13e 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,8 @@ /* connection.c -- connection list management - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2000-2012 Guus Sliepen , + 2000-2005 Ivo Timmermans + 2008 Max Rijevski 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 @@ -13,138 +14,100 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: connection.c,v 1.1.2.37 2003/07/06 22:11:31 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include -#include -#include - -#include -#include +#include "system.h" -#include "net.h" /* Don't ask. */ -#include "netutl.h" +#include "list.h" +#include "cipher.h" #include "conf.h" -#include -#include "subnet.h" +#include "control_common.h" +#include "list.h" #include "logger.h" - +#include "subnet.h" +#include "utils.h" #include "xalloc.h" -#include "system.h" -avl_tree_t *connection_tree; /* Meta connections */ -connection_t *broadcast; +list_t *connection_list; /* Meta connections */ +connection_t *everyone; -int connection_compare(connection_t *a, connection_t *b) -{ - return (void *)a - (void *)b; +void init_connections(void) { + connection_list = list_alloc((list_action_t) free_connection); + everyone = new_connection(); + everyone->name = xstrdup("everyone"); + everyone->hostname = xstrdup("BROADCAST"); } -void init_connections(void) -{ - cp(); - - connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, NULL); - broadcast = new_connection(); - broadcast->name = xstrdup(_("everyone")); - broadcast->hostname = xstrdup(_("BROADCAST")); +void exit_connections(void) { + list_delete_list(connection_list); + free_connection(everyone); } -void exit_connections(void) -{ - cp(); - - avl_delete_tree(connection_tree); - free_connection(broadcast); +connection_t *new_connection(void) { + return xmalloc_and_zero(sizeof(connection_t)); } -connection_t *new_connection(void) -{ - connection_t *c; - - cp(); - - c = (connection_t *) xmalloc_and_zero(sizeof(connection_t)); - +void free_connection(connection_t *c) { if(!c) - return NULL; + return; - gettimeofday(&c->start, NULL); + cipher_close(&c->incipher); + digest_close(&c->indigest); + cipher_close(&c->outcipher); + digest_close(&c->outdigest); - return c; -} + sptps_stop(&c->sptps); + ecdsa_free(&c->ecdsa); + rsa_free(&c->rsa); -void free_connection(connection_t *c) -{ - cp(); + free(c->hischallenge); - if(c->hostname) - free(c->hostname); + buffer_clear(&c->inbuf); + buffer_clear(&c->outbuf); + + if(event_initialized(&c->inevent)) + event_del(&c->inevent); - if(c->inkey) - free(c->inkey); + if(event_initialized(&c->outevent)) + event_del(&c->outevent); - if(c->outkey) - free(c->outkey); + if(c->socket > 0) + closesocket(c->socket); - if(c->mychallenge) - free(c->mychallenge); + free(c->name); + free(c->hostname); - if(c->hischallenge) - free(c->hischallenge); + if(c->config_tree) + exit_configuration(&c->config_tree); free(c); } -void connection_add(connection_t *c) -{ - cp(); - - avl_insert(connection_tree, c); -} - -void connection_del(connection_t *c) -{ - cp(); - - avl_delete(connection_tree, c); +void connection_add(connection_t *c) { + list_insert_tail(connection_list, c); } -void dump_connections(void) -{ - avl_node_t *node; - connection_t *c; - - cp(); - - logger(DEBUG_ALWAYS, LOG_DEBUG, _("Connections:")); - - for(node = connection_tree->head; node; node = node->next) { - c = (connection_t *) node->data; - logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"), - c->name, c->hostname, c->options, c->socket, c->status); +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; + } } - - logger(DEBUG_ALWAYS, LOG_DEBUG, _("End of connections.")); } -int read_connection_config(connection_t *c) -{ - char *fname; - int x; - - cp(); - - asprintf(&fname, "%s/hosts/%s", confbase, c->name); - x = read_config_file(c->config_tree, fname); - free(fname); +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; + 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 x; + return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS); }