X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=d070082546772063eedaff108f005649d6d21d5d;hb=28b7a53b693f6b4e70218a926e68a36ece54cda1;hp=0cdac3fa89c4f7241112a5139bd544a5d1946cb1;hpb=0f0585d71b28428792e53258bc570dddc17b0b27;p=tinc diff --git a/src/node.h b/src/node.h index 0cdac3fa..d0700825 100644 --- a/src/node.h +++ b/src/node.h @@ -29,19 +29,19 @@ #include "subnet.h" typedef struct node_status_t { - unsigned int unused_active: 1; /* 1 if active (not used for nodes) */ - unsigned int validkey: 1; /* 1 if we currently have a valid key for him */ - unsigned int waitingforkey: 1; /* 1 if we already sent out a request */ - unsigned int visited: 1; /* 1 if this node has been visited by one of the graph algorithms */ - unsigned int reachable: 1; /* 1 if this node is reachable in the graph */ - unsigned int indirect: 1; /* 1 if this node is not directly reachable by us */ - unsigned int sptps: 1; /* 1 if this node supports SPTPS */ - 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; /* 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; + 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 { @@ -50,7 +50,7 @@ typedef struct node_t { 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 */ + size_t sock; /* Socket to use for outgoing UDP packets */ sockaddr_t address; /* his real (internet) ip to send UDP packets to */ node_status_t status; @@ -76,23 +76,21 @@ 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) */ uint32_t sent_seqno; /* Sequence number last sent to this node */ uint32_t received_seqno; /* Sequence number last received from this node */ uint32_t received; /* Total valid packets received from this node */ - uint32_t prev_received_seqno; - uint32_t prev_received; uint32_t farfuture; /* Packets in a row that have arrived from the far future */ - unsigned char *late; /* Bitfield marking late packets */ + uint8_t *late; /* Bitfield marking late packets */ struct timeval udp_reply_sent; /* Last time a (gratuitous) UDP probe reply was sent */ struct timeval udp_ping_sent; /* Last time a UDP probe was sent */ - long int udp_ping_rtt; /* Round trip time of UDP ping (in microseconds) */ + int udp_ping_rtt; /* Round trip time of UDP ping (in microseconds; or -1 if !status.udp_confirmed) */ timeout_t udp_ping_timeout; /* Ping timeout event */ struct timeval mtu_ping_sent; /* Last time a MTU probe was sent */ @@ -116,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);