X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=5761e4d747e5544c2d5189fdaed074eaa597ac12;hb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;hp=ebe0b9d51a5647625d4df37f190b3756dbc30cb6;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/node.h b/src/node.h
index ebe0b9d5..5761e4d7 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,14 +17,13 @@
     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 "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) */
@@ -35,13 +34,19 @@ typedef struct node_status_t {
 	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 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 */
+	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 */
@@ -51,7 +56,7 @@ 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;
 
 	int incompression;                      /* Compressionlevel, 0 = no compression */
@@ -62,9 +67,11 @@ 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 *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) */
+	time_t last_connect_try;
+	time_t last_successfull_connection;
 
 	uint32_t sent_seqno;                    /* Sequence number last sent to this node */
 	uint32_t received_seqno;                /* Sequence number last received from this node */
@@ -73,9 +80,9 @@ typedef struct node_t {
 	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 */
 	timeout_t mtutimeout;                   /* Probe event */
 	struct timeval probe_time;              /* Time the last probe was sent or received */
@@ -84,23 +91,22 @@ typedef struct node_t {
 	float bandwidth;                        /* Last measured bandwidth */
 	float packetloss;                       /* Last measured packet loss rate */
 
+	struct utcp *utcp;
+
 	uint64_t in_packets;
 	uint64_t in_bytes;
 	uint64_t out_packets;
 	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 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 /* __MESHLINK_NODE_H__ */