X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=05d751ccda77d73d46cb92d6c26af7a5ed9aa523;hb=8dfa072733feab737cabf69f000c70657719826a;hp=a9322aa54256ca9698e582379bb133a6d66a6caa;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc

diff --git a/src/node.h b/src/node.h
index a9322aa5..05d751cc 100644
--- a/src/node.h
+++ b/src/node.h
@@ -25,17 +25,18 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
-#include "list.h"
+#include "ecdh.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
-	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 unused_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 */
-	int reachable:1;			/* 1 if this node is reachable in the graph */
-	int indirect:1;				/* 1 if this node is not directly reachable by us */
-	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 {
@@ -48,6 +49,8 @@ typedef struct node_t {
 	node_status_t status;
 	time_t last_req_key;
 
+	ecdh_t ecdh;				/* State for ECDH key exchange */
+
 	cipher_t incipher;                        /* Cipher for UDP packets */
 	digest_t indigest;                        /* Digest for UDP packets */	
 
@@ -69,13 +72,19 @@ typedef struct node_t {
 
 	uint32_t sent_seqno;			/* Sequence number last sent to this node */
 	uint32_t received_seqno;		/* Sequence number last received from this node */
-	unsigned char late[16];			/* Bitfield marking late packets */
+	uint32_t farfuture;			/* Packets in a row that have arrived from the far future */
+	unsigned char* late;			/* Bitfield marking late packets */
 
 	length_t mtu;				/* Maximum size of packets to send to this node */
 	length_t minmtu;			/* Probed minimum MTU */
 	length_t maxmtu;			/* Probed maximum MTU */
 	int mtuprobes;				/* Number of probes */
 	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;
@@ -91,6 +100,7 @@ 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 *);
 
 #endif							/* __TINC_NODE_H__ */