X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=fa2f81d792ad2f8ecf797bb6861c1b31fa3f1443;hp=61657a3b9d792342d0a6e48e9d6c7f9a19b5e864;hb=12f6b80429bc05a828051d72cc46f173e4657180;hpb=f8b4a000d008082e5c7e511a49318b8dea8fd08d diff --git a/src/connection.c b/src/connection.c index 61657a3b..fa2f81d7 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,2001 Guus Sliepen , + 2000,2001 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,15 +17,17 @@ 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.4 2000/11/22 18:54:07 guus Exp $ + $Id: connection.c,v 1.1.2.14 2001/07/20 20:25:10 guus Exp $ */ #include "config.h" #include #include +#include -#include +#include +#include #include "net.h" /* Don't ask. */ #include "netutl.h" @@ -39,16 +41,26 @@ /* Root of the connection list */ -rbltree_t *connection_tree; -rbltree_t *id_tree; +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 */ 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; @@ -61,22 +73,32 @@ 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; +} + void init_connections(void) { - connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection); - id_tree = new_rbltree((rbl_compare_t)id_compare, NULL); + 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(sizeof(*p)); + connection_t *p = (connection_t *)xmalloc_and_zero(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); + p->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL); + p->queue = list_alloc((list_action_t)free); cp return p; } @@ -84,11 +106,9 @@ cp void free_connection(connection_t *p) { cp - if(p->sq) - destroy_queue(p->sq); - if(p->rq) - destroy_queue(p->rq); - if(p->name && p->name!=unknown) + if(p->queue) + list_delete_list(p->queue); + if(p->name) free(p->name); if(p->hostname) free(p->hostname); @@ -105,67 +125,94 @@ cp } /* - remove all marked connections + Free all trees. */ -void prune_connection_tree(void) +void destroy_trees(void) { - rbl_t *rbl; - connection_t *cl; cp - RBL_FOREACH(connection_tree, rbl) - { - cl = (connection_t *) rbl->data; - if(cl->status.remove) - connection_del(cl); - } + avl_delete_tree(id_tree); + avl_delete_tree(active_tree); + avl_delete_tree(connection_tree); + avl_delete_tree(prune_tree); cp } -/* - free all elements of connection -*/ -void destroy_connection_tree(void) +/* Connection management */ + +void connection_add(connection_t *cl) { cp - rbl_delete_rbltree(id_tree); - rbl_delete_rbltree(connection_tree); + avl_insert(connection_tree, cl); cp } -/* Linked list management */ +void connection_del(connection_t *cl) +{ +cp + active_del(cl); -void connection_add(connection_t *cl) + if(cl->status.meta) + avl_delete(connection_tree, cl); +cp +} + +void active_add(connection_t *cl) { cp - rbl_insert(connection_tree, cl); + 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); + cl->status.active = 0; + } cp } void id_add(connection_t *cl) { cp - rbl_insert(id_tree, cl); + avl_insert(id_tree, cl); cp } -void connection_del(connection_t *cl) +void prune_add(connection_t *cl) { cp - rbl_delete(id_tree, cl); - rbl_delete(connection_tree, cl); + avl_insert(prune_tree, cl); +cp +} + +void prune_flush(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 } /* Lookup functions */ -connection_t *lookup_connection(ipv4_t address, short unsigned int port) +connection_t *lookup_active(ipv4_t address, short unsigned int port) { - connection_t cl, *p; + connection_t cl; cp cl.address = address; cl.port = port; - return rbl_search(connection_tree, &cl); + return avl_search(active_tree, &cl); } connection_t *lookup_id(char *name) @@ -173,8 +220,8 @@ connection_t *lookup_id(char *name) connection_t cl, *p; cp cl.name = name; - p = rbl_search(id_tree, &cl); - if(p && p->status.active) + p = avl_search(id_tree, &cl); + if(p) return p; else return NULL; @@ -184,20 +231,26 @@ cp void dump_connection_list(void) { - rbl_t *rbl; + avl_node_t *node; 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); + 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:")); - RBL_FOREACH(connection_tree, rbl) + for(node = id_tree->head; node; node = node->next) { - 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 = (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); }