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

diff --git a/src/edge.c b/src/edge.c
index e35d806d..0a47f8c8 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.15 2002/09/09 19:39:58 guus Exp $
+    $Id: edge.c,v 1.1.2.18 2002/09/10 22:12:33 guus Exp $
 */
 
 #include "config.h"
@@ -29,9 +29,8 @@
 #include <avl_tree.h>
 #include <list.h>
 
-#include "net.h"	/* Don't ask. */
+#include "net.h"				/* Don't ask. */
 #include "netutl.h"
-#include "config.h"
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
@@ -41,132 +40,132 @@
 #include "xalloc.h"
 #include "system.h"
 
-avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
+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);
+	return strcmp(a->to->name, b->to->name);
 }
 
 int edge_weight_compare(edge_t *a, edge_t *b)
 {
-  int result;
+	int result;
 
-  result = a->weight - b->weight;
+	result = a->weight - b->weight;
 
-  if(result)
-    return result;
+	if(result)
+		return result;
 
-  result = strcmp(a->from->name, b->from->name);
+	result = strcmp(a->from->name, b->from->name);
 
-  if(result)
-    return result;
+	if(result)
+		return result;
 
-  return strcmp(a->to->name, b->to->name);
+	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();
+	cp();
+
+	edge_weight_tree =
+		avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
 }
 
 avl_tree_t *new_edge_tree(void)
 {
-  cp();
-  return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
-  cp();
+	cp();
+
+	return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
 }
 
 void free_edge_tree(avl_tree_t *edge_tree)
 {
-  cp();
-  avl_delete_tree(edge_tree);
-  cp();
+	cp();
+
+	avl_delete_tree(edge_tree);
 }
 
 void exit_edges(void)
 {
-  cp();
-  avl_delete_tree(edge_weight_tree);
-  cp();
+	cp();
+
+	avl_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void)
 {
-  edge_t *e;
-  cp();
-  e = (edge_t *)xmalloc_and_zero(sizeof(*e));
-  cp();
-  return e;
+	cp();
+
+	return (edge_t *) xmalloc_and_zero(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e)
 {
-  cp();
-  free(e);
-  cp();
+	cp();
+
+	free(e);
 }
 
 void edge_add(edge_t *e)
 {
-  cp();
-  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();
+	cp();
+
+	avl_insert(edge_weight_tree, e);
+	avl_insert(e->from->edge_tree, e);
+
+	e->reverse = lookup_edge(e->to, e->from);
+
+	if(e->reverse)
+		e->reverse->reverse = e;
 }
 
 void edge_del(edge_t *e)
 {
-  cp();
-  if(e->reverse)
-    e->reverse->reverse = NULL;
-  cp();
-  avl_delete(edge_weight_tree, e);
-  avl_delete(e->from->edge_tree, e);
-  cp();
+	cp();
+
+	if(e->reverse)
+		e->reverse->reverse = NULL;
+
+	avl_delete(e->from->edge_tree, e);
+	avl_delete(edge_weight_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to)
 {
-  edge_t v;
-  cp();
-  v.from = from;
-  v.to = to;
+	edge_t v;
+
+	cp();
+
+	v.from = from;
+	v.to = to;
 
-  return avl_search(from->edge_tree, &v);
+	return avl_search(from->edge_tree, &v);
 }
 
 void dump_edges(void)
 {
-  avl_node_t *node, *node2;
-  node_t *n;
-  edge_t *e;
-  char *address;
-  cp();
-  syslog(LOG_DEBUG, _("Edges:"));
-
-  for(node = node_tree->head; node; node = node->next)
-    {
-      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);
+	avl_node_t *node, *node2;
+	node_t *n;
+	edge_t *e;
+	char *address;
+
+	cp();
+
+	syslog(LOG_DEBUG, _("Edges:"));
+
+	for(node = node_tree->head; node; node = node->next) {
+		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();
+	syslog(LOG_DEBUG, _("End of edges."));
 }