X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=3a779af97055b163917a0c2aacc2860db8c80c68;hb=05c02272e16eb7670b19c596070a1a7cad72e432;hp=ebe0b9d51a5647625d4df37f190b3756dbc30cb6;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/node.h b/src/node.h
index ebe0b9d5..3a779af9 100644
--- a/src/node.h
+++ b/src/node.h
@@ -20,11 +20,9 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "splay_tree.h"
-#include "cipher.h"
-#include "connection.h"
-#include "digest.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) */
@@ -43,6 +41,8 @@ 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,7 +51,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,7 +62,7 @@ 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) */
 
@@ -73,9 +73,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 */
@@ -90,17 +90,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 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, 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__ */