X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=e35d806d8e40586d9189fe641ed82f780becf72c;hp=a0f5535fc9c7a774e827740bc18d38862cf0b024;hb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503;hpb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a

diff --git a/src/edge.c b/src/edge.c
index a0f5535f..e35d806d 100644
--- a/src/edge.c
+++ b/src/edge.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: edge.c,v 1.1.2.12 2002/09/04 13:48:51 guus Exp $
+    $Id: edge.c,v 1.1.2.15 2002/09/09 19:39:58 guus Exp $
 */
 
 #include "config.h"
@@ -41,32 +41,13 @@
 #include "xalloc.h"
 #include "system.h"
 
-avl_tree_t *edge_tree;        /* Tree with all known edges (replaces active_tree) */
 avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
 
 int edge_compare(edge_t *a, edge_t *b)
 {
-  int result;
-
-  result = strcmp(a->from->name, b->from->name);
-
-  if(result)
-    return result;
-  else
-    return strcmp(a->to->name, b->to->name);
-}
-
-/* Evil edge_compare() from a parallel universe ;)
-
-int edge_compare(edge_t *a, edge_t *b)
-{
-  int result;
-
-  return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result;
+  return strcmp(a->to->name, b->to->name);
 }
 
-*/
-
 int edge_weight_compare(edge_t *a, edge_t *b)
 {
   int result;
@@ -75,37 +56,41 @@ int edge_weight_compare(edge_t *a, edge_t *b)
 
   if(result)
     return result;
-  else
-    return edge_compare(a, b);
+
+  result = strcmp(a->from->name, b->from->name);
+
+  if(result)
+    return result;
+
+  return strcmp(a->to->name, b->to->name);
 }
 
 void init_edges(void)
 {
-cp
-  edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
+  cp();
   edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL);
-cp
+  cp();
 }
 
 avl_tree_t *new_edge_tree(void)
 {
-cp
+  cp();
   return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
-cp
+  cp();
 }
 
 void free_edge_tree(avl_tree_t *edge_tree)
 {
-cp
+  cp();
   avl_delete_tree(edge_tree);
-cp
+  cp();
 }
 
 void exit_edges(void)
 {
-cp
-  avl_delete_tree(edge_tree);
-cp
+  cp();
+  avl_delete_tree(edge_weight_tree);
+  cp();
 }
 
 /* Creation and deletion of connection elements */
@@ -113,72 +98,75 @@ cp
 edge_t *new_edge(void)
 {
   edge_t *e;
-cp
+  cp();
   e = (edge_t *)xmalloc_and_zero(sizeof(*e));
-cp
+  cp();
   return e;
 }
 
 void free_edge(edge_t *e)
 {
-cp
+  cp();
   free(e);
-cp
+  cp();
 }
 
 void edge_add(edge_t *e)
 {
-cp
-  avl_insert(edge_tree, e);
+  cp();
   avl_insert(edge_weight_tree, e);
   avl_insert(e->from->edge_tree, e);
-cp
+  cp();
   e->reverse = lookup_edge(e->to, e->from);
   if(e->reverse)
     e->reverse->reverse = e;
-cp
+  cp();
 }
 
 void edge_del(edge_t *e)
 {
-cp
+  cp();
   if(e->reverse)
     e->reverse->reverse = NULL;
-cp
-  avl_delete(edge_tree, e);
+  cp();
   avl_delete(edge_weight_tree, e);
   avl_delete(e->from->edge_tree, e);
-cp
+  cp();
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to)
 {
   edge_t v;
-cp
+  cp();
   v.from = from;
   v.to = to;
 
-  return avl_search(edge_tree, &v);
+  return avl_search(from->edge_tree, &v);
 }
 
 void dump_edges(void)
 {
-  avl_node_t *node;
+  avl_node_t *node, *node2;
+  node_t *n;
   edge_t *e;
   char *address;
-cp
+  cp();
   syslog(LOG_DEBUG, _("Edges:"));
 
-  for(node = edge_tree->head; node; node = node->next)
+  for(node = node_tree->head; node; node = node->next)
     {
-      e = (edge_t *)node->data;
-      address = sockaddr2hostname(&e->address);
-      syslog(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
-             e->from->name, e->to->name, address,
-	     e->options, e->weight);
-      free(address);
+      n = (node_t *)node->data;
+      for(node2 = n->edge_tree->head; node2; node2 = node2->next)
+	{
+	  e = (edge_t *)node2->data;
+	  address = sockaddr2hostname(&e->address);
+	  syslog(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
+        	 e->from->name, e->to->name, address,
+		 e->options, e->weight);
+	  free(address);
+	}
     }
 
   syslog(LOG_DEBUG, _("End of edges."));
-cp
+  cp();
 }