X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=36c0fdbc58fd76eed0dc010c666561b20651ad9a;hp=089ff0de1babbdb5717d8382e2366e5d560fb058;hb=8c3105283ac53f8cc9cc4dde25957ec1cf6b53a0;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/connection.c b/src/connection.c index 089ff0de..36c0fdbc 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,66 +14,46 @@ 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.33 2002/09/09 21:24: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 +#include "system.h" +#include "avl_tree.h" +#include "conf.h" +#include "list.h" +#include "logger.h" #include "net.h" /* Don't ask. */ #include "netutl.h" -#include "config.h" -#include "conf.h" -#include #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); +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")); + broadcast->name = xstrdup("everyone"); + broadcast->hostname = xstrdup("BROADCAST"); } -void exit_connections(void) -{ - cp(); - +void exit_connections(void) { avl_delete_tree(connection_tree); free_connection(broadcast); } -connection_t *new_connection(void) -{ +connection_t *new_connection(void) { connection_t *c; - cp(); - - c = (connection_t *) xmalloc_and_zero(sizeof(connection_t)); + c = xmalloc_and_zero(sizeof(connection_t)); if(!c) return NULL; @@ -82,9 +63,9 @@ connection_t *new_connection(void) return c; } -void free_connection(connection_t * c) -{ - cp(); +void free_connection(connection_t *c) { + if(c->name) + free(c->name); if(c->hostname) free(c->hostname); @@ -95,55 +76,78 @@ void free_connection(connection_t * c) 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_add(connection_t * c) -{ - cp(); - +void connection_add(connection_t *c) { avl_insert(connection_tree, c); } -void connection_del(connection_t * c) -{ - cp(); - +void connection_del(connection_t *c) { avl_delete(connection_tree, c); } -void dump_connections(void) -{ +void dump_connections(void) { avl_node_t *node; connection_t *c; - cp(); - - syslog(LOG_DEBUG, _("Connections:")); + logger(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); + 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); } - syslog(LOG_DEBUG, _("End of connections.")); + logger(LOG_DEBUG, "End of connections."); } -int read_connection_config(connection_t * c) -{ +bool read_connection_config(connection_t *c) { + list_node_t *node, *next; + size_t name_len = strlen(c->name); char *fname; - int x; - - cp(); + bool x; + + for(node = cmdline_conf->tail; node; node = next) { + config_t *cfg = (config_t *)node->data; + next = node->prev; + if (!strncmp(c->name, cfg->variable, name_len) && cfg->variable[name_len] == '.') { + config_t *new_cfg = new_config(); + new_cfg->variable = xstrdup(cfg->variable + name_len + 1); + new_cfg->value = xstrdup(cfg->value); + new_cfg->file = NULL; + new_cfg->line = cfg->line; + config_add(c->config_tree, new_cfg); + } + } - asprintf(&fname, "%s/hosts/%s", confbase, c->name); + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); x = read_config_file(c->config_tree, fname); free(fname);