X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=baa6d26c34362789398169b2a9a3324010b8fb6a;hb=28be4baae016a5a771d0d9ec6e97ef38a4fc9e46;hp=24c67c368bce1ab0423aabd03e3cb2c9f55d0f8d;hpb=94497336efc1cc60561575e74d420e9e8e8c657e;p=tinc diff --git a/src/edge.c b/src/edge.c index 24c67c36..baa6d26c 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-2021 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,134 +13,126 @@ 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.1 2001/10/28 08:41:19 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 "xalloc.h" -#include "system.h" -avl_tree_t *edge_tree; /* Tree with all known vertices (replaces active_tree) */ +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; - result = strcmp(a->from->name, b->from->name); - - if(result) - return result; - else - return strcmp(a->to->name, b->to->name); -} + if(result) { + return result; + } -/* Evil edge_compare() from a parallel universe ;) + result = strcmp(a->from->name, b->from->name); -int edge_compare(edge_t *a, edge_t *b) -{ - int result; + if(result) { + return result; + } - return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result; + return strcmp(a->to->name, b->to->name); } -*/ +splay_tree_t edge_weight_tree = { + .compare = (splay_compare_t) edge_weight_compare, +}; + +static int edge_compare(const edge_t *a, const edge_t *b) { + return strcmp(a->to->name, b->to->name); +} -void init_vertices(void) -{ -cp - edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL); -cp +void init_edge_tree(splay_tree_t *tree) { + memset(tree, 0, sizeof(*tree)); + tree->compare = (splay_compare_t) edge_compare; + tree->delete = (splay_action_t) free_edge; } -void exit_vertices(void) -{ -cp - avl_delete_tree(edge_tree); -cp +void exit_edges(void) { + splay_empty_tree(&edge_weight_tree); } /* Creation and deletion of connection elements */ -edge_t *new_edge(void) -{ -cp - edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v)); -cp - return v; +edge_t *new_edge(void) { + return xzalloc(sizeof(edge_t)); } -void free_edge(edge_t *v) -{ -cp - free(v); -cp -} +void free_edge(edge_t *e) { + if(e) { + sockaddrfree(&e->address); + sockaddrfree(&e->local_address); -void edge_add(edge_t *v) -{ -cp - avl_insert(edge_tree, v); -cp + free(e); + } } -void edge_del(edge_t *v) -{ -cp - avl_delete(edge_tree, v); -cp +void edge_add(edge_t *e) { + splay_node_t *node = splay_insert(&e->from->edge_tree, e); + + if(!node) { + logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_tree\n", e->from->name, e->to->name); + return; + } + + + e->reverse = lookup_edge(e->to, e->from); + + if(e->reverse) { + e->reverse->reverse = e; + } + + node = splay_insert(&edge_weight_tree, e); + + if(!node) { + logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_weight_tree\n", e->from->name, e->to->name); + return; + } } -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_vertices(void) -{ - avl_node_t *node; - edge_t *v; -cp - syslog(LOG_DEBUG, _("Vertices:")); - - for(node = edge_tree->head; node; node = node->next) - { - v = (edge_t *)node->data; - syslog(LOG_DEBUG, _(" %s - %s options %ld"), - v->from->name, v->to->name, v->options); - } - - syslog(LOG_DEBUG, _("End of vertices.")); -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); }