X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=591f4ed50dab08378f18e61f43d51e473992a0b4;hp=5307ea666dfb996f2c292df06db7b5c48abc87b9;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36

diff --git a/src/node.c b/src/node.c
index 5307ea66..591f4ed5 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.8 2002/02/10 21:57:54 guus Exp $
+    $Id: node.c,v 1.1.2.13 2002/06/21 10:11:13 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,14 +46,13 @@ 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;
 }
 
@@ -123,7 +123,7 @@ 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;
@@ -143,13 +143,13 @@ cp
   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
+  n.address = *sa;
   n.name = NULL;
-  n.address = address;
-  n.port = port;
+
   return avl_search(node_udp_tree, &n);
 }
 
@@ -163,8 +163,8 @@ cp
   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 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->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:"-");
     }