X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=83af5e3ccc7523de03b8c569f500566500f6aa34;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=2ea96922233fe0e3a3dfaef5a2af0664e1b917fc;hpb=eb391c52eed46f3f03b404553df417851fc0cb90;p=tinc

diff --git a/src/node.h b/src/node.h
index 2ea96922..83af5e3c 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,15 +23,14 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
-#include "event.h"
 #include "list.h"
 #include "subnet.h"
 
 typedef union node_status_t {
 	struct {
-		int active:1;				/* 1 if active.. */
+		int unused_active:1;			/* 1 if active (not used for nodes) */
 		int validkey:1;				/* 1 if we currently have a valid key for him */
 		int waitingforkey:1;			/* 1 if we already sent out a request */
 		int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
@@ -66,9 +65,9 @@ typedef struct node_t {
 	struct node_t *nexthop;			/* nearest node from us to him */
 	struct node_t *via;			/* next hop for UDP packets */
 
-	avl_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
+	splay_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
 
-	avl_tree_t *edge_tree;			/* Edges with this node as one of the endpoints */
+	splay_tree_t *edge_tree;			/* Edges with this node as one of the endpoints */
 
 	struct connection_t *connection;	/* Connection associated with this node (if a direct connection exists) */
 
@@ -80,12 +79,12 @@ typedef struct node_t {
 	length_t minmtu;			/* Probed minimum MTU */
 	length_t maxmtu;			/* Probed maximum MTU */
 	int mtuprobes;				/* Number of probes */
-	event_t *mtuevent;			/* Probe event */
+	struct event mtuevent;			/* Probe event */
 } node_t;
 
 extern struct node_t *myself;
-extern avl_tree_t *node_tree;
-extern avl_tree_t *node_udp_tree;
+extern splay_tree_t *node_tree;
+extern splay_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);