X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=ad8b728f535f1069400d36bb752c21f4ea7c7148;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=0800337cf7dee4a910c179dfd4a1317d7e51c8f3;hpb=417981462a2dde7800768eb58cf8f4e5238d4ad7;p=tinc diff --git a/src/node.h b/src/node.h index 0800337c..ad8b728f 100644 --- a/src/node.h +++ b/src/node.h @@ -1,3 +1,6 @@ +#ifndef TINC_NODE_H +#define TINC_NODE_H + /* node.h -- header for node.c Copyright (C) 2001-2013 Guus Sliepen , @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NODE_H__ -#define __TINC_NODE_H__ - #include "splay_tree.h" #include "cipher.h" #include "connection.h" @@ -39,18 +39,19 @@ typedef struct node_status_t { unsigned int udp_confirmed:1; /* 1 if the address is one that we received UDP traffic on */ unsigned int send_locally:1; /* 1 if the next UDP packet should be sent on the local network */ unsigned int udppacket:1; /* 1 if the most recently received packet was UDP */ - unsigned int validkey_in; /* 1 if we have sent a valid key to him */ - unsigned int unused:22; + unsigned int validkey_in:1; /* 1 if we have sent a valid key to him */ + unsigned int has_address:1; /* 1 if we know an external address for this node */ + unsigned int unused:20; } node_status_t; typedef struct node_t { char *name; /* name of this node */ + char *hostname; /* the hostname of its real ip */ node_id_t id; /* unique node ID (name hash) */ uint32_t options; /* options turned on for this node */ int sock; /* Socket to use for outgoing UDP packets */ sockaddr_t address; /* his real (internet) ip to send UDP packets to */ - char *hostname; /* the hostname of its real ip */ node_status_t status; time_t last_state_change; @@ -127,4 +128,4 @@ extern bool dump_nodes(struct connection_t *); extern bool dump_traffic(struct connection_t *); extern void update_node_udp(node_t *, const sockaddr_t *); -#endif /* __TINC_NODE_H__ */ +#endif