X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=9587819d03e3d8bedf04890b8ad3bc526b9631ac;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=4ee9a1b9ae27657aedfbe6f507b02d1f37ec654b;hpb=2165931c62f0433fd97bd3ac6aefea3627218946;p=tinc diff --git a/src/connection.c b/src/connection.c index 4ee9a1b9..9587819d 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,8 @@ /* connection.c -- connection list management - Copyright (C) 2000,2001 Guus Sliepen , - 2000,2001 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,136 +14,105 @@ 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.24 2001/10/30 16:34:32 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 "splay_tree.h" +#include "cipher.h" #include "conf.h" -#include +#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 */ +splay_tree_t *connection_tree; /* Meta connections */ +connection_t *everyone; -int connection_compare(connection_t *a, connection_t *b) -{ - return a->socket - b->socket; +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 +void init_connections(void) { + connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection); + everyone = new_connection(); + everyone->name = xstrdup("everyone"); + everyone->hostname = xstrdup("BROADCAST"); } -void exit_connections(void) -{ -cp - avl_delete_tree(connection_tree); -cp +void exit_connections(void) { + splay_delete_tree(connection_tree); + free_connection(everyone); } -connection_t *new_connection(void) -{ - connection_t *c; -cp - c = (connection_t *)xmalloc_and_zero(sizeof(connection_t)); +connection_t *new_connection(void) { + return xmalloc_and_zero(sizeof(connection_t)); +} - if(!c) - return NULL; +void free_connection(connection_t *c) { + if(!c) + return; - gettimeofday(&c->start, NULL); -cp - return c; -} + if(c->name) + free(c->name); -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 -} + if(c->hostname) + free(c->hostname); -void connection_add(connection_t *c) -{ -cp - avl_insert(connection_tree, c); -cp -} + cipher_close(&c->incipher); + digest_close(&c->indigest); + cipher_close(&c->outcipher); + digest_close(&c->outdigest); -void connection_del(connection_t *c) -{ -cp - avl_delete(connection_tree, c); -cp -} + ecdh_free(&c->ecdh); + ecdsa_free(&c->ecdsa); + rsa_free(&c->rsa); + + if(c->hischallenge) + free(c->hischallenge); + + if(c->config_tree) + exit_configuration(&c->config_tree); + + 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); -connection_t *lookup_connection(ipv4_t address, short unsigned int port) -{ - connection_t c; -cp - c.address = address; - c.port = port; + if(c->socket > 0) + closesocket(c->socket); - return avl_search(connection_tree, &c); + free(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 port %hd options %ld socket %d status %04x"), - c->name, c->hostname, c->port, c->options, - c->socket, c->status); - } - - syslog(LOG_DEBUG, _("End of connections.")); -cp +void connection_add(connection_t *c) { + splay_insert(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 connection_del(connection_t *c) { + splay_delete(connection_tree, c); +} + +bool dump_connections(connection_t *cdump) { + splay_node_t *node; + connection_t *c; + + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + send_request(cdump, "%d %d %s at %s options %x socket %d status %04x", + CONTROL, REQ_DUMP_CONNECTIONS, + c->name, c->hostname, c->options, c->socket, + bitfield_to_int(&c->status, sizeof c->status)); + } + + return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS); }