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

diff --git a/src/node.h b/src/node.h
index ebe0b9d5..f6415a1d 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) */
@@ -51,7 +49,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 +60,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 +71,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,9 +88,6 @@ 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 node_t *new_node(void) __attribute__ ((__malloc__));