X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=e7ea9b2aec91d93d55a673b359f545a1ef49e85d;hp=642bfacea01dc0b07480e106ce63706436c9dd6f;hb=64771f73ebbff04262defcde59263e98f89f0fa1;hpb=8b2b67e26c5b971761f5015764d5e188f6343bc4 diff --git a/src/connection.c b/src/connection.c index 642bface..e7ea9b2a 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-2009 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,132 +14,113 @@ 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.31 2002/09/04 16:26:44 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 +#include "system.h" -#include "net.h" /* Don't ask. */ -#include "netutl.h" -#include "config.h" +#include "avl_tree.h" #include "conf.h" -#include +#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; -int connection_compare(connection_t *a, connection_t *b) -{ - return a - b; +static int connection_compare(const connection_t *a, const connection_t *b) { + return a < b ? -1 : a == b ? 0 : 1; } -void init_connections(void) -{ -cp - connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL); -cp - broadcast = new_connection(); - broadcast->name = xstrdup(_("everyone")); - broadcast->hostname = xstrdup(_("BROADCAST")); -cp +void init_connections(void) { + connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection); + broadcast = new_connection(); + broadcast->name = xstrdup("everyone"); + broadcast->hostname = xstrdup("BROADCAST"); } -void exit_connections(void) -{ -cp - avl_delete_tree(connection_tree); -cp - free_connection(broadcast); -cp +void exit_connections(void) { + avl_delete_tree(connection_tree); + free_connection(broadcast); } -connection_t *new_connection(void) -{ - connection_t *c; -cp - c = (connection_t *)xmalloc_and_zero(sizeof(connection_t)); +connection_t *new_connection(void) { + connection_t *c; - if(!c) - return NULL; + c = xmalloc_and_zero(sizeof(connection_t)); - gettimeofday(&c->start, NULL); -cp - return c; -} + if(!c) + return NULL; + + gettimeofday(&c->start, NULL); -void free_connection(connection_t *c) -{ -cp - if(c->hostname) - free(c->hostname); - if(c->inkey) - free(c->inkey); - if(c->outkey) - free(c->outkey); - if(c->mychallenge) - free(c->mychallenge); - if(c->hischallenge) - free(c->hischallenge); - free(c); -cp + return c; } -void connection_add(connection_t *c) -{ -cp - avl_insert(connection_tree, c); -cp +void free_connection(connection_t *c) { + if(c->name) + free(c->name); + + if(c->hostname) + free(c->hostname); + + if(c->inkey) + free(c->inkey); + + if(c->outkey) + free(c->outkey); + + if(c->inctx) { + EVP_CIPHER_CTX_cleanup(c->inctx); + free(c->inctx); + } + + if(c->outctx) { + EVP_CIPHER_CTX_cleanup(c->outctx); + free(c->outctx); + } + + if(c->mychallenge) + free(c->mychallenge); + + if(c->hischallenge) + free(c->hischallenge); + + if(c->config_tree) + exit_configuration(&c->config_tree); + + if(c->outbuf) + free(c->outbuf); + + if(c->rsa_key) + RSA_free(c->rsa_key); + + free(c); } -void connection_del(connection_t *c) -{ -cp - avl_delete(connection_tree, c); -cp +void connection_add(connection_t *c) { + avl_insert(connection_tree, c); } -void dump_connections(void) -{ - avl_node_t *node; - connection_t *c; -cp - syslog(LOG_DEBUG, _("Connections:")); - - for(node = connection_tree->head; node; node = node->next) - { - c = (connection_t *)node->data; - syslog(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"), - c->name, c->hostname, c->options, c->socket, c->status); - } - - syslog(LOG_DEBUG, _("End of connections.")); -cp +void connection_del(connection_t *c) { + avl_delete(connection_tree, c); } -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); -cp - return x; +void dump_connections(void) { + avl_node_t *node; + connection_t *c; + + logger(LOG_DEBUG, "Connections:"); + + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d", + c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status), + c->outbufsize, c->outbufstart, c->outbuflen); + } + + logger(LOG_DEBUG, "End of connections."); }