X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=4186d06193ecd31d1695142ed1813f720a50a96d;hb=1b8f8918360b40a2749d40355266ed7dedbe41b5;hp=a612e93ba404ca4840e2d4020574b05010338fc7;hpb=3321591d93d00326eee01fa7c78fb0d56b3d0fba;p=meshlink

diff --git a/src/node.h b/src/node.h
index a612e93b..4186d061 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,9 +23,10 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
-#include "tevent.h"
+#include "digest.h"
 #include "list.h"
 #include "subnet.h"
 
@@ -51,13 +52,9 @@ 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 */
 
@@ -66,9 +63,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) */
 
@@ -84,8 +81,8 @@ typedef struct node_t {
 } 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);