X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.h;h=f4fc88bbc5fc887a7f0740c37810ef12578226c1;hp=55a1b5305f5f7848db958b8a983ef1a194383df7;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35

diff --git a/src/node.h b/src/node.h
index 55a1b530..f4fc88bb 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,9 +23,12 @@
 #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"
 
@@ -51,22 +54,19 @@ 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 */
 
+	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) */
 
@@ -78,12 +78,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);
@@ -93,6 +93,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__ */