X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnode.h;h=5b5cc251e25786977c1974489bb58959f2e77f4d;hb=bf6490825eabdf4eda6e64f2e5fcd690db7b72ce;hp=9c49a799222db745821445027eee603c70088718;hpb=de78d79db84c486afcc353884ec1770866beb653;p=meshlink

diff --git a/src/node.h b/src/node.h
index 9c49a799..5b5cc251 100644
--- a/src/node.h
+++ b/src/node.h
@@ -25,18 +25,20 @@
 
 #include "avl_tree.h"
 #include "connection.h"
-#include "event.h"
 #include "list.h"
 #include "subnet.h"
 
-typedef struct node_status_t {
-	int active:1;				/* 1 if active.. */
-	int validkey:1;				/* 1 if we currently have a valid key for him */
-	int waitingforkey:1;			/* 1 if we already sent out a request */
-	int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
-	int reachable:1;			/* 1 if this node is reachable in the graph */
-	int indirect:1;				/* 1 if this node is not directly reachable by us */
-	int unused:26;
+typedef union node_status_t {
+	struct {
+		int unused_active:1;			/* 1 if active (not used for nodes) */
+		int validkey:1;				/* 1 if we currently have a valid key for him */
+		int waitingforkey:1;			/* 1 if we already sent out a request */
+		int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
+		int reachable:1;			/* 1 if this node is reachable in the graph */
+		int indirect:1;				/* 1 if this node is not directly reachable by us */
+		int unused:26;
+	};
+	uint32_t value;
 } node_status_t;
 
 typedef struct node_t {
@@ -77,7 +79,7 @@ typedef struct node_t {
 	length_t minmtu;			/* Probed minimum MTU */
 	length_t maxmtu;			/* Probed maximum MTU */
 	int mtuprobes;				/* Number of probes */
-	event_t *mtuevent;			/* Probe event */
+	struct event mtuevent;			/* Probe event */
 } node_t;
 
 extern struct node_t *myself;