X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=5985cbf0c5ac4317c912c07088862b6c394c76cf;hp=46d82d2ce8e1648c4649cbf4eaf6df8da6c67291;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=1857b3c97c261dda9978a67d07b315bb3ca68841 diff --git a/src/connection.c b/src/connection.c index 46d82d2c..5985cbf0 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000-2005 Guus Sliepen , + 2000-2005 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,167 +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.2 2000/11/20 19:41:10 guus Exp $ + $Id$ */ -#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 "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 */ -rbltree_t *connection_tree; -connection_t *myself = NULL; +avl_tree_t *connection_tree; /* Meta connections */ +connection_t *broadcast; -/* Initialization and callbacks */ - -int connection_compare(connection_t *a, connection_t *b) +static int connection_compare(const connection_t *a, const connection_t *b) { - return strcmp(a->name, b->name); + return (void *)a - (void *)b; } void init_connections(void) { - connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection); -} + cp(); -/* Creation and deletion of connection elements */ + 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")); +} -connection_t *new_connection(void) +void exit_connections(void) { - connection_t *p = (connection_t *)xmalloc(sizeof(*p)); -cp - /* initialise all those stupid pointers at once */ - memset(p, '\0', sizeof(*p)); - - p->subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, NULL); -cp - return p; + cp(); + + avl_delete_tree(connection_tree); + free_connection(broadcast); } -void free_connection(connection_t *p) +connection_t *new_connection(void) { -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 + connection_t *c; + + cp(); + + c = xmalloc_and_zero(sizeof(connection_t)); + + if(!c) + return NULL; + + gettimeofday(&c->start, NULL); + + return c; } -/* - remove all marked connections -*/ -void prune_connection_tree(void) +void free_connection(connection_t *c) { - 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 + 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); } -/* - free all elements of connection -*/ -void destroy_connection_tree(void) +void connection_add(connection_t *c) { -cp - rbl_delete_rbltree(connection_tree); -cp -} + cp(); -/* Linked list management */ + avl_insert(connection_tree, c); +} -void connection_add(connection_t *cl) +void connection_del(connection_t *c) { -cp - rbl_insert(connection_tree, cl); -cp + cp(); + + avl_delete(connection_tree, c); } -void connection_del(connection_t *cl) +void dump_connections(void) { -cp - rbl_delete(connection_tree, cl); -cp -} + avl_node_t *node; + connection_t *c; -/* Lookup functions */ + cp(); -connection_t *lookup_id(char *name) -{ - connection_t cl; -cp - cl.name = name; - return rbl_search(connection_tree, &cl); -cp -} + logger(LOG_DEBUG, _("Connections:")); -/* Debugging */ + 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); + } -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 + logger(LOG_DEBUG, _("End of connections.")); } -int read_host_config(connection_t *cl) +bool 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); - free(fname); -cp - return x; + char *fname; + int x; + + cp(); + + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); + free(fname); + + return x == 0; }