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

diff --git a/src/node.h b/src/node.h
index ad8b728f..0cdac3fa 100644
--- a/src/node.h
+++ b/src/node.h
@@ -29,19 +29,19 @@
 #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;
+	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;
 } node_status_t;
 
 typedef struct node_t {
@@ -88,10 +88,11 @@ typedef struct node_t {
 	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 */
+	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 */
+	long int udp_ping_rtt;                  /* Round trip time of UDP ping (in microseconds) */
 	timeout_t udp_ping_timeout;             /* Ping timeout event */
 
 	struct timeval mtu_ping_sent;           /* Last time a MTU probe was sent */
@@ -99,7 +100,7 @@ typedef struct node_t {
 	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 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 */
@@ -110,6 +111,8 @@ 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;
@@ -117,15 +120,15 @@ 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 *);
-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 *);
-extern void update_node_udp(node_t *, const sockaddr_t *);
+extern node_t *new_node(void) __attribute__((__malloc__));
+extern void free_node(node_t *n);
+extern void node_add(node_t *n);
+extern void node_del(node_t *n);
+extern node_t *lookup_node(char *name);
+extern node_t *lookup_node_id(const node_id_t *id);
+extern node_t *lookup_node_udp(const sockaddr_t *sa);
+extern bool dump_nodes(struct connection_t *c);
+extern bool dump_traffic(struct connection_t *c);
+extern void update_node_udp(node_t *n, const sockaddr_t *sa);
 
 #endif