X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=1863db94f81b5c268cb39099ea1cea997d05d998;hb=7939ee12836bf2ef772f2a6a1e805ee0d64a8e70;hp=e704ba82f56e10ed5fe412ffdcbaf6baa7f13d62;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=tinc

diff --git a/src/node.h b/src/node.h
index e704ba82..1863db94 100644
--- a/src/node.h
+++ b/src/node.h
@@ -37,11 +37,13 @@ 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 unused:23;
 } node_status_t;
 
 typedef struct node_t {
 	char *name;                             /* name of this node */
+	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 */
@@ -55,11 +57,13 @@ typedef struct node_t {
 	ecdsa_t *ecdsa;                         /* His public ECDSA key */
 	sptps_t sptps;
 
+#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 */
+#endif
 
 	int incompression;                      /* Compressionlevel, 0 = no compression */
 	int outcompression;                     /* Compressionlevel, 0 = no compression */
@@ -83,6 +87,9 @@ 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_ping_sent;           /* Last time a ping probe was sent */
+	timeout_t udp_ping_timeout;             /* Ping timeout event */
+
 	length_t mtu;                           /* Maximum size of packets to send to this node */
 	length_t minmtu;                        /* Probed minimum MTU */
 	length_t maxmtu;                        /* Probed maximum MTU */
@@ -110,6 +117,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 *);