Move node_tree to mesh->nodes.

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index fa27bfd2926ce90ad81becd1a9052cf03a2f6d2e..f6415a1d075f0191ff60abe819b9e567dbdd01d8 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -21,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) */
@@ -34,7 +31,7 @@ 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 broadcast:1;               /* 1 if the next UDP packet should be broadcast to the local network */
        unsigned int unused:23;
@@ -52,15 +49,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 */
 
@@ -69,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) */
 
@@ -78,12 +69,11 @@ typedef struct node_t {
        uint32_t received;                      /* Total valid packets received from this node */
        uint32_t prev_received_seqno;
        uint32_t prev_received;
-       uint32_t farfuture;                     /* Packets in a row that have arrived from the far future */
        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 */
@@ -98,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__));