X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hb=2224a56ea44bffdafbe29ba7b74d1a0adb0cbd95;hp=a0f5535fc9c7a774e827740bc18d38862cf0b024;hpb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;p=meshlink diff --git a/src/edge.c b/src/edge.c index a0f5535f..afe9cfe3 100644 --- a/src/edge.c +++ b/src/edge.c @@ -1,7 +1,6 @@ /* edge.c -- edge tree management - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen 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,172 +12,104 @@ 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.12 2002/09/04 13:48:51 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 "netutl.h" -#include "config.h" -#include "conf.h" -#include -#include "subnet.h" +#include "splay_tree.h" #include "edge.h" +#include "logger.h" +#include "meshlink_internal.h" +#include "netutl.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 */ - -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; + } -int edge_weight_compare(edge_t *a, edge_t *b) -{ - int result; + result = strcmp(a->from->name, b->from->name); - result = a->weight - b->weight; + if(result) { + return result; + } - if(result) - return result; - else - return edge_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(meshlink_handle_t *mesh) { + mesh->edges = 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_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(meshlink_handle_t *mesh) { + if(mesh->edges) { + splay_delete_tree(mesh->edges); + } + + mesh->edges = NULL; } /* 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); -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); -cp - e->reverse = lookup_edge(e->to, e->from); - if(e->reverse) - e->reverse->reverse = e; -cp + free(e); } -void edge_del(edge_t *e) -{ -cp - if(e->reverse) - e->reverse->reverse = NULL; -cp - avl_delete(edge_tree, e); - avl_delete(edge_weight_tree, e); - avl_delete(e->from->edge_tree, e); -cp +void edge_add(meshlink_handle_t *mesh, edge_t *e) { + splay_insert(mesh->edges, 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; -cp - v.from = from; - v.to = to; +void edge_del(meshlink_handle_t *mesh, edge_t *e) { + if(e->reverse) { + e->reverse->reverse = NULL; + } - return avl_search(edge_tree, &v); + splay_delete(mesh->edges, e); + splay_delete(e->from->edge_tree, e); } -void dump_edges(void) -{ - avl_node_t *node; - edge_t *e; - char *address; -cp - syslog(LOG_DEBUG, _("Edges:")); - - for(node = edge_tree->head; node; node = node->next) - { - e = (edge_t *)node->data; - address = sockaddr2hostname(&e->address); - syslog(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"), - e->from->name, e->to->name, address, - e->options, e->weight); - free(address); - } - - syslog(LOG_DEBUG, _("End of edges.")); -cp +edge_t *lookup_edge(node_t *from, node_t *to) { + assert(from); + assert(to); + + edge_t v; + + v.from = from; + v.to = to; + + return splay_search(from->edge_tree, &v); }