X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=eaba79d0b01ae8bb959c773947d046688540cf81;hb=f712fdc0b3de22566cdf06954256c62f46f25542;hp=2ae82e281eb367de10ad08a4a931402419b2b21c;hpb=056159f3d0fa29e75faf7b188c5aba1007128418;p=meshlink diff --git a/src/node.h b/src/node.h index 2ae82e28..eaba79d0 100644 --- a/src/node.h +++ b/src/node.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_NODE_H +#define MESHLINK_NODE_H + /* node.h -- header for node.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 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 @@ -17,33 +20,38 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NODE_H__ -#define __TINC_NODE_H__ - #include "event.h" #include "sockaddr.h" #include "sptps.h" +#include "utcp/utcp.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 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 broadcast:1; /* 1 if the next UDP packet should be broadcast to the local network */ - unsigned int unused:23; + 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 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 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 destroyed: 1; /* 1 if the node is being destroyed, deallocate channels when any callback is triggered */ + unsigned int duplicate: 1; /* 1 if the node is duplicate, ie. multiple nodes using the same Name are online */ + unsigned int unused: 20; } node_status_t; typedef struct node_t { char *name; /* name of this node */ + void *priv; + uint32_t options; /* options turned on for this node */ + dev_class_t devclass; + + 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 */ node_status_t status; time_t last_state_change; @@ -63,24 +71,16 @@ typedef struct node_t { 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 received; /* Total valid packets received from this node */ - uint32_t prev_received_seqno; - uint32_t prev_received; - unsigned char* late; /* Bitfield marking late packets */ + time_t last_connect_try; + time_t last_successfull_connection; 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 */ 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 */ + + struct utcp *utcp; uint64_t in_packets; uint64_t in_bytes; @@ -88,17 +88,14 @@ typedef struct node_t { uint64_t out_bytes; } node_t; -extern struct node_t *myself; -extern struct 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 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 void update_node_udp(node_t *, const sockaddr_t *); +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, const 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 /* __TINC_NODE_H__ */ +#endif