X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=0960ca761c32595b940103091459c0a8ec852090;hb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;hp=a9b8858afb2866ef6077864e5970fa832b4927ae;hpb=8df22248293a8cd5e6056415b6e08740e40aa2bc;p=meshlink diff --git a/src/node.c b/src/node.c index a9b8858a..0960ca76 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 Ivo Timmermans + Copyright (C) 2001-2006 Guus Sliepen , + 2001-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 @@ -17,12 +17,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: node.c,v 1.1.2.31 2003/12/22 11:04:16 guus Exp $ + $Id$ */ #include "system.h" -#include "avl_tree.h" +#include "splay_tree.h" #include "logger.h" #include "net.h" #include "netutl.h" @@ -30,18 +30,16 @@ #include "utils.h" #include "xalloc.h" -avl_tree_t *node_tree; /* Known nodes, sorted by name */ -avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ +splay_tree_t *node_tree; /* Known nodes, sorted by name */ +splay_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ node_t *myself; -static int node_compare(const node_t *a, const node_t *b) -{ +static int node_compare(const node_t *a, const node_t *b) { return strcmp(a->name, b->name); } -static int node_udp_compare(const node_t *a, const node_t *b) -{ +static int node_udp_compare(const node_t *a, const node_t *b) { int result; cp(); @@ -54,24 +52,21 @@ static int node_udp_compare(const node_t *a, const node_t *b) return (a->name && b->name) ? strcmp(a->name, b->name) : 0; } -void init_nodes(void) -{ +void init_nodes(void) { cp(); - node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node); - node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL); + node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node); + node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL); } -void exit_nodes(void) -{ +void exit_nodes(void) { cp(); - avl_delete_tree(node_udp_tree); - avl_delete_tree(node_tree); + splay_delete_tree(node_udp_tree); + splay_delete_tree(node_tree); } -node_t *new_node(void) -{ +node_t *new_node(void) { node_t *n = xmalloc_and_zero(sizeof(*n)); cp(); @@ -86,19 +81,12 @@ node_t *new_node(void) return n; } -void free_node(node_t *n) -{ +void free_node(node_t *n) { cp(); if(n->queue) list_delete_list(n->queue); - if(n->name) - free(n->name); - - if(n->hostname) - free(n->hostname); - if(n->key) free(n->key); @@ -112,23 +100,25 @@ void free_node(node_t *n) EVP_CIPHER_CTX_cleanup(&n->packet_ctx); - if(n->mtuevent) - event_del(n->mtuevent); + event_del(&n->mtuevent); + if(n->hostname) + free(n->hostname); + + if(n->name) + free(n->name); + free(n); } -void node_add(node_t *n) -{ +void node_add(node_t *n) { cp(); - avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); + splay_insert(node_tree, n); } -void node_del(node_t *n) -{ - avl_node_t *node, *next; +void node_del(node_t *n) { + splay_node_t *node, *next; edge_t *e; subnet_t *s; @@ -146,45 +136,20 @@ void node_del(node_t *n) edge_del(e); } - avl_delete(node_tree, n); - avl_delete(node_udp_tree, n); + splay_delete(node_tree, n); } -void update_node_address(node_t *n, const sockaddr_t *address) { - avl_node_t *node; - - node = avl_unlink(node_udp_tree, n); - sockaddrfree(&n->address); - sockaddrcpy(&n->address, address); - - if(n->hostname) - free(n->hostname); - - n->hostname = sockaddr2hostname(&n->address); - avl_insert_node(node_udp_tree, node); - - if(n->options & OPTION_PMTU_DISCOVERY) { - n->mtuprobes = 0; - n->minmtu = 0; - n->maxmtu = MTU; - if(n->status.validkey) - send_mtu_probe(n); - } -} - -node_t *lookup_node(char *name) -{ +node_t *lookup_node(char *name) { node_t n = {0}; cp(); n.name = name; - return avl_search(node_tree, &n); + return splay_search(node_tree, &n); } -node_t *lookup_node_udp(const sockaddr_t *sa) -{ +node_t *lookup_node_udp(const sockaddr_t *sa) { node_t n = {0}; cp(); @@ -192,26 +157,24 @@ node_t *lookup_node_udp(const sockaddr_t *sa) n.address = *sa; n.name = NULL; - return avl_search(node_udp_tree, &n); + return splay_search(node_udp_tree, &n); } -void dump_nodes(void) -{ - avl_node_t *node; +int dump_nodes(struct evbuffer *out) { + splay_node_t *node; node_t *n; cp(); - logger(LOG_DEBUG, _("Nodes:")); - for(node = node_tree->head; node; node = node->next) { n = node->data; - logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)"), + if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)\n"), n->name, n->hostname, n->cipher ? n->cipher->nid : 0, n->digest ? n->digest->type : 0, n->maclength, n->compression, n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", - n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu); + n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu) == -1) + return errno; } - logger(LOG_DEBUG, _("End of nodes.")); + return 0; }