X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=6f366c2a72123d5bcad3acfe5a34939a51c6b5cb;hp=b662ccd0ba7cb8ff0e001182e6dc741964ccc493;hb=116ba3b3da73fb857cf75b5c92c6aacd70d94dd9;hpb=d9a62c6354d1e2ad78ee8c610518ae9f9ab012d1 diff --git a/src/node.h b/src/node.h index b662ccd0..6f366c2a 100644 --- a/src/node.h +++ b/src/node.h @@ -17,12 +17,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: node.h,v 1.1.2.11 2002/02/11 15:59:18 guus Exp $ + $Id: node.h,v 1.1.2.14 2002/06/08 12:57:10 guus Exp $ */ #ifndef __TINC_NODE_H__ #define __TINC_NODE_H__ +#ifdef HAVE_STDINT_H + #include +#endif + #include #include "subnet.h" @@ -34,15 +38,15 @@ typedef struct node_status_t { 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 unused:27; + int indirect:1; /* 1 if this node is not directly reachable by us */ + int unused:26; } node_status_t; typedef struct node_t { char *name; /* name of this node */ long int options; /* options turned on for this node */ - ipv4_t address; /* his real (internet) ip to send UDP packets to */ - port_t port; /* port number of UDP connection */ + sockaddr_t address; /* his real (internet) ip to send UDP packets to */ char *hostname; /* the hostname of its real ip */ struct node_status_t status; @@ -67,8 +71,8 @@ typedef struct node_t { struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */ - unsigned int sent_seqno; /* Sequence number last sent to this node */ - unsigned int received_seqno; /* Sequence number last received from this node */ + uint32_t sent_seqno; /* Sequence number last sent to this node */ + uint32_t received_seqno; /* Sequence number last received from this node */ } node_t; extern struct node_t *myself; @@ -78,11 +82,11 @@ extern avl_tree_t *node_udp_tree; extern void init_nodes(void); extern void exit_nodes(void); extern node_t *new_node(void); -extern void free_node(node_t *n); -extern void node_add(node_t *n); -extern void node_del(node_t *n); +extern void free_node(node_t *); +extern void node_add(node_t *); +extern void node_del(node_t *); extern node_t *lookup_node(char *); -extern node_t *lookup_node_udp(ipv4_t, port_t); +extern node_t *lookup_node_udp(sockaddr_t *); extern void dump_nodes(void); #endif /* __TINC_NODE_H__ */