Do not break strict aliasing of status_t structs.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 6749470..2ea9692 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2004 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+    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
@@ -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 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;
+       };
+       uint32_t value;
 } node_status_t;
 
 typedef struct node_t {