X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=0e35cd1ede5b73c84b6921e9c1aa6048c3a252b7;hp=451bb084b45010a95c893e9dd02929fd0222a05a;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=87ad5c97a9a73a65050ad7adce34503f856d8665 diff --git a/src/edge.c b/src/edge.c index 451bb084..0e35cd1e 100644 --- a/src/edge.c +++ b/src/edge.c @@ -1,7 +1,7 @@ /* edge.c -- edge tree management - Copyright (C) 2000,2001 Guus Sliepen , - 2000,2001 Ivo Timmermans + Copyright (C) 2000-2013 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 @@ -13,192 +13,113 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: edge.c,v 1.1.2.4 2001/10/30 12:59:12 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include -#include -#include - -#include -#include +#include "system.h" -#include "net.h" /* Don't ask. */ +#include "splay_tree.h" +#include "control_common.h" +#include "edge.h" +#include "logger.h" #include "netutl.h" -#include "config.h" -#include "conf.h" -#include -#include "subnet.h" - +#include "node.h" +#include "utils.h" #include "xalloc.h" -#include "system.h" -avl_tree_t *edge_tree; /* Tree with all known edges (replaces active_tree) */ -avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */ +splay_tree_t *edge_weight_tree; -int edge_compare(edge_t *a, edge_t *b) -{ - int result; - - result = strcmp(a->from->name, b->from->name); - - if(result) - return result; - else - return strcmp(a->to->name, b->to->name); +static int edge_compare(const edge_t *a, const edge_t *b) { + return strcmp(a->to->name, b->to->name); } -/* Evil edge_compare() from a parallel universe ;) +static int edge_weight_compare(const edge_t *a, const edge_t *b) { + int result; -int edge_compare(edge_t *a, edge_t *b) -{ - int result; + result = a->weight - b->weight; - return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result; -} + if(result) + return result; -*/ + result = strcmp(a->from->name, b->from->name); -int edge_name_compare(edge_t *a, edge_t *b) -{ - int result; - char *name_a1, *name_a2, *name_b1, *name_b2; - - if(strcmp(a->from->name, a->to->name) < 0) - name_a1 = a->from->name, name_a2 = a->to->name; - else - name_a1 = a->to->name, name_a2 = a->from->name; - - if(strcmp(b->from->name, b->to->name) < 0) - name_b1 = b->from->name, name_b2 = b->to->name; - else - name_b1 = b->to->name, name_b2 = b->from->name; - - result = strcmp(name_a1, name_b1); - - if(result) - return result; - else - return strcmp(name_a2, name_b2); -} + if(result) + return result; -int edge_weight_compare(edge_t *a, edge_t *b) -{ - int result; - - result = a->weight - b->weight; - - if(result) - return result; - else - return edge_name_compare(a, b); + return strcmp(a->to->name, b->to->name); } -void init_edges(void) -{ -cp - edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL); - edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL); -cp +void init_edges(void) { + edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL); } -avl_tree_t *new_edge_tree(void) -{ -cp - return avl_alloc_tree((avl_compare_t)edge_name_compare, NULL); -cp +splay_tree_t *new_edge_tree(void) { + return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge); } -void free_edge_tree(avl_tree_t *edge_tree) -{ -cp - avl_delete_tree(edge_tree); -cp +void free_edge_tree(splay_tree_t *edge_tree) { + splay_delete_tree(edge_tree); } -void exit_edges(void) -{ -cp - avl_delete_tree(edge_tree); -cp +void exit_edges(void) { + splay_delete_tree(edge_weight_tree); } /* Creation and deletion of connection elements */ -edge_t *new_edge(void) -{ - edge_t *e; -cp - e = (edge_t *)xmalloc_and_zero(sizeof(*e)); -cp - return e; +edge_t *new_edge(void) { + return xzalloc(sizeof(edge_t)); } -void free_edge(edge_t *e) -{ -cp - free(e); -cp -} +void free_edge(edge_t *e) { + sockaddrfree(&e->address); + sockaddrfree(&e->local_address); -void edge_add(edge_t *e) -{ -cp - avl_insert(edge_tree, e); - avl_insert(edge_weight_tree, e); - avl_insert(e->from->edge_tree, e); - avl_insert(e->to->edge_tree, e); -cp + free(e); } -void edge_del(edge_t *e) -{ -cp - avl_delete(edge_tree, e); - avl_delete(edge_weight_tree, e); - avl_delete(e->from->edge_tree, e); - avl_delete(e->to->edge_tree, e); -cp +void edge_add(edge_t *e) { + splay_insert(edge_weight_tree, e); + splay_insert(e->from->edge_tree, e); + + e->reverse = lookup_edge(e->to, e->from); + + if(e->reverse) + e->reverse->reverse = e; } -edge_t *lookup_edge(node_t *from, node_t *to) -{ - edge_t v, *result; -cp - v.from = from; - v.to = to; +void edge_del(edge_t *e) { + if(e->reverse) + e->reverse->reverse = NULL; + + splay_delete(edge_weight_tree, e); + splay_delete(e->from->edge_tree, e); +} - result = avl_search(edge_tree, &v); +edge_t *lookup_edge(node_t *from, node_t *to) { + edge_t v; - if(result) - return result; -cp - v.from = to; - v.to = from; + v.from = from; + v.to = to; - return avl_search(edge_tree, &v); + return splay_search(from->edge_tree, &v); } -void dump_edges(void) -{ - avl_node_t *node; - edge_t *e; -cp - syslog(LOG_DEBUG, _("Edges:")); - - for(node = edge_tree->head; node; node = node->next) - { - e = (edge_t *)node->data; - syslog(LOG_DEBUG, _(" %s - %s options %ld weight %d"), - e->from->name, e->to->name, e->options, e->weight); - } - - syslog(LOG_DEBUG, _("End of edges.")); -cp +bool dump_edges(connection_t *c) { + for splay_each(node_t, n, node_tree) { + for splay_each(edge_t, e, n->edge_tree) { + char *address = sockaddr2hostname(&e->address); + char* local_address = sockaddr2hostname(&e->local_address); + send_request(c, "%d %d %s %s %s %s %x %d", + CONTROL, REQ_DUMP_EDGES, + e->from->name, e->to->name, address, + local_address, e->options, e->weight); + free(address); + free(local_address); + } + } + + return send_request(c, "%d %d", CONTROL, REQ_DUMP_EDGES); }