X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=86970ce60d00e70c82c681469f71dde22c7897b0;hb=7ab400aebdc38e7ee5dafc0a2291bbbea25e3f7c;hp=653963092b2bc77b6f4c0bcb62b9582db4f69f2e;hpb=92df36a610421ed5fcae90e832f64e3acfb7d431;p=tinc

diff --git a/src/edge.c b/src/edge.c
index 65396309..86970ce6 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,6 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2013 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
@@ -40,13 +40,15 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 
 	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);
 }
@@ -64,12 +66,6 @@ void free_edge_tree(splay_tree_t *edge_tree) {
 }
 
 void exit_edges(void) {
-	// since edge_weight_tree does not have delete action defined
-	// we have to cleanup it on exit
-	for splay_each(edge_t, e, edge_weight_tree) {
-			sockaddrfree(&e->address);
-			sockaddrfree(&e->local_address);
-		}
 	splay_delete_tree(edge_weight_tree);
 }
 
@@ -81,23 +77,38 @@ edge_t *new_edge(void) {
 
 void free_edge(edge_t *e) {
 	sockaddrfree(&e->address);
+	sockaddrfree(&e->local_address);
 
 	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);
@@ -116,11 +127,11 @@ bool dump_edges(connection_t *c) {
 	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);
+			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);
+			             CONTROL, REQ_DUMP_EDGES,
+			             e->from->name, e->to->name, address,
+			             local_address, e->options, e->weight);
 			free(address);
 			free(local_address);
 		}