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

diff --git a/src/node.h b/src/node.h
index c567ad92..6ca6432b 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -37,29 +37,35 @@ typedef struct node_status_t {
 	unsigned int indirect:1;                /* 1 if this node is not directly reachable by us */
 	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 unused:24;
+	unsigned int send_locally:1;		/* 1 if the next UDP packet should be sent on the local network */
+	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;
 	time_t last_req_key;
 
-	ecdsa_t ecdsa;                          /* His public ECDSA key */
+	ecdsa_t *ecdsa;                         /* His public ECDSA key */
 	sptps_t sptps;
 
-	cipher_t incipher;                      /* Cipher for UDP packets */
-	digest_t indigest;                      /* Digest for UDP packets */
+#ifndef DISABLE_LEGACY
+	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 */
+	cipher_t *outcipher;                    /* Cipher for UDP packets */
+	digest_t *outdigest;                    /* Digest for UDP packets */
+#endif
 
 	int incompression;                      /* Compressionlevel, 0 = no compression */
 	int outcompression;                     /* Compressionlevel, 0 = no compression */
@@ -77,14 +83,27 @@ 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 */
+	uint32_t received;                      /* Total valid packets received from this node */
+	uint32_t prev_received_seqno;
+	uint32_t prev_received;
 	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 */
 
 	uint64_t in_packets;
 	uint64_t in_bytes;
@@ -102,6 +121,7 @@ extern void free_node(node_t *);
 extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
+extern node_t *lookup_node_id(const node_id_t *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
 extern bool dump_nodes(struct connection_t *);
 extern bool dump_traffic(struct connection_t *);