X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=9b752fadaa3d1b292e36702c933ffbcf08897bf5;hp=4d0b3a81fb77017ee8dcd09c08711f23059703b1;hb=fb5588856fa4dd6f140c72f7360302fe85b20c75;hpb=dac256505e1af78505c9f905bd55c11d4b87345c diff --git a/src/connection.c b/src/connection.c index 4d0b3a81..9b752fad 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,8 @@ /* connection.c -- connection list management - Copyright (C) 2000 Guus Sliepen , - 2000 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,206 +14,123 @@ 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.5 2000/11/22 22:18:03 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 "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" -/* Root of the connection list */ +avl_tree_t *connection_tree; /* Meta connections */ +connection_t *everyone; -rbltree_t *connection_tree; -rbltree_t *id_tree; - -connection_t *myself = NULL; - -/* Initialization and callbacks */ - -int connection_compare(connection_t *a, connection_t *b) -{ - ipv4_t result; - result = a->address - b->address; - if(result) - return result; - else - return a->port - b->port; +static int connection_compare(const connection_t *a, const connection_t *b) { + return a < b ? -1 : a == b ? 0 : 1; } -int id_compare(connection_t *a, connection_t *b) -{ - return strcmp(a->name, b->name); +void init_connections(void) { + connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection); + everyone = new_connection(); + everyone->name = xstrdup("everyone"); + everyone->hostname = xstrdup("BROADCAST"); } -void init_connections(void) -{ - connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection); - id_tree = new_rbltree((rbl_compare_t)id_compare, NULL); +void exit_connections(void) { + avl_delete_tree(connection_tree); + free_connection(everyone); } -/* Creation and deletion of connection elements */ +connection_t *new_connection(void) { + connection_t *c; -connection_t *new_connection(void) -{ - connection_t *p = (connection_t *)xmalloc(sizeof(*p)); -cp - /* initialise all those stupid pointers at once */ - memset(p, '\0', sizeof(*p)); + c = xmalloc_and_zero(sizeof(connection_t)); - p->subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, NULL); -cp - return p; -} + if(!c) + return NULL; -void free_connection(connection_t *p) -{ -cp - if(p->sq) - destroy_queue(p->sq); - if(p->rq) - destroy_queue(p->rq); - if(p->name && p->name!=unknown) - free(p->name); - if(p->hostname) - free(p->hostname); - if(p->rsa_key) - RSA_free(p->rsa_key); - if(p->cipher_pktkey) - free(p->cipher_pktkey); - if(p->buffer) - free(p->buffer); - if(p->config) - clear_config(&p->config); - free(p); -cp -} + gettimeofday(&c->start, NULL); -/* - remove all marked connections -*/ -void prune_connection_tree(void) -{ - rbl_t *rbl; - connection_t *cl; -cp - RBL_FOREACH(connection_tree, rbl) - { - cl = (connection_t *) rbl->data; - if(cl->status.remove) - connection_del(cl); - } -cp + return c; } -/* - free all elements of connection -*/ -void destroy_connection_tree(void) -{ -cp - rbl_delete_rbltree(id_tree); - rbl_delete_rbltree(connection_tree); -cp +void free_connection_partially(connection_t *c) { + free(c->inkey); + free(c->outkey); + free(c->mychallenge); + free(c->hischallenge); + free(c->outbuf); + + c->inkey = NULL; + c->outkey = NULL; + c->mychallenge = NULL; + c->hischallenge = NULL; + c->outbuf = NULL; + + c->buflen = 0; + c->reqlen = 0; + c->tcplen = 0; + c->allow_request = 0; + c->outbuflen = 0; + c->outbufsize = 0; + c->outbufstart = 0; + + if(c->inctx) { + EVP_CIPHER_CTX_cleanup(c->inctx); + free(c->inctx); + c->inctx = NULL; + } + + if(c->outctx) { + EVP_CIPHER_CTX_cleanup(c->outctx); + free(c->outctx); + c->outctx = NULL; + } + + if(c->rsa_key) { + RSA_free(c->rsa_key); + c->rsa_key = NULL; + } } -/* Linked list management */ +void free_connection(connection_t *c) { + free_connection_partially(c); -void connection_add(connection_t *cl) -{ -cp - rbl_insert(connection_tree, cl); -cp -} + free(c->name); + free(c->hostname); -void id_add(connection_t *cl) -{ -cp - rbl_insert(id_tree, cl); -cp -} + if(c->config_tree) + exit_configuration(&c->config_tree); -void connection_del(connection_t *cl) -{ -cp - rbl_delete(id_tree, cl); - rbl_delete(connection_tree, cl); -cp + free(c); } -/* Lookup functions */ - -connection_t *lookup_connection(ipv4_t address, short unsigned int port) -{ - connection_t cl; -cp - cl.address = address; - cl.port = port; - - return rbl_search(connection_tree, &cl); +void connection_add(connection_t *c) { + avl_insert(connection_tree, c); } -connection_t *lookup_id(char *name) -{ - connection_t cl, *p; -cp - cl.name = name; - p = rbl_search(id_tree, &cl); - if(p && p->status.active) - return p; - else - return NULL; +void connection_del(connection_t *c) { + avl_delete(connection_tree, c); } -/* Debugging */ - -void dump_connection_list(void) -{ - rbl_t *rbl; - connection_t *cl; -cp - syslog(LOG_DEBUG, _("Connection list:")); - - syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"), - myself->name, myself->hostname, myself->port, myself->flags, - myself->socket, myself->meta_socket, myself->status); - - RBL_FOREACH(connection_tree, rbl) - { - cl = (connection_t *)rbl->data; - syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"), - cl->name, cl->hostname, cl->port, cl->flags, - cl->socket, cl->meta_socket, cl->status); - } - - syslog(LOG_DEBUG, _("End of connection list.")); -cp -} +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); + } -int read_host_config(connection_t *cl) -{ - char *fname; - int x; -cp - asprintf(&fname, "%s/hosts/%s", confbase, cl->name); - x = read_config_file(&cl->config, fname); - free(fname); -cp - return x; + logger(LOG_DEBUG, "End of connections."); }