X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=2abd7fbf133ae2acd782f11ce91f3a328e2196e0;hp=3776d18494209dbd26d19839e35558564f77948a;hb=d9a62c6354d1e2ad78ee8c610518ae9f9ab012d1;hpb=ac066bb057dcb187bf91670793ba5e6ca456e052

diff --git a/src/node.c b/src/node.c
index 3776d184..2abd7fbf 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.warande.net>,
+                  2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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,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.3 2001/10/27 13:13:35 guus Exp $
+    $Id: node.c,v 1.1.2.9 2002/02/11 15:59:18 guus Exp $
 */
 
 #include "config.h"
@@ -43,14 +43,17 @@ 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;
-  else if (a->address > b->address)
+  if (a->address > b->address)
     return 1;
-  else
-    return a->port - b->port;
+  if (a->port < b->port)
+    return -1;
+  if (a->port > b->port)
+    return 1;
+  return (a->name && b->name)?strcmp(a->name, b->name):0;
 }
 
 void init_nodes(void)
@@ -73,7 +76,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;
@@ -90,6 +94,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
 }
@@ -104,6 +112,23 @@ cp
 
 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);
@@ -122,6 +147,7 @@ node_t *lookup_node_udp(ipv4_t address, port_t port)
 {
   node_t n;
 cp
+  n.name = NULL;
   n.address = address;
   n.port = port;
   return avl_search(node_udp_tree, &n);
@@ -137,9 +163,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"),
-             n->name, n->hostname, n->port, n->options,
-             n->status);
+      syslog(LOG_DEBUG, _(" %s at %s port %hd cipher %d digest %d maclength %d compression %d options %ld status %04x nexthop %s via %s"),
+             n->name, n->hostname, n->port, 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:"-");
     }
     
   syslog(LOG_DEBUG, _("End of nodes."));