#include "digest.h"
#include "event.h"
#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;
+#include "compression.h"
+
+typedef union node_status_t {
+ struct {
+ 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 value;
} node_status_t;
typedef struct node_t {
digest_t *outdigest; /* Digest for UDP packets */
#endif
- int incompression; /* Compressionlevel, 0 = no compression */
- int outcompression; /* Compressionlevel, 0 = no compression */
+ compression_level_t incompression; /* Compression level, 0 = no compression */
+ compression_level_t outcompression; /* Compression level, 0 = no compression */
int distance;
struct node_t *nexthop; /* nearest node from us to him */
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) */
extern splay_tree_t node_tree;
extern void exit_nodes(void);
-extern node_t *new_node(void) __attribute__((__malloc__));
+extern node_t *new_node(void) ATTR_MALLOC;
extern void free_node(node_t *n);
extern void node_add(node_t *n);
extern void node_del(node_t *n);