X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=350d02d8440b612609df2afe41d9f146a30a4ddf;hp=9a51838252580ea1bee566de8b3e176b69228dc3;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=c0a3f67a5d66088aaf526f1461986f9e86d5dd1f diff --git a/src/node.c b/src/node.c index 9a518382..350d02d8 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001 Guus Sliepen , - 2001 Ivo Timmermans + Copyright (C) 2001-2002 Guus Sliepen , + 2001-2002 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,153 +17,172 @@ 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.6 2001/10/31 12:50:24 guus Exp $ + $Id: node.c,v 1.1.2.21 2003/07/06 23:16:28 guus Exp $ */ #include "config.h" #include -#include #include #include "node.h" +#include "netutl.h" #include "net.h" +#include "logger.h" + #include #include #include "system.h" -avl_tree_t *node_tree; /* Known nodes, sorted by name */ -avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ +avl_tree_t *node_tree; /* Known nodes, sorted by name */ +avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ node_t *myself; -int node_compare(node_t *a, node_t *b) +static int node_compare(node_t *a, node_t *b) { - return strcmp(a->name, b->name); + return strcmp(a->name, b->name); } -int node_udp_compare(node_t *a, node_t *b) +static int node_udp_compare(node_t *a, node_t *b) { - if(a->address < b->address) - return -1; - else if (a->address > b->address) - return 1; - else - return a->port - b->port; + int result; + + cp(); + + result = sockaddrcmp(&a->address, &b->address); + + if(result) + return result; + + return (a->name && b->name) ? strcmp(a->name, b->name) : 0; } void init_nodes(void) { -cp - node_tree = avl_alloc_tree((avl_compare_t)node_compare, NULL); - node_udp_tree = avl_alloc_tree((avl_compare_t)node_udp_compare, NULL); -cp + cp(); + + node_tree = avl_alloc_tree((avl_compare_t) node_compare, NULL); + node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL); } void exit_nodes(void) { -cp - avl_delete_tree(node_tree); - avl_delete_tree(node_udp_tree); -cp + cp(); + + avl_delete_tree(node_tree); + avl_delete_tree(node_udp_tree); } node_t *new_node(void) { - node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n)); -cp - n->subnet_tree = new_subnet_tree(); - n->edge_tree = new_edge_tree(); - n->queue = list_alloc((list_action_t)free); -cp - return n; + node_t *n = (node_t *) xmalloc_and_zero(sizeof(*n)); + + cp(); + + n->subnet_tree = new_subnet_tree(); + n->edge_tree = new_edge_tree(); + n->queue = list_alloc((list_action_t) free); + EVP_CIPHER_CTX_init(&n->packet_ctx); + + return 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); - if(n->subnet_tree) - free_subnet_tree(n->subnet_tree); - if(n->edge_tree) - free_edge_tree(n->edge_tree); - free(n); -cp + 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); + + if(n->subnet_tree) + free_subnet_tree(n->subnet_tree); + + if(n->edge_tree) + free_edge_tree(n->edge_tree); + + EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + + free(n); } void node_add(node_t *n) { -cp - avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); -cp + cp(); + + avl_insert(node_tree, n); + avl_insert(node_udp_tree, n); } void node_del(node_t *n) { - avl_node_t *node, *next; - edge_t *e; - subnet_t *s; -cp - for(node = n->subnet_tree->head; node; node = next) - { - next = node->next; - s = (subnet_t *)node->data; - subnet_del(n, s); - } - - for(node = n->subnet_tree->head; node; node = next) - { - next = node->next; - e = (edge_t *)node->data; - edge_del(e); - } -cp - avl_delete(node_tree, n); - avl_delete(node_udp_tree, n); -cp + avl_node_t *node, *next; + edge_t *e; + subnet_t *s; + + cp(); + + for(node = n->subnet_tree->head; node; node = next) { + next = node->next; + s = (subnet_t *) node->data; + subnet_del(n, s); + } + + for(node = n->edge_tree->head; node; node = next) { + next = node->next; + e = (edge_t *) node->data; + edge_del(e); + } + + avl_delete(node_tree, n); + avl_delete(node_udp_tree, n); } node_t *lookup_node(char *name) { - node_t n; -cp - n.name = name; - return avl_search(node_tree, &n); + node_t n; + cp(); + n.name = name; + return avl_search(node_tree, &n); } -node_t *lookup_node_udp(ipv4_t address, port_t port) +node_t *lookup_node_udp(sockaddr_t *sa) { - node_t n; -cp - n.address = address; - n.port = port; - return avl_search(node_udp_tree, &n); + node_t n; + cp(); + n.address = *sa; + n.name = NULL; + + return avl_search(node_udp_tree, &n); } void dump_nodes(void) { - avl_node_t *node; - node_t *n; -cp - syslog(LOG_DEBUG, _("Nodes:")); - - for(node = node_tree->head; node; node = node->next) - { - n = (node_t *)node->data; - syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld status %04x nexthop %s via %s"), - n->name, n->hostname, n->port, n->options, - n->status, n->nexthop->name, n->via->name); - } - - syslog(LOG_DEBUG, _("End of nodes.")); -cp + avl_node_t *node; + node_t *n; + + cp(); + + logger(DEBUG_ALWAYS, LOG_DEBUG, _("Nodes:")); + + for(node = node_tree->head; node; node = node->next) { + n = (node_t *) node->data; + logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"), + n->name, n->hostname, n->cipher ? n->cipher->nid : 0, + n->digest ? n->digest->type : 0, n->maclength, n->compression, + n->options, n->status, n->nexthop ? n->nexthop->name : "-", + n->via ? n->via->name : "-"); + } + + logger(DEBUG_ALWAYS, LOG_DEBUG, _("End of nodes.")); }