X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=62ed3acd575fe66d92c8a46b8f2738286c7e882e;hb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;hp=a9322aa54256ca9698e582379bb133a6d66a6caa;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=meshlink

diff --git a/src/node.h b/src/node.h
index a9322aa5..62ed3acd 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -25,29 +25,34 @@
 #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 {
 	char *name;				/* name of this node */
 	uint32_t options;			/* options turned on for this node */
 
+	int sock;				/* Socket to use for outgoing UDP packets */
 	sockaddr_t address;			/* his real (internet) ip to send UDP packets to */
 	char *hostname;				/* the hostname of its real ip */
 
 	node_status_t status;
 	time_t last_req_key;
 
+	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 */	
 
@@ -59,6 +64,7 @@ typedef struct node_t {
 
 	int distance;
 	struct node_t *nexthop;			/* nearest node from us to him */
+	struct edge_t *prevedge;		/* nearest node from him to us */
 	struct node_t *via;			/* next hop for UDP packets */
 
 	splay_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
@@ -69,13 +75,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 +103,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__ */