X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnode.h;h=da5081b49ef0dd5cc3506862443502c9a8ba1cc1;hb=6e80da3370249caa1082c23c3ef55f338d1e9e74;hp=0476cdb062430de506dce3c01e124e2b73874d5d;hpb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;p=tinc

diff --git a/src/node.h b/src/node.h
index 0476cdb0..da5081b4 100644
--- a/src/node.h
+++ b/src/node.h
@@ -24,7 +24,9 @@
 #define __TINC_NODE_H__
 
 #include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
+#include "digest.h"
 #include "list.h"
 #include "subnet.h"
 
@@ -50,18 +52,15 @@ 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 */