X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=9e5d145ea200295ae989c27bc1cb1d16a995e56f;hp=946ea5c3db77d06b75f7be2347be7a34fb4b7070;hb=56c36a14d87b58c14dbc48df4d3d977207e2c06e;hpb=4d3de3b6a9b55bc783c649ff33e5415b0c7b5f25 diff --git a/src/connection.c b/src/connection.c index 946ea5c3..9e5d145e 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000,2001 Guus Sliepen , - 2000,2001 Ivo Timmermans + Copyright (C) 2000-2004 Guus Sliepen , + 2000-2004 Ivo Timmermans 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 @@ -17,254 +17,127 @@ 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.16 2001/09/24 14:16:29 guus Exp $ + $Id$ */ -#include "config.h" - -#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 "list.h" +#include "logger.h" +#include "net.h" /* Don't ask. */ +#include "netutl.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 */ -avl_tree_t *active_tree; /* Activated hosts, sorted by address and port */ -avl_tree_t *id_tree; /* Activated hosts, sorted by name */ -avl_tree_t *prune_tree; /* connection_t structures which have to be freed */ - -/* Pointer to connection describing myself */ - -connection_t *myself = NULL; - -/* Initialization and callbacks */ +connection_t *broadcast; -int connection_compare(connection_t *a, connection_t *b) +static int connection_compare(const connection_t *a, const connection_t *b) { - return a->meta_socket - b->meta_socket; + return (void *)a - (void *)b; } -int active_compare(connection_t *a, connection_t *b) +void init_connections(void) { - ipv4_t result; + cp(); - result = a->address - b->address; - if(result) - return result; - else - return a->port - b->port; + 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")); } -int id_compare(connection_t *a, connection_t *b) +void exit_connections(void) { - return strcmp(a->name, b->name); -} + cp(); -int prune_compare(connection_t *a, connection_t *b) -{ - if(a < b) - return -1; - else if(a > b) - return 1; - else - return 0; + avl_delete_tree(connection_tree); + free_connection(broadcast); } -void init_connections(void) +connection_t *new_connection(void) { - connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL); - active_tree = avl_alloc_tree((avl_compare_t)active_compare, NULL); - id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL); - prune_tree = avl_alloc_tree((avl_compare_t)prune_compare, (avl_action_t)free_connection); -} + connection_t *c; -/* Creation and deletion of connection elements */ + cp(); -connection_t *new_connection(void) -{ - connection_t *p = (connection_t *)xmalloc_and_zero(sizeof(*p)); -cp - p->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL); - p->queue = list_alloc((list_action_t)free); -cp - return p; -} + c = xmalloc_and_zero(sizeof(connection_t)); -void free_connection(connection_t *p) -{ -cp - if(p->queue) - list_delete_list(p->queue); - if(p->name) - 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 + if(!c) + return NULL; + + gettimeofday(&c->start, NULL); + + return c; } -/* - Free all trees. -*/ -void destroy_trees(void) +void free_connection(connection_t *c) { -cp - avl_delete_tree(id_tree); - avl_delete_tree(active_tree); - avl_delete_tree(connection_tree); - avl_delete_tree(prune_tree); -cp -} + cp(); -/* Connection management */ + if(c->hostname) + free(c->hostname); -void connection_add(connection_t *cl) -{ -cp - avl_insert(connection_tree, cl); -cp -} + if(c->inkey) + free(c->inkey); -void connection_del(connection_t *cl) -{ -cp - active_del(cl); + if(c->outkey) + free(c->outkey); - if(cl->status.meta) - avl_delete(connection_tree, cl); -cp -} + if(c->mychallenge) + free(c->mychallenge); -void active_add(connection_t *cl) -{ -cp - avl_insert(active_tree, cl); - avl_insert(id_tree, cl); - cl->status.active = 1; -cp -} + if(c->hischallenge) + free(c->hischallenge); -void active_del(connection_t *cl) -{ -cp - if(cl->status.active) - { - avl_delete(id_tree, cl); - avl_delete(active_tree, cl); - } -cp + free(c); } -void id_add(connection_t *cl) +void connection_add(connection_t *c) { -cp - avl_insert(id_tree, cl); -cp + cp(); + + avl_insert(connection_tree, c); } -void prune_add(connection_t *cl) +void connection_del(connection_t *c) { -cp - avl_insert(prune_tree, cl); -cp + cp(); + + avl_delete(connection_tree, c); } -void prune_flush(void) +void dump_connections(void) { - avl_node_t *node, *next; -cp - for(node = prune_tree->head; node; node = next) - { - next = node->next; - avl_delete_node(prune_tree, node); - } -cp -} + avl_node_t *node; + connection_t *c; -/* Lookup functions */ + cp(); -connection_t *lookup_active(ipv4_t address, short unsigned int port) -{ - connection_t cl; -cp - cl.address = address; - cl.port = port; + logger(LOG_DEBUG, _("Connections:")); - return avl_search(active_tree, &cl); + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"), + c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status); + } + + logger(LOG_DEBUG, _("End of connections.")); } -connection_t *lookup_id(char *name) +bool read_connection_config(connection_t *c) { - connection_t cl, *p; -cp - cl.name = name; - p = avl_search(id_tree, &cl); - if(p) - return p; - else - return NULL; -} + char *fname; + int x; -/* Debugging */ + cp(); -void dump_connection_list(void) -{ - avl_node_t *node; - connection_t *cl; -cp - syslog(LOG_DEBUG, _("Connection list:")); - - for(node = connection_tree->head; node; node = node->next) - { - cl = (connection_t *)node->data; - syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"), - cl->name, cl->hostname, cl->port, cl->options, - cl->socket, cl->meta_socket, cl->status); - } - - syslog(LOG_DEBUG, _("Known hosts:")); - - for(node = id_tree->head; node; node = node->next) - { - cl = (connection_t *)node->data; - syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x nexthop %s lastbutonehop %s"), - cl->name, cl->hostname, cl->port, cl->options, - cl->socket, cl->meta_socket, cl->status, cl->nexthop->name, cl->lastbutonehop->name); - } - - syslog(LOG_DEBUG, _("End of connection list.")); -cp -} + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); + free(fname); -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; + return x == 0; }