X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=b6039684d7595a70b376ae45c419e6190a2bfc9d;hb=3a149f7521dfff67e6a790c1a830afc649ae083e;hp=daa0830a5797db76df3b5c13a8a351d8ecdc9adf;hpb=42d2dff33306beae8ddbd9cc991ad80f135950a6;p=tinc

diff --git a/src/node.h b/src/node.h
index daa0830a..b6039684 100644
--- a/src/node.h
+++ b/src/node.h
@@ -29,19 +29,20 @@
 #include "subnet.h"
 
 typedef struct node_status_t {
-	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 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 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 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;
+	bool unused_active: 1;          /* 1 if active (not used for nodes) */
+	bool validkey: 1;               /* 1 if we currently have a valid key for him */
+	bool waitingforkey: 1;          /* 1 if we already sent out a request */
+	bool visited: 1;                /* 1 if this node has been visited by one of the graph algorithms */
+	bool reachable: 1;              /* 1 if this node is reachable in the graph */
+	bool indirect: 1;               /* 1 if this node is not directly reachable by us */
+	bool sptps: 1;                  /* 1 if this node supports SPTPS */
+	bool udp_confirmed: 1;          /* 1 if the address is one that we received UDP traffic on */
+	bool send_locally: 1;           /* 1 if the next UDP packet should be sent on the local network */
+	bool udppacket: 1;              /* 1 if the most recently received packet was UDP */
+	bool validkey_in: 1;            /* 1 if we have sent a valid key to him */
+	bool has_address: 1;            /* 1 if we know an external address for this node */
+	bool ping_sent: 1;              /* 1 if we sent a UDP probe but haven't received the reply yet */
+	uint32_t unused: 19;
 } node_status_t;
 
 typedef struct node_t {
@@ -50,7 +51,7 @@ typedef struct node_t {
 	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 */
+	size_t sock;                            /* Socket to use for outgoing UDP packets */
 	sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
 
 	node_status_t status;
@@ -85,13 +86,12 @@ 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 */
+	uint8_t *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 */
+	int udp_ping_rtt;                       /* Round trip time of UDP ping (in microseconds; or -1 if !status.udp_confirmed) */
 	timeout_t udp_ping_timeout;             /* Ping timeout event */
 
 	struct timeval mtu_ping_sent;           /* Last time a MTU probe was sent */
@@ -110,12 +110,13 @@ typedef struct node_t {
 	uint64_t in_bytes;
 	uint64_t out_packets;
 	uint64_t out_bytes;
+
+	struct address_cache_t *address_cache;
 } node_t;
 
 extern struct node_t *myself;
-extern splay_tree_t *node_tree;
+extern splay_tree_t node_tree;
 
-extern void init_nodes(void);
 extern void exit_nodes(void);
 extern node_t *new_node(void) __attribute__((__malloc__));
 extern void free_node(node_t *n);