X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=642bfacea01dc0b07480e106ce63706436c9dd6f;hp=29034f5aa3e373fd90435564c61169db47ac06a7;hb=8b2b67e26c5b971761f5015764d5e188f6343bc4;hpb=acb853205d6d582d919c59879393b301ad4f4fde diff --git a/src/connection.c b/src/connection.c index 29034f5a..642bface 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-2002 Guus Sliepen , + 2000-2002 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,7 +17,7 @@ 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.15 2001/07/21 15:34:18 guus Exp $ + $Id: connection.c,v 1.1.2.31 2002/09/04 16:26:44 guus Exp $ */ #include "config.h" @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -39,231 +40,104 @@ #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) { - return a->meta_socket - b->meta_socket; -} - -int active_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; -} - -int id_compare(connection_t *a, connection_t *b) -{ - return strcmp(a->name, b->name); -} - -int prune_compare(connection_t *a, connection_t *b) -{ - if(a < b) - return -1; - else if(a > b) - return 1; - else - return 0; + return a - b; } void init_connections(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); -} - -/* Creation and deletion of connection elements */ - -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; -} - -void free_connection(connection_t *p) -{ + connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL); 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); + broadcast = new_connection(); + broadcast->name = xstrdup(_("everyone")); + broadcast->hostname = xstrdup(_("BROADCAST")); cp } -/* - Free all trees. -*/ -void destroy_trees(void) +void exit_connections(void) { cp - avl_delete_tree(id_tree); - avl_delete_tree(active_tree); avl_delete_tree(connection_tree); - avl_delete_tree(prune_tree); cp -} - -/* Connection management */ - -void connection_add(connection_t *cl) -{ -cp - avl_insert(connection_tree, cl); + free_connection(broadcast); cp } -void connection_del(connection_t *cl) +connection_t *new_connection(void) { + connection_t *c; cp - active_del(cl); - - if(cl->status.meta) - avl_delete(connection_tree, cl); -cp -} + c = (connection_t *)xmalloc_and_zero(sizeof(connection_t)); -void active_add(connection_t *cl) -{ -cp - avl_insert(active_tree, cl); - avl_insert(id_tree, cl); - cl->status.active = 1; -cp -} - -void active_del(connection_t *cl) -{ -cp - if(cl->status.active) - { - avl_delete(id_tree, cl); - avl_delete(active_tree, cl); - } -cp -} + if(!c) + return NULL; -void id_add(connection_t *cl) -{ -cp - avl_insert(id_tree, cl); + gettimeofday(&c->start, NULL); cp + return c; } -void prune_add(connection_t *cl) +void free_connection(connection_t *c) { cp - avl_insert(prune_tree, cl); + 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 } -void prune_flush(void) +void connection_add(connection_t *c) { - avl_node_t *node, *next; cp - for(node = prune_tree->head; node; node = next) - { - next = node->next; - avl_delete_node(prune_tree, node); - } + avl_insert(connection_tree, c); cp } -/* Lookup functions */ - -connection_t *lookup_active(ipv4_t address, short unsigned int port) +void connection_del(connection_t *c) { - connection_t cl; cp - cl.address = address; - cl.port = port; - - return avl_search(active_tree, &cl); -} - -connection_t *lookup_id(char *name) -{ - connection_t cl, *p; + avl_delete(connection_tree, c); cp - cl.name = name; - p = avl_search(id_tree, &cl); - if(p) - return p; - else - return NULL; } -/* Debugging */ - -void dump_connection_list(void) +void dump_connections(void) { avl_node_t *node; - connection_t *cl; + connection_t *c; cp - syslog(LOG_DEBUG, _("Connection list:")); + syslog(LOG_DEBUG, _("Connections:")); 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"), - cl->name, cl->hostname, cl->port, cl->options, - cl->socket, cl->meta_socket, cl->status); + 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 connection list.")); + syslog(LOG_DEBUG, _("End of connections.")); cp } -int read_host_config(connection_t *cl) +int read_connection_config(connection_t *c) { char *fname; int x; cp - asprintf(&fname, "%s/hosts/%s", confbase, cl->name); - x = read_config_file(&cl->config, fname); + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); free(fname); cp return x;