X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=186a60b110d32db45be36d1aa91d701ed5b91af2;hp=08c165e5586bd7331eb3f6e368ccc8d72ce8f48b;hb=21027b1d5702c331b1ebb262bb149c75be1f24b1;hpb=07a08f5539f441e66946d1db1711dc584f8621c4 diff --git a/src/connection.c b/src/connection.c index 08c165e5..186a60b1 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,13 +17,14 @@ 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.8 2001/01/07 15:25:40 guus Exp $ + $Id: connection.c,v 1.1.2.17 2001/10/08 11:47:55 guus Exp $ */ #include "config.h" #include #include +#include #include #include @@ -40,8 +41,10 @@ /* Root of the connection list */ -avl_tree_t *connection_tree; -avl_tree_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 */ @@ -50,6 +53,11 @@ 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; @@ -65,10 +73,22 @@ 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 = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection); + 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 */ @@ -88,7 +108,7 @@ void free_connection(connection_t *p) cp if(p->queue) list_delete_list(p->queue); - if(p->name && p->name!=unknown) + if(p->name) free(p->name); if(p->hostname) free(p->hostname); @@ -105,40 +125,54 @@ cp } /* - remove all marked connections + Free all trees. */ -void prune_connection_tree(void) +void destroy_trees(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); - } + 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 - avl_delete_tree(id_tree); - avl_delete_tree(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 - avl_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); + } cp } @@ -149,24 +183,35 @@ cp cp } -void connection_del(connection_t *cl) +void prune_add(connection_t *cl) +{ +cp + avl_insert(prune_tree, cl); +cp +} + +void prune_flush(void) { + avl_node_t *node, *next; cp - avl_delete(id_tree, cl); - avl_delete(connection_tree, cl); + 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; cp cl.address = address; cl.port = port; - return avl_search(connection_tree, &cl); + return avl_search(active_tree, &cl); } connection_t *lookup_id(char *name) @@ -175,7 +220,7 @@ connection_t *lookup_id(char *name) cp cl.name = name; p = avl_search(id_tree, &cl); - if(p && p->status.active) + if(p) return p; else return NULL; @@ -190,18 +235,24 @@ void dump_connection_list(void) 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 flags %d sockets %d, %d status %04x"), - cl->name, cl->hostname, cl->port, cl->flags, + 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 prevhop %s via %s"), + cl->name, cl->hostname, cl->port, cl->options, + cl->socket, cl->meta_socket, cl->status, cl->nexthop->name, cl->prevhop->name, cl->via->name); + } + syslog(LOG_DEBUG, _("End of connection list.")); cp }