X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=3ac0b1bae3eddc47e482e4c35ad01806c50b9a81;hp=24c67c368bce1ab0423aabd03e3cb2c9f55d0f8d;hb=d5b61fc0cd249fd2b2751a1ff77b321323a17beb;hpb=94497336efc1cc60561575e74d420e9e8e8c657e

diff --git a/src/edge.c b/src/edge.c
index 24c67c36..3ac0b1ba 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,7 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000-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: edge.c,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
+    $Id: edge.c,v 1.1.2.14 2002/09/06 12:19:16 guus Exp $
 */
 
 #include "config.h"
@@ -35,112 +35,138 @@
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
+#include "edge.h"
+#include "node.h"
 
 #include "xalloc.h"
 #include "system.h"
 
-avl_tree_t *edge_tree;        /* Tree with all known vertices (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)
+{
+  return strcmp(a->to->name, b->to->name);
+}
+
+int edge_weight_compare(edge_t *a, edge_t *b)
 {
   int result;
 
-  result = strcmp(a->from->name, b->from->name);
-  
+  result = a->weight - b->weight;
+
   if(result)
     return result;
-  else
-    return strcmp(a->to->name, b->to->name);
-}
 
-/* Evil edge_compare() from a parallel universe ;)
+  result = strcmp(a->from->name, b->from->name);
 
-int edge_compare(edge_t *a, edge_t *b)
-{
-  int result;
+  if(result)
+    return 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);
 }
 
-*/
+void init_edges(void)
+{
+cp
+  edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL);
+cp
+}
 
-void init_vertices(void)
+avl_tree_t *new_edge_tree(void)
 {
 cp
-  edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
+  return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
 cp
 }
 
-void exit_vertices(void)
+void free_edge_tree(avl_tree_t *edge_tree)
 {
 cp
   avl_delete_tree(edge_tree);
 cp
 }
 
+void exit_edges(void)
+{
+cp
+  avl_delete_tree(edge_weight_tree);
+cp
+}
+
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void)
 {
+  edge_t *e;
 cp
-  edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v));
+  e = (edge_t *)xmalloc_and_zero(sizeof(*e));
 cp
-  return v;
+  return e;
 }
 
-void free_edge(edge_t *v)
+void free_edge(edge_t *e)
 {
 cp
-  free(v);
+  free(e);
 cp
 }
 
-void edge_add(edge_t *v)
+void edge_add(edge_t *e)
 {
 cp
-  avl_insert(edge_tree, v);
+  avl_insert(edge_weight_tree, e);
+  avl_insert(e->from->edge_tree, e);
+cp
+  e->reverse = lookup_edge(e->to, e->from);
+  if(e->reverse)
+    e->reverse->reverse = e;
 cp
 }
 
-void edge_del(edge_t *v)
+void edge_del(edge_t *e)
 {
 cp
-  avl_delete(edge_tree, v);
+  if(e->reverse)
+    e->reverse->reverse = NULL;
+cp
+  avl_delete(edge_weight_tree, e);
+  avl_delete(e->from->edge_tree, e);
 cp
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to)
 {
-  edge_t v, *result;
+  edge_t v;
 cp
   v.from = from;
   v.to = to;
 
-  result = avl_search(edge_tree, &v);
-
-  if(result)
-    return result;
-cp
-  v.from = to;
-  v.to = from;
-
-  return avl_search(edge_tree, &v);
+  return avl_search(from->edge_tree, &v);
 }
 
-void dump_vertices(void)
+void dump_edges(void)
 {
-  avl_node_t *node;
-  edge_t *v;
+  avl_node_t *node, *node2;
+  node_t *n;
+  edge_t *e;
+  char *address;
 cp
-  syslog(LOG_DEBUG, _("Vertices:"));
+  syslog(LOG_DEBUG, _("Edges:"));
 
-  for(node = edge_tree->head; node; node = node->next)
+  for(node = node_tree->head; node; node = node->next)
     {
-      v = (edge_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s - %s options %ld"),
-             v->from->name, v->to->name, v->options);
+      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 vertices."));
+
+  syslog(LOG_DEBUG, _("End of edges."));
 cp
 }