X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=baa6d26c34362789398169b2a9a3324010b8fb6a;hb=c44b08613508c993e7fd9f625e0b1b4775efffed;hp=cee75a7a63816752e2b7a30feced79885c77d201;hpb=d6388d782ede1bbe49a5c2643362e2e0f383fa89;p=tinc

diff --git a/src/edge.c b/src/edge.c
index cee75a7a..baa6d26c 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,6 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2021 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -26,102 +26,111 @@
 #include "logger.h"
 #include "netutl.h"
 #include "node.h"
-#include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
-
-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) {
 	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) {
-	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
-}
+splay_tree_t edge_weight_tree = {
+	.compare = (splay_compare_t) edge_weight_compare,
+};
 
-splay_tree_t *new_edge_tree(void) {
-	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
+static int edge_compare(const edge_t *a, const edge_t *b) {
+	return strcmp(a->to->name, b->to->name);
 }
 
-void free_edge_tree(splay_tree_t *edge_tree) {
-	splay_delete_tree(edge_tree);
+void init_edge_tree(splay_tree_t *tree) {
+	memset(tree, 0, sizeof(*tree));
+	tree->compare = (splay_compare_t) edge_compare;
+	tree->delete = (splay_action_t) free_edge;
 }
 
 void exit_edges(void) {
-	splay_delete_tree(edge_weight_tree);
+	splay_empty_tree(&edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void) {
-	return xmalloc_and_zero(sizeof(edge_t));
+	return xzalloc(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e) {
-	sockaddrfree(&e->address);
+	if(e) {
+		sockaddrfree(&e->address);
+		sockaddrfree(&e->local_address);
 
-	free(e);
+		free(e);
+	}
 }
 
 void edge_add(edge_t *e) {
-	splay_insert(edge_weight_tree, e);
-	splay_insert(e->from->edge_tree, e);
+	splay_node_t *node = splay_insert(&e->from->edge_tree, e);
+
+	if(!node) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_tree\n", e->from->name, e->to->name);
+		return;
+	}
+
 
 	e->reverse = lookup_edge(e->to, e->from);
 
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = e;
+	}
+
+	node = splay_insert(&edge_weight_tree, e);
+
+	if(!node) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_weight_tree\n", e->from->name, e->to->name);
+		return;
+	}
 }
 
 void edge_del(edge_t *e) {
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = NULL;
+	}
 
-	splay_delete(edge_weight_tree, e);
-	splay_delete(e->from->edge_tree, e);
+	splay_delete(&edge_weight_tree, e);
+	splay_delete(&e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
 	edge_t v;
-	
+
 	v.from = from;
 	v.to = to;
 
-	return splay_search(from->edge_tree, &v);
+	return splay_search(&from->edge_tree, &v);
 }
 
 bool dump_edges(connection_t *c) {
-	splay_node_t *node, *node2;
-	node_t *n;
-	edge_t *e;
-	char *address;
-
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
-		for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
-			e = node2->data;
-			address = sockaddr2hostname(&e->address);
-			send_request(c, "%d %d %s %s %s %x %d",
-					CONTROL, REQ_DUMP_EDGES,
-					e->from->name, e->to->name, address,
-					e->options, e->weight);
+	for splay_each(node_t, n, &node_tree) {
+		for splay_each(edge_t, e, &n->edge_tree) {
+			char *address = sockaddr2hostname(&e->address);
+			char *local_address = sockaddr2hostname(&e->local_address);
+			send_request(c, "%d %d %s %s %s %s %x %d",
+			             CONTROL, REQ_DUMP_EDGES,
+			             e->from->name, e->to->name, address,
+			             local_address, e->options, e->weight);
 			free(address);
+			free(local_address);
 		}
 	}