X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=1b33789ee0583c3195742ddd7aa1c1ccfe596d40;hb=refs%2Fheads%2F1.1;hp=f312043da58839431286f1b7b5a4c01f0d8b86c0;hpb=914d1be411229c28e6e8e4a0df99afa076a8b448;p=tinc

diff --git a/src/node.h b/src/node.h
index f312043d..7d5a0c8c 100644
--- a/src/node.h
+++ b/src/node.h
@@ -27,22 +27,25 @@
 #include "digest.h"
 #include "event.h"
 #include "subnet.h"
-
-typedef struct node_status_t {
-	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;
+#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 {
@@ -69,10 +72,11 @@ 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;
+	int weighted_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 */
@@ -118,8 +122,8 @@ extern struct node_t *myself;
 extern splay_tree_t node_tree;
 
 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(const char *name) 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);