X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=5fc94a94017760607770d3b8603bcbe6fd7d4209;hp=edad62bb5246f713969946c9b1da0e227993e5d5;hb=5cb147135184e3748c6f5e6e6203d22ab9f904f8;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/node.c b/src/node.c index edad62bb..5fc94a94 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2002 Guus Sliepen , - 2001-2002 Ivo Timmermans + Copyright (C) 2001-2003 Guus Sliepen , + 2001-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,35 +17,30 @@ 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.20 2003/07/06 22:11:32 guus Exp $ + $Id: node.c,v 1.1.2.23 2003/07/17 15:06:26 guus Exp $ */ -#include "config.h" - -#include +#include "system.h" -#include -#include "node.h" -#include "netutl.h" -#include "net.h" +#include "avl_tree.h" #include "logger.h" - -#include -#include - -#include "system.h" +#include "net.h" +#include "netutl.h" +#include "node.h" +#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 */ 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); } -int node_udp_compare(node_t *a, node_t *b) +static int node_udp_compare(node_t *a, node_t *b) { int result; @@ -173,16 +168,16 @@ void dump_nodes(void) cp(); - logger(DEBUG_ALWAYS, LOG_DEBUG, _("Nodes:")); + logger(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"), + logger(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.")); + logger(LOG_DEBUG, _("End of nodes.")); }