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

diff --git a/src/node.c b/src/node.c
index 2abd7fbf..4fdb99c1 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
 
     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.9 2002/02/11 15:59:18 guus Exp $
+    $Id: node.c,v 1.1.2.16 2002/09/09 19:39:59 guus Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,7 @@
 
 #include <avl_tree.h>
 #include "node.h"
+#include "netutl.h"
 #include "net.h"
 #include <utils.h>
 #include <xalloc.h>
@@ -45,47 +46,46 @@ int node_compare(node_t *a, node_t *b)
 
 int node_udp_compare(node_t *a, node_t *b)
 {
-  if(a->address < b->address)
-    return -1;
-  if (a->address > b->address)
-    return 1;
-  if (a->port < b->port)
-    return -1;
-  if (a->port > b->port)
-    return 1;
+  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
+  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();
 }
 
 void exit_nodes(void)
 {
-cp
+  cp();
   avl_delete_tree(node_tree);
   avl_delete_tree(node_udp_tree);
-cp
+  cp();
 }
 
 node_t *new_node(void)
 {
   node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
-cp
+  cp();
   n->subnet_tree = new_subnet_tree();
   n->edge_tree = new_edge_tree();
   n->queue = list_alloc((list_action_t)free);
-cp
+  cp();
   return n;
 }
 
 void free_node(node_t *n)
 {
-cp
+  cp();
   if(n->queue)
     list_delete_list(n->queue);
   if(n->name)
@@ -99,15 +99,15 @@ cp
   if(n->edge_tree)
     free_edge_tree(n->edge_tree);
   free(n);
-cp
+  cp();
 }
 
 void node_add(node_t *n)
 {
-cp
+  cp();
   avl_insert(node_tree, n);
   avl_insert(node_udp_tree, n);
-cp
+  cp();
 }
 
 void node_del(node_t *n)
@@ -115,7 +115,7 @@ void node_del(node_t *n)
   avl_node_t *node, *next;
   edge_t *e;
   subnet_t *s;
-cp
+  cp();
   for(node = n->subnet_tree->head; node; node = next)
     {
       next = node->next;
@@ -123,33 +123,33 @@ cp
       subnet_del(n, s);
     }
 
-  for(node = n->subnet_tree->head; node; node = next)
+  for(node = n->edge_tree->head; node; node = next)
     {
       next = node->next;
       e = (edge_t *)node->data;
       edge_del(e);
     }
-cp
+  cp();
   avl_delete(node_tree, n);
   avl_delete(node_udp_tree, n);
-cp
+  cp();
 }
 
 node_t *lookup_node(char *name)
 {
   node_t n;
-cp
+  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
+  cp();
+  n.address = *sa;
   n.name = NULL;
-  n.address = address;
-  n.port = port;
+
   return avl_search(node_udp_tree, &n);
 }
 
@@ -157,17 +157,17 @@ void dump_nodes(void)
 {
   avl_node_t *node;
   node_t *n;
-cp
+  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 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,
+      syslog(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:"-");
     }
     
   syslog(LOG_DEBUG, _("End of nodes."));
-cp
+  cp();
 }