X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnode.h;h=4b3224e3cab4da7822f5441c729598a03a50a8de;hp=935b9a31af7db176d031c5b599908321f9aa4196;hb=1728d5b2c43b33700a9997f97fe8503ad1cf3585;hpb=8df22248293a8cd5e6056415b6e08740e40aa2bc

diff --git a/src/node.h b/src/node.h
index 935b9a3..4b3224e 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.h,v 1.1.2.31 2003/12/22 11:04:16 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_NODE_H__
@@ -29,14 +29,17 @@
 #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 {
@@ -90,7 +93,6 @@ 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 void update_node_address(node_t *, const sockaddr_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
 extern void dump_nodes(void);