X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=4f0f13089bf6b1901f401a9b1787bc6ac055c9be;hb=9415f4b08fb2ca9ae933edd0bf8b096db195ebae;hp=3327fca29c2921027f805cf665e5f6921fdabbeb;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=meshlink diff --git a/src/node.h b/src/node.h index 3327fca2..4f0f1308 100644 --- a/src/node.h +++ b/src/node.h @@ -1,7 +1,6 @@ /* node.h -- header for node.c - Copyright (C) 2001-2012 Guus Sliepen , - 2001-2005 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,14 +17,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NODE_H__ -#define __TINC_NODE_H__ +#ifndef __MESHLINK_NODE_H__ +#define __MESHLINK_NODE_H__ -#include "splay_tree.h" -#include "cipher.h" -#include "connection.h" -#include "digest.h" -#include "subnet.h" +#include "event.h" +#include "sockaddr.h" +#include "sptps.h" typedef struct node_status_t { unsigned int unused_active:1; /* 1 if active (not used for nodes) */ @@ -34,15 +31,19 @@ typedef struct node_status_t { 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 unused_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 unused:24; + unsigned int broadcast:1; /* 1 if the next UDP packet should be broadcast to the local network */ + unsigned int blacklisted:1; /* 1 if the node is blacklist so we never want to speak with him anymore*/ + unsigned int unused:22; } node_status_t; typedef struct node_t { char *name; /* name of this node */ uint32_t options; /* options turned on for this node */ + struct meshlink_handle *mesh; /* The mesh this node belongs to */ + 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 */ @@ -51,15 +52,9 @@ typedef struct node_t { time_t last_state_change; time_t last_req_key; - ecdsa_t ecdsa; /* His public ECDSA key */ + struct ecdsa *ecdsa; /* His public ECDSA key */ sptps_t sptps; - 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 */ - int incompression; /* Compressionlevel, 0 = no compression */ int outcompression; /* Compressionlevel, 0 = no compression */ @@ -68,22 +63,27 @@ 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 *edge_tree; /* Edges with this node as one of the endpoints */ + struct 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 farfuture; /* Packets in a row that have arrived from the far future */ + uint32_t received; /* Total valid packets received from this node */ + uint32_t prev_received_seqno; + uint32_t prev_received; unsigned char* late; /* Bitfield marking late 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 */ + uint16_t mtu; /* Maximum size of packets to send to this node */ + uint16_t minmtu; /* Probed minimum MTU */ + uint16_t maxmtu; /* Probed maximum MTU */ int mtuprobes; /* Number of probes */ - struct event mtuevent; /* Probe event */ + timeout_t mtutimeout; /* Probe event */ + struct timeval probe_time; /* Time the last probe was sent or received */ + int probe_counter; /* Number of probes received since last burst was sent */ + float rtt; /* Last measured round trip time */ + float bandwidth; /* Last measured bandwidth */ + float packetloss; /* Last measured packet loss rate */ uint64_t in_packets; uint64_t in_bytes; @@ -91,19 +91,14 @@ typedef struct node_t { uint64_t out_bytes; } node_t; -extern struct node_t *myself; -extern splay_tree_t *node_tree; - -extern void init_nodes(void); -extern void exit_nodes(void); +extern void init_nodes(struct meshlink_handle *mesh); +extern void exit_nodes(struct meshlink_handle *mesh); 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 void node_add(struct meshlink_handle *mesh, node_t *); +extern void node_del(struct meshlink_handle *mesh, node_t *); +extern node_t *lookup_node(struct meshlink_handle *mesh, char *); +extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *); +extern void update_node_udp(struct meshlink_handle *mesh, node_t *, const sockaddr_t *); + +#endif /* __MESHLINK_NODE_H__ */