X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=830dcac685b7336af38cdede089011a7c3ff4aec;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=9b0d136f2bc5cc5e34366c50107d1a38b3fd6da1;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/node.h b/src/node.h
index 9b0d136f..830dcac6 100644
--- a/src/node.h
+++ b/src/node.h
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_NODE_H__
@@ -32,17 +30,14 @@
 #include "list.h"
 #include "subnet.h"
 
-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;
+typedef struct node_status_t {
+	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;
 } node_status_t;
 
 typedef struct node_t {
@@ -56,11 +51,9 @@ typedef struct node_t {
 
 	cipher_t incipher;                        /* Cipher for UDP packets */
 	digest_t indigest;                        /* Digest for UDP packets */	
-	int inmaclength;				/* Portion of digest to use */
 
 	cipher_t outcipher;                        /* Cipher for UDP packets */
 	digest_t outdigest;                        /* Digest for UDP packets */	
-	int outmaclength;				/* Portion of digest to use */
 
 	int incompression;			/* Compressionlevel, 0 = no compression */
 	int outcompression;			/* Compressionlevel, 0 = no compression */