X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=daa0830a5797db76df3b5c13a8a351d8ecdc9adf;hp=62ed3acd575fe66d92c8a46b8f2738286c7e882e;hb=42d2dff33306beae8ddbd9cc991ad80f135950a6;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb diff --git a/src/node.h b/src/node.h index 62ed3acd..daa0830a 100644 --- a/src/node.h +++ b/src/node.h @@ -1,6 +1,9 @@ +#ifndef TINC_NODE_H +#define TINC_NODE_H + /* node.h -- header for node.c - Copyright (C) 2001-2012 Guus Sliepen , + Copyright (C) 2001-2013 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -18,71 +21,90 @@ 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" #include "digest.h" -#include "ecdh.h" +#include "event.h" #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 unused_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 ecdh:1; /* 1 if this node supports ECDH key exchange */ - unsigned int unused:25; + 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; } node_status_t; typedef struct node_t { - char *name; /* name of this node */ - uint32_t options; /* options turned on for this node */ + 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 */ + int sock; /* Socket to use for outgoing UDP packets */ + sockaddr_t address; /* his real (internet) ip to send UDP packets to */ node_status_t status; + time_t last_state_change; time_t last_req_key; - ecdsa_t ecdsa; /* His public ECDSA key */ - ecdh_t ecdh; /* State for ECDH key exchange */ + ecdsa_t *ecdsa; /* His public ECDSA key */ + sptps_t sptps; - cipher_t incipher; /* Cipher for UDP packets */ - digest_t indigest; /* Digest for UDP packets */ +#ifndef DISABLE_LEGACY + cipher_t *incipher; /* Cipher for UDP packets */ + digest_t *indigest; /* Digest for UDP packets */ - cipher_t outcipher; /* Cipher for UDP packets */ - digest_t outdigest; /* Digest for UDP packets */ + cipher_t *outcipher; /* Cipher for UDP packets */ + digest_t *outdigest; /* Digest for UDP packets */ +#endif - int incompression; /* Compressionlevel, 0 = no compression */ - int outcompression; /* Compressionlevel, 0 = no compression */ + int incompression; /* Compressionlevel, 0 = no compression */ + int outcompression; /* Compressionlevel, 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 */ + 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 *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 */ - splay_tree_t *subnet_tree; /* Pointer to a tree of subnets belonging to this node */ + 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 */ + timeout_t udp_ping_timeout; /* Ping timeout event */ - splay_tree_t *edge_tree; /* Edges with this node as one of the endpoints */ + struct timeval mtu_ping_sent; /* Last time a MTU probe was sent */ - struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */ + struct timeval mtu_info_sent; /* Last time a MTU_INFO message was sent */ + struct timeval udp_info_sent; /* Last time a UDP_INFO message was sent */ - uint32_t sent_seqno; /* Sequence number last sent to this node */ - uint32_t received_seqno; /* Sequence number last received from this node */ - uint32_t farfuture; /* Packets in a row that have arrived from the far future */ - unsigned char* late; /* Bitfield marking late packets */ + length_t maxrecentlen; /* Maximum size of recently received packets */ - length_t mtu; /* Maximum size of packets to send to this node */ - length_t minmtu; /* Probed minimum MTU */ - length_t maxmtu; /* Probed maximum MTU */ - int mtuprobes; /* Number of probes */ - struct event mtuevent; /* Probe event */ + length_t mtu; /* Maximum size of packets to send to this node */ + length_t minmtu; /* Probed minimum MTU */ + length_t maxmtu; /* Probed maximum MTU */ + int mtuprobes; /* Number of probes */ uint64_t in_packets; uint64_t in_bytes; @@ -92,18 +114,18 @@ typedef struct node_t { extern struct node_t *myself; extern splay_tree_t *node_tree; -extern splay_tree_t *node_udp_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 *); -extern void node_add(node_t *); -extern void node_del(node_t *); -extern node_t *lookup_node(char *); -extern node_t *lookup_node_udp(const sockaddr_t *); -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__ */ +extern node_t *new_node(void) __attribute__((__malloc__)); +extern void free_node(node_t *n); +extern void node_add(node_t *n); +extern void node_del(node_t *n); +extern node_t *lookup_node(char *name); +extern node_t *lookup_node_id(const node_id_t *id); +extern node_t *lookup_node_udp(const sockaddr_t *sa); +extern bool dump_nodes(struct connection_t *c); +extern bool dump_traffic(struct connection_t *c); +extern void update_node_udp(node_t *n, const sockaddr_t *sa); + +#endif