Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index edb3408..d070082 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -29,20 +29,19 @@
 #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;
+       uint32_t unused_active: 1;          /* 1 if active (not used for nodes) */
+       uint32_t validkey: 1;               /* 1 if we currently have a valid key for him */
+       uint32_t waitingforkey: 1;          /* 1 if we already sent out a request */
+       uint32_t visited: 1;                /* 1 if this node has been visited by one of the graph algorithms */
+       uint32_t reachable: 1;              /* 1 if this node is reachable in the graph */
+       uint32_t indirect: 1;               /* 1 if this node is not directly reachable by us */
+       uint32_t sptps: 1;                  /* 1 if this node supports SPTPS */
+       uint32_t udp_confirmed: 1;          /* 1 if the address is one that we received UDP traffic on */
+       uint32_t send_locally: 1;           /* 1 if the next UDP packet should be sent on the local network */
+       uint32_t udppacket: 1;              /* 1 if the most recently received packet was UDP */
+       uint32_t validkey_in: 1;            /* 1 if we have sent a valid key to him */
+       uint32_t has_address: 1;            /* 1 if we know an external address for this node */
+       uint32_t ping_sent: 1;              /* 1 if we sent a UDP probe but haven't received the reply yet */
 } node_status_t;
 
 typedef struct node_t {
@@ -77,9 +76,9 @@ typedef struct node_t {
        struct edge_t *prevedge;                /* nearest node from him to us */
        struct node_t *via;                     /* next hop for UDP packets */
 
-       splay_tree_t *subnet_tree;              /* Pointer to a tree of subnets belonging to this node */
+       splay_tree_t subnet_tree;               /* Pointer to a tree of subnets belonging to this node */
 
-       splay_tree_t *edge_tree;                /* Edges with this node as one of the endpoints */
+       splay_tree_t edge_tree;                 /* Edges with this node as one of the endpoints */
 
        struct connection_t *connection;        /* Connection associated with this node (if a direct connection exists) */
 
@@ -115,9 +114,8 @@ typedef struct node_t {
 } node_t;
 
 extern struct node_t *myself;
-extern splay_tree_t *node_tree;
+extern splay_tree_t node_tree;
 
-extern void init_nodes(void);
 extern void exit_nodes(void);
 extern node_t *new_node(void) __attribute__((__malloc__));
 extern void free_node(node_t *n);