X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=6ca6432b18532be4b1b05f77e1c5fa4338a28830;hp=bd10add706f1ba2db9e2ba7b1083c66b138908d2;hb=543c0abbd91a7b076670b8763548b8d5849860a0;hpb=cfe9285adf391ab66faeb5def811fe08e47a221a

diff --git a/src/node.h b/src/node.h
index bd10add7..6ca6432b 100644
--- a/src/node.h
+++ b/src/node.h
@@ -38,17 +38,19 @@ 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 unused:23;
+	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 unused:21;
 } 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;
@@ -87,16 +89,21 @@ 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 */
 	int mtuprobes;                          /* Number of probes */
-	timeout_t mtutimeout;                   /* Probe event */
-	struct timeval probe_time;              /* Time the last probe was sent or received */
-	int probe_counter;                      /* Number of probes received since last burst was sent */
-	float rtt;                              /* Last measured round trip time */
-	float bandwidth;                        /* Last measured bandwidth */
-	float packetloss;                       /* Last measured packet loss rate */
 
 	uint64_t in_packets;
 	uint64_t in_bytes;