X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hp=24c67c368bce1ab0423aabd03e3cb2c9f55d0f8d;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=94497336efc1cc60561575e74d420e9e8e8c657e

diff --git a/src/edge.c b/src/edge.c
index 24c67c36..afe9cfe3 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    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,134 +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.1 2001/10/28 08:41:19 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 "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"	/* Don't ask. */
+#include "splay_tree.h"
+#include "edge.h"
+#include "logger.h"
+#include "meshlink_internal.h"
 #include "netutl.h"
-#include "config.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
-
+#include "node.h"
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
-avl_tree_t *edge_tree;        /* Tree with all known vertices (replaces active_tree) */
+static int edge_compare(const edge_t *a, const edge_t *b) {
+	return strcmp(a->to->name, b->to->name);
+}
 
-int edge_compare(edge_t *a, edge_t *b)
-{
-  int result;
+static int edge_weight_compare(const edge_t *a, const 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);
-}
+	result = a->weight - b->weight;
 
-/* Evil edge_compare() from a parallel universe ;)
+	if(result) {
+		return result;
+	}
 
-int edge_compare(edge_t *a, edge_t *b)
-{
-  int result;
+	result = strcmp(a->from->name, b->from->name);
 
-  return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result;
+	if(result) {
+		return result;
+	}
+
+	return strcmp(a->to->name, b->to->name);
 }
 
-*/
+void init_edges(meshlink_handle_t *mesh) {
+	mesh->edges = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
+}
 
-void init_vertices(void)
-{
-cp
-  edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
-cp
+splay_tree_t *new_edge_tree(void) {
+	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
-void exit_vertices(void)
-{
-cp
-  avl_delete_tree(edge_tree);
-cp
+void free_edge_tree(splay_tree_t *edge_tree) {
+	splay_delete_tree(edge_tree);
 }
 
-/* Creation and deletion of connection elements */
+void exit_edges(meshlink_handle_t *mesh) {
+	if(mesh->edges) {
+		splay_delete_tree(mesh->edges);
+	}
 
-edge_t *new_edge(void)
-{
-cp
-  edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v));
-cp
-  return v;
+	mesh->edges = NULL;
 }
 
-void free_edge(edge_t *v)
-{
-cp
-  free(v);
-cp
-}
+/* Creation and deletion of connection elements */
 
-void edge_add(edge_t *v)
-{
-cp
-  avl_insert(edge_tree, v);
-cp
+edge_t *new_edge(void) {
+	return xzalloc(sizeof(edge_t));
 }
 
-void edge_del(edge_t *v)
-{
-cp
-  avl_delete(edge_tree, v);
-cp
+void free_edge(edge_t *e) {
+	sockaddrfree(&e->address);
+
+	free(e);
 }
 
-edge_t *lookup_edge(node_t *from, node_t *to)
-{
-  edge_t v, *result;
-cp
-  v.from = from;
-  v.to = to;
+void edge_add(meshlink_handle_t *mesh, edge_t *e) {
+	splay_insert(mesh->edges, e);
+	splay_insert(e->from->edge_tree, e);
 
-  result = avl_search(edge_tree, &v);
+	e->reverse = lookup_edge(e->to, e->from);
 
-  if(result)
-    return result;
-cp
-  v.from = to;
-  v.to = from;
+	if(e->reverse) {
+		e->reverse->reverse = e;
+	}
+}
+
+void edge_del(meshlink_handle_t *mesh, edge_t *e) {
+	if(e->reverse) {
+		e->reverse->reverse = NULL;
+	}
 
-  return avl_search(edge_tree, &v);
+	splay_delete(mesh->edges, e);
+	splay_delete(e->from->edge_tree, e);
 }
 
-void dump_vertices(void)
-{
-  avl_node_t *node;
-  edge_t *v;
-cp
-  syslog(LOG_DEBUG, _("Vertices:"));
-
-  for(node = edge_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);
-    }
-    
-  syslog(LOG_DEBUG, _("End of vertices."));
-cp
+edge_t *lookup_edge(node_t *from, node_t *to) {
+	assert(from);
+	assert(to);
+
+	edge_t v;
+
+	v.from = from;
+	v.to = to;
+
+	return splay_search(from->edge_tree, &v);
 }