X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=b9a3c237f51d493dd08ebf1ae53cc4c2d9ca1a61;hp=c09ca94aec1d678597005e477220194de68c477a;hb=eaf1208e9d5c5a15e4b23de936830520bf3b5685;hpb=319e0cb48eb00565a11c85b901f54141f8160334 diff --git a/src/connection.c b/src/connection.c index c09ca94a..b9a3c237 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.13 2001/07/15 18:07:31 guus Exp $ + $Id: connection.c,v 1.1.2.35 2002/09/10 22:12:33 guus Exp $ */ #include "config.h" @@ -25,13 +25,13 @@ #include #include #include +#include #include #include -#include "net.h" /* Don't ask. */ +#include "net.h" /* Don't ask. */ #include "netutl.h" -#include "config.h" #include "conf.h" #include #include "subnet.h" @@ -39,198 +39,112 @@ #include "xalloc.h" #include "system.h" -/* Root of the connection list */ - -avl_tree_t *connection_tree; -avl_tree_t *active_tree; -avl_tree_t *id_tree; - -/* Pointer to connection describing myself */ - -connection_t *myself = NULL; - -/* Initialization and callbacks */ +avl_tree_t *connection_tree; /* Meta connections */ +connection_t *broadcast; int connection_compare(connection_t *a, connection_t *b) { - return a->meta_socket - b->meta_socket; + return a - 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, NULL); + 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(); -void init_connections(void) -{ - connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection); - active_tree = avl_alloc_tree((avl_compare_t)active_compare, NULL); - id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL); + avl_delete_tree(connection_tree); + free_connection(broadcast); } -/* 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; -} + connection_t *c; -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 -} + cp(); -/* - remove all marked connections -*/ -void prune_connection_tree(void) -{ - avl_node_t *node, *next; - connection_t *cl; -cp - for(node = connection_tree->head; node; node = next) - { - next = node->next; - cl = (connection_t *)node->data; - if(cl->status.remove) - connection_del(cl); - } -cp + c = (connection_t *) xmalloc_and_zero(sizeof(connection_t)); + + if(!c) + return NULL; + + gettimeofday(&c->start, NULL); + + return c; } -/* - free all elements of connection -*/ -void destroy_connection_tree(void) +void free_connection(connection_t *c) { -cp - avl_delete_tree(id_tree); - avl_delete_tree(active_tree); - avl_delete_tree(connection_tree); -cp -} + cp(); -/* Linked list 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); + + if(c->outkey) + free(c->outkey); + + if(c->mychallenge) + free(c->mychallenge); + + if(c->hischallenge) + free(c->hischallenge); + + free(c); } -void active_add(connection_t *cl) +void connection_add(connection_t *c) { -cp - avl_insert(active_tree, cl); -cp + cp(); + + avl_insert(connection_tree, c); } -void id_add(connection_t *cl) +void connection_del(connection_t *c) { -cp - avl_insert(id_tree, cl); -cp + cp(); + + avl_delete(connection_tree, c); } -void connection_del(connection_t *cl) +void dump_connections(void) { -cp - avl_delete(id_tree, cl); - avl_delete(active_tree, cl); - avl_delete(connection_tree, cl); -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; + syslog(LOG_DEBUG, _("Connections:")); + + for(node = connection_tree->head; node; node = node->next) { + 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); + } - return avl_search(active_tree, &cl); + syslog(LOG_DEBUG, _("End of connections.")); } -connection_t *lookup_id(char *name) +int read_connection_config(connection_t *c) { - connection_t cl, *p; -cp - cl.name = name; - p = avl_search(id_tree, &cl); - if(p && p->status.active) - 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:")); - - syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"), - myself->name, myself->hostname, myself->port, myself->options, - myself->socket, myself->meta_socket, myself->status); - - 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, _("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; }