X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hp=76bdc41b98ed8edb620d8f05e01b330870ffa49a;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/edge.c b/src/edge.c
index 76bdc41b..afe9cfe3 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -13,149 +12,104 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.23 2003/07/24 12:08:15 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "netutl.h"
 #include "node.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
-
-static int edge_compare(const edge_t *a, const edge_t *b)
-{
+static int edge_compare(const edge_t *a, const edge_t *b) {
 	return strcmp(a->to->name, b->to->name);
 }
 
-static int edge_weight_compare(const edge_t *a, const edge_t *b)
-{
+static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 	int result;
 
 	result = a->weight - b->weight;
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
 	result = strcmp(a->from->name, b->from->name);
 
-	if(result)
+	if(result) {
 		return 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);
+void init_edges(meshlink_handle_t *mesh) {
+	mesh->edges = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
-avl_tree_t *new_edge_tree(void)
-{
-	cp();
-
-	return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
+splay_tree_t *new_edge_tree(void) {
+	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
-void free_edge_tree(avl_tree_t *edge_tree)
-{
-	cp();
-
-	avl_delete_tree(edge_tree);
+void free_edge_tree(splay_tree_t *edge_tree) {
+	splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void)
-{
-	cp();
+void exit_edges(meshlink_handle_t *mesh) {
+	if(mesh->edges) {
+		splay_delete_tree(mesh->edges);
+	}
 
-	avl_delete_tree(edge_weight_tree);
+	mesh->edges = NULL;
 }
 
 /* Creation and deletion of connection elements */
 
-edge_t *new_edge(void)
-{
-	cp();
-
-	return (edge_t *) xmalloc_and_zero(sizeof(edge_t));
+edge_t *new_edge(void) {
+	return xzalloc(sizeof(edge_t));
 }
 
-void free_edge(edge_t *e)
-{
-	cp();
+void free_edge(edge_t *e) {
+	sockaddrfree(&e->address);
 
 	free(e);
 }
 
-void edge_add(edge_t *e)
-{
-	cp();
-
-	avl_insert(edge_weight_tree, e);
-	avl_insert(e->from->edge_tree, e);
+void edge_add(meshlink_handle_t *mesh, edge_t *e) {
+	splay_insert(mesh->edges, e);
+	splay_insert(e->from->edge_tree, e);
 
 	e->reverse = lookup_edge(e->to, e->from);
 
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = e;
+	}
 }
 
-void edge_del(edge_t *e)
-{
-	cp();
-
-	if(e->reverse)
+void edge_del(meshlink_handle_t *mesh, edge_t *e) {
+	if(e->reverse) {
 		e->reverse->reverse = NULL;
+	}
 
-	avl_delete(e->from->edge_tree, e);
-	avl_delete(edge_weight_tree, e);
+	splay_delete(mesh->edges, e);
+	splay_delete(e->from->edge_tree, e);
 }
 
-edge_t *lookup_edge(const node_t *from, const node_t *to)
-{
-	edge_t v = {
-		.from = from,
-		.to = to
-	};
-
-	cp();
+edge_t *lookup_edge(node_t *from, node_t *to) {
+	assert(from);
+	assert(to);
 
-	return avl_search(from->edge_tree, &v);
-}
+	edge_t v;
 
-void dump_edges(void)
-{
-	avl_node_t *node, *node2;
-	node_t *n;
-	edge_t *e;
-	char *address;
-
-	cp();
-
-	logger(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);
-			logger(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
-				   e->from->name, e->to->name, address, e->options, e->weight);
-			free(address);
-		}
-	}
+	v.from = from;
+	v.to = to;
 
-	logger(LOG_DEBUG, _("End of edges."));
+	return splay_search(from->edge_tree, &v);
 }