X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=3bceb00433581aaf50983d67469329c7364d90b0;hp=eb664d272f08c377fd8f7ac8ebf0a1fe08543ebe;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=627f7c22b447bd464b536cd016278545674df93d diff --git a/src/edge.c b/src/edge.c index eb664d27..3bceb004 100644 --- a/src/edge.c +++ b/src/edge.c @@ -1,7 +1,7 @@ /* edge.c -- edge tree management - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2000-2003 Guus Sliepen , + 2000-2003 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,195 +17,155 @@ 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.11 2002/06/21 10:11:12 guus Exp $ + $Id: edge.c,v 1.1.2.21 2003/07/12 17:41:45 guus Exp $ */ #include "config.h" #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" +#include "edge.h" +#include "node.h" +#include "logger.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 */ +avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */ -int edge_compare(edge_t *a, edge_t *b) +static int edge_compare(edge_t *a, edge_t *b) { - int result; - - result = strcmp(a->from.node->name, b->from.node->name); - - if(result) - return result; - else - return strcmp(a->to.node->name, b->to.node->name); + return strcmp(a->to->name, b->to->name); } -/* Evil edge_compare() from a parallel universe ;) - -int edge_compare(edge_t *a, edge_t *b) +static int edge_weight_compare(edge_t *a, edge_t *b) { - int result; + int result; - return (result = strcmp(a->from.node->name, b->from.node->name)) || (result = strcmp(a->to.node->name, b->to.node->name)), result; -} + result = a->weight - b->weight; -*/ + if(result) + return result; -int edge_name_compare(edge_t *a, edge_t *b) -{ - int result; - char *name_a1, *name_a2, *name_b1, *name_b2; + result = strcmp(a->from->name, b->from->name); - if(strcmp(a->from.node->name, a->to.node->name) < 0) - name_a1 = a->from.node->name, name_a2 = a->to.node->name; - else - name_a1 = a->to.node->name, name_a2 = a->from.node->name; + if(result) + return result; - if(strcmp(b->from.node->name, b->to.node->name) < 0) - name_b1 = b->from.node->name, name_b2 = b->to.node->name; - else - name_b1 = b->to.node->name, name_b2 = b->from.node->name; - - result = strcmp(name_a1, name_b1); - - if(result) - return result; - else - return strcmp(name_a2, name_b2); -} - -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 + cp(); + + edge_weight_tree = + avl_alloc_tree((avl_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 + cp(); + + return avl_alloc_tree((avl_compare_t) edge_compare, NULL); } void free_edge_tree(avl_tree_t *edge_tree) { -cp - avl_delete_tree(edge_tree); -cp + cp(); + + avl_delete_tree(edge_tree); } void exit_edges(void) { -cp - avl_delete_tree(edge_tree); -cp + cp(); + + avl_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; + cp(); + + return (edge_t *) xmalloc_and_zero(sizeof(edge_t)); } void free_edge(edge_t *e) { -cp - free(e); -cp + cp(); + + free(e); } void edge_add(edge_t *e) { -cp - avl_insert(edge_tree, e); - avl_insert(edge_weight_tree, e); - avl_insert(e->from.node->edge_tree, e); - avl_insert(e->to.node->edge_tree, e); -cp + cp(); + + avl_insert(edge_weight_tree, e); + avl_insert(e->from->edge_tree, e); + + e->reverse = lookup_edge(e->to, e->from); + + if(e->reverse) + e->reverse->reverse = e; } void edge_del(edge_t *e) { -cp - avl_delete(edge_tree, e); - avl_delete(edge_weight_tree, e); - avl_delete(e->from.node->edge_tree, e); - avl_delete(e->to.node->edge_tree, e); -cp + cp(); + + if(e->reverse) + e->reverse->reverse = NULL; + + avl_delete(e->from->edge_tree, e); + avl_delete(edge_weight_tree, e); } edge_t *lookup_edge(node_t *from, node_t *to) { - edge_t v, *result; -cp - v.from.node = from; - v.to.node = to; + edge_t v; - result = avl_search(edge_tree, &v); + cp(); - if(result) - return result; -cp - v.from.node = to; - v.to.node = from; + v.from = from; + v.to = to; - return avl_search(edge_tree, &v); + return avl_search(from->edge_tree, &v); } void dump_edges(void) { - avl_node_t *node; - edge_t *e; - char *from_udp, *to_udp; -cp - syslog(LOG_DEBUG, _("Edges:")); - - for(node = edge_tree->head; node; node = node->next) - { - e = (edge_t *)node->data; - from_udp = sockaddr2hostname(&e->from.udpaddress); - to_udp = sockaddr2hostname(&e->to.udpaddress); - syslog(LOG_DEBUG, _(" %s at %s - %s at %s options %lx weight %d"), - e->from.node->name, from_udp, - e->to.node->name, to_udp, - e->options, e->weight); - free(from_udp); - free(to_udp); - } - - syslog(LOG_DEBUG, _("End of edges.")); -cp + avl_node_t *node, *node2; + node_t *n; + edge_t *e; + char *address; + + cp(); + + logger(LOG_DEBUG, _("Edges:")); + + for(node = node_tree->head; node; node = node->next) { + n = (node_t *) node->data; + for(node2 = n->edge_tree->head; node2; node2 = node2->next) { + e = (edge_t *) node2->data; + address = sockaddr2hostname(&e->address); + logger(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"), + e->from->name, e->to->name, address, e->options, e->weight); + free(address); + } + } + + logger(LOG_DEBUG, _("End of edges.")); }