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

diff --git a/src/node.h b/src/node.h
index 2ea96922..7b777288 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,15 +23,18 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include <event.h>
+
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
-#include "event.h"
+#include "digest.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 */
@@ -51,24 +54,21 @@ typedef struct node_t {
 
 	node_status_t status;
 
-	const EVP_CIPHER *cipher;		/* Cipher type for UDP packets */
-	char *key;				/* Cipher key and iv */
-	int keylength;				/* Cipher key and iv length */
-	EVP_CIPHER_CTX packet_ctx;		/* Cipher context */
-	
-	const EVP_MD *digest;			/* Digest type for MAC */
-	int maclength;				/* Length of MAC */
+	cipher_t cipher;                        /* Cipher for UDP packets */
+	digest_t digest;                        /* Digest for UDP packets */	
+	int maclength;				/* Portion of digest to use */
 
 	int compression;			/* Compressionlevel, 0 = no compression */
 
 	list_t *queue;				/* Queue for packets awaiting to be encrypted */
 
+	int distance;
 	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 +80,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);
@@ -95,6 +95,6 @@ extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
-extern void dump_nodes(void);
+extern int dump_nodes(struct evbuffer *);
 
 #endif							/* __TINC_NODE_H__ */