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

diff --git a/src/edge.c b/src/edge.c
index 4a000e88..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.13 2002/09/06 10:23:52 guus Exp $
+    $Id: edge.c,v 1.1.2.15 2002/09/09 19:39:58 guus Exp $
 */
 
 #include "config.h"
@@ -56,36 +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
+  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
+  cp();
   avl_delete_tree(edge_weight_tree);
-cp
+  cp();
 }
 
 /* Creation and deletion of connection elements */
@@ -93,46 +98,46 @@ 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
+  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
+  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;
 
@@ -145,7 +150,7 @@ void dump_edges(void)
   node_t *n;
   edge_t *e;
   char *address;
-cp
+  cp();
   syslog(LOG_DEBUG, _("Edges:"));
 
   for(node = node_tree->head; node; node = node->next)
@@ -163,5 +168,5 @@ cp
     }
 
   syslog(LOG_DEBUG, _("End of edges."));
-cp
+  cp();
 }