X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=ad8b728f535f1069400d36bb752c21f4ea7c7148;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=aadb0b5f36bd5f9ba66bdc4c2eb55e15f13bb2ec;hpb=088b5fd9ee6d5f566e8726eae861cbc7cd832b17;p=tinc

diff --git a/src/node.h b/src/node.h
index aadb0b5f..ad8b728f 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,3 +1,6 @@
+#ifndef TINC_NODE_H
+#define TINC_NODE_H
+
 /*
     node.h -- header for node.c
     Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NODE_H__
-#define __TINC_NODE_H__
-
 #include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
@@ -38,18 +38,20 @@ typedef struct node_status_t {
 	unsigned int sptps:1;                   /* 1 if this node supports SPTPS */
 	unsigned int udp_confirmed:1;           /* 1 if the address is one that we received UDP traffic on */
 	unsigned int send_locally:1;		/* 1 if the next UDP packet should be sent on the local network */
-	unsigned int validkey_in;		/* 1 if we have sent a valid key to him */
-	unsigned int unused:22;
+	unsigned int udppacket:1;		/* 1 if the most recently received packet was UDP */
+	unsigned int validkey_in:1;		/* 1 if we have sent a valid key to him */
+	unsigned int has_address:1;		/* 1 if we know an external address for this node */
+	unsigned int unused:20;
 } node_status_t;
 
 typedef struct node_t {
 	char *name;                             /* name of this node */
+	char *hostname;                         /* the hostname of its real ip */
 	node_id_t id;                           /* unique node ID (name hash) */
 	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_state_change;
@@ -88,11 +90,17 @@ typedef struct node_t {
 	uint32_t farfuture;                     /* Packets in a row that have arrived from the far future */
 	unsigned char* late;                    /* Bitfield marking late packets */
 
+	struct timeval udp_reply_sent;          /* Last time a (gratuitous) UDP probe reply was sent */
 	struct timeval udp_ping_sent;           /* Last time a UDP probe was sent */
 	timeout_t udp_ping_timeout;             /* Ping timeout event */
 
 	struct timeval mtu_ping_sent;           /* Last time a MTU probe was sent */
 
+	struct timeval mtu_info_sent;           /* Last time a MTU_INFO message was sent */
+	struct timeval udp_info_sent;           /* Last time a UDP_INFO message was sent */
+
+	length_t maxrecentlen;			/* Maximum size of recently received 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 */
@@ -120,4 +128,4 @@ 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__ */
+#endif