X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=4464011fc1f60e3ad94a355510432cb6039b1b69;hp=66cb6c62f6024696149af1441133fc7e5a2c26f1;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hpb=65e8e06c6dc7349b11c3c1e8f4071b51e2994c65

diff --git a/src/node.h b/src/node.h
index 66cb6c62..4464011f 100644
--- a/src/node.h
+++ b/src/node.h
@@ -21,19 +21,22 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
-#include "event.h"
+#include "digest.h"
+#include "ecdh.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
-	unsigned int unused_active:1;			/* 1 if active (not used for nodes) */
-	unsigned int validkey:1;				/* 1 if we currently have a valid key for him */
-	unsigned int unused_waitingforkey:1;		/* 1 if we already sent out a request */
-	unsigned int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
-	unsigned int reachable:1;			/* 1 if this node is reachable in the graph */
-	unsigned int indirect:1;				/* 1 if this node is not directly reachable by us */
-	unsigned int unused:26;
+	unsigned int unused_active:1;		/* 1 if active (not used for nodes) */
+	unsigned int validkey:1;		/* 1 if we currently have a valid key for him */
+	unsigned int unused_waitingforkey:1;	/* 1 if we already sent out a request */
+	unsigned int visited:1;			/* 1 if this node has been visited by one of the graph algorithms */
+	unsigned int reachable:1;		/* 1 if this node is reachable in the graph */
+	unsigned int indirect:1;		/* 1 if this node is not directly reachable by us */
+	unsigned int ecdh:1;			/* 1 if this node supports ECDH key exchange */
+	unsigned int unused:25;
 } node_status_t;
 
 typedef struct node_t {
@@ -47,31 +50,25 @@ typedef struct node_t {
 	node_status_t status;
 	time_t last_req_key;
 
-	const EVP_CIPHER *incipher;		/* Cipher type for UDP packets received from him */
-	char *inkey;				/* Cipher key and iv */
-	int inkeylength;			/* Cipher key and iv length */
-	EVP_CIPHER_CTX inctx;			/* Cipher context */
-	
-	const EVP_CIPHER *outcipher;		/* Cipher type for UDP packets sent to him*/
-	char *outkey;				/* Cipher key and iv */
-	int outkeylength;			/* Cipher key and iv length */
-	EVP_CIPHER_CTX outctx;			/* Cipher context */
-	
-	const EVP_MD *indigest;			/* Digest type for MAC of packets received from him */
-	int inmaclength;			/* Length of MAC */
-
-	const EVP_MD *outdigest;		/* Digest type for MAC of packets sent to him*/
-	int outmaclength;			/* Length of MAC */
+	ecdsa_t ecdsa;				/* His public ECDSA key */
+	ecdh_t ecdh;				/* State for ECDH key exchange */
+
+	cipher_t incipher;                        /* Cipher for UDP packets */
+	digest_t indigest;                        /* Digest for UDP packets */	
+
+	cipher_t outcipher;                        /* Cipher for UDP packets */
+	digest_t outdigest;                        /* Digest for UDP packets */	
 
 	int incompression;			/* Compressionlevel, 0 = no compression */
 	int outcompression;			/* 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) */
 
@@ -84,12 +81,17 @@ 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 */
+
+	uint64_t in_packets;
+	uint64_t in_bytes;
+	uint64_t out_packets;
+	uint64_t out_bytes;
 } 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);
@@ -99,7 +101,8 @@ 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 bool dump_nodes(struct connection_t *);
+extern bool dump_traffic(struct connection_t *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
-extern void dump_nodes(void);
 
 #endif							/* __TINC_NODE_H__ */