X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=95a1d4f7cc1ba147bc1dad92e3db41d3e7a8340c;hb=2165931c62f0433fd97bd3ac6aefea3627218946;hp=53e520e92f8d4980ac5d073f9601e409738fb2fc;hpb=82e383710980534d38bb9a8ef22f20677cd85861;p=tinc

diff --git a/src/node.c b/src/node.c
index 53e520e9..95a1d4f7 100644
--- a/src/node.c
+++ b/src/node.c
@@ -17,7 +17,7 @@
     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.2 2001/10/27 12:13:17 guus Exp $
+    $Id: node.c,v 1.1.2.5 2001/10/30 12:59:12 guus Exp $
 */
 
 #include "config.h"
@@ -36,12 +36,14 @@
 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)
 {
   return strcmp(a->name, b->name);
 }
 
-int node_udp_compare(connection_t *a, connection_t *b)
+int node_udp_compare(node_t *a, node_t *b)
 {
   if(a->address < b->address)
     return -1;
@@ -71,7 +73,8 @@ node_t *new_node(void)
 {
   node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
 cp
-  n->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+  n->subnet_tree = new_subnet_tree();
+  n->edge_tree = new_edge_tree();
   n->queue = list_alloc((list_action_t)free);
 cp
   return n;
@@ -88,6 +91,10 @@ cp
     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
 }
@@ -135,9 +142,9 @@ cp
   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"),
+      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->status, n->nexthop->name, n->via->name);
     }
     
   syslog(LOG_DEBUG, _("End of nodes."));