X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=5bf6361e737417865a07252c672fdfc9b4bff817;hb=40731d030fef793c6b6405efd9b3e64c26c00045;hp=c04cef40e01e48cc8fc67471e6c4c51a903a915f;hpb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;p=tinc

diff --git a/src/graph.c b/src/graph.c
index c04cef40..5bf6361e 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -46,7 +46,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "config.h"
 #include "connection.h"
 #include "device.h"
@@ -64,7 +64,7 @@
 */
 
 void mst_kruskal(void) {
-	avl_node_t *node, *next;
+	splay_node_t *node, *next;
 	edge_t *e;
 	node_t *n;
 	connection_t *c;
@@ -147,7 +147,7 @@ void mst_kruskal(void) {
 */
 
 void sssp_bfs(void) {
-	avl_node_t *node, *next, *to;
+	splay_node_t *node, *next, *to;
 	edge_t *e;
 	node_t *n;
 	list_t *todo_list;
@@ -223,7 +223,7 @@ void sssp_bfs(void) {
 			e->to->options = e->options;
 
 			if(sockaddrcmp(&e->to->address, &e->address)) {
-				node = avl_unlink(node_udp_tree, e->to);
+				node = splay_unlink(node_udp_tree, e->to);
 				sockaddrfree(&e->to->address);
 				sockaddrcpy(&e->to->address, &e->address);
 
@@ -233,7 +233,7 @@ void sssp_bfs(void) {
 				e->to->hostname = sockaddr2hostname(&e->to->address);
 
 				if(node)
-					avl_insert_node(node_udp_tree, node);
+					splay_insert_node(node_udp_tree, node);
 
 				if(e->to->options & OPTION_PMTU_DISCOVERY) {
 					e->to->mtuprobes = 0;
@@ -265,11 +265,11 @@ void sssp_bfs(void) {
 			if(n->status.reachable) {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
 					   n->name, n->hostname);
-				avl_insert(node_udp_tree, n);
+				splay_insert(node_udp_tree, n);
 			} else {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
 					   n->name, n->hostname);
-				avl_delete(node_udp_tree, n);
+				splay_delete(node_udp_tree, n);
 			}
 
 			n->status.validkey = false;
@@ -314,7 +314,7 @@ void sssp_bfs(void) {
 */
 
 static void dump_graph(int fd, short events, void *data) {
-	avl_node_t *node;
+	splay_node_t *node;
 	node_t *n;
 	edge_t *e;
 	char *filename = NULL, *tmpname = NULL;