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

diff --git a/src/node.c b/src/node.c
index 3776d184..ba795ba9 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.3 2001/10/27 13:13:35 guus Exp $
+    $Id: node.c,v 1.1.2.7 2001/11/16 17:39:38 zarq Exp $
 */
 
 #include "config.h"
@@ -43,7 +43,7 @@ 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;
@@ -73,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;
@@ -90,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
 }
@@ -104,6 +109,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);
@@ -118,12 +140,11 @@ cp
   return avl_search(node_tree, &n);
 }
 
-node_t *lookup_node_udp(ipv4_t address, port_t port)
+node_t *lookup_node_udp(struct addrinfo *address)
 {
   node_t n;
 cp
   n.address = address;
-  n.port = port;
   return avl_search(node_udp_tree, &n);
 }
 
@@ -137,9 +158,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 %s 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."));