X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=fea90d1b936330f36ee25f1103001eda73b4243c;hb=72091d5c770856870bb8cd51bcc5641078c7562c;hp=3daffd4a2b0eb97b9cf011cfe86dce1a182bfc71;hpb=22ae0c3549628739ca7c40e48ce1a276469ded92;p=tinc

diff --git a/src/node.h b/src/node.h
index 3daffd4a..fea90d1b 100644
--- a/src/node.h
+++ b/src/node.h
@@ -27,21 +27,25 @@
 #include "digest.h"
 #include "event.h"
 #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;
+#include "compression.h"
+
+typedef union node_status_t {
+	struct {
+		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 value;
 } node_status_t;
 
 typedef struct node_t {
@@ -50,7 +54,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;
@@ -68,27 +72,25 @@ typedef struct node_t {
 	digest_t *outdigest;                    /* Digest for UDP packets */
 #endif
 
-	int incompression;                      /* Compressionlevel, 0 = no compression */
-	int outcompression;                     /* Compressionlevel, 0 = no compression */
+	compression_level_t incompression;      /* Compression level, 0 = no compression */
+	compression_level_t outcompression;     /* Compression level, 0 = no compression */
 
 	int distance;
 	struct node_t *nexthop;                 /* nearest node from us to him */
 	struct edge_t *prevedge;                /* nearest node from him to us */
 	struct node_t *via;                     /* next hop for UDP packets */
 
-	splay_tree_t *subnet_tree;              /* Pointer to a tree of subnets belonging to this node */
+	splay_tree_t subnet_tree;               /* Pointer to a tree of subnets belonging to this node */
 
-	splay_tree_t *edge_tree;                /* Edges with this node as one of the endpoints */
+	splay_tree_t edge_tree;                 /* Edges with this node as one of the endpoints */
 
 	struct connection_t *connection;        /* Connection associated with this node (if a direct connection exists) */
 
 	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 */
@@ -116,12 +118,11 @@ typedef struct node_t {
 } 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);
+extern node_t *new_node(void) ATTR_MALLOC ATTR_DEALLOCATOR(free_node);
 extern void node_add(node_t *n);
 extern void node_del(node_t *n);
 extern node_t *lookup_node(char *name);