X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=1e08c7ec11c05fab4d774a860247b2fe2978d479;hb=108b238915c5f58b3d94ab433dc5d04e064c2b11;hp=6a8e6413138f6948c000d4940301a346df619ef4;hpb=c217d214f4f071c235bc7c463a1da6124e2570a6;p=tinc

diff --git a/src/node.h b/src/node.h
index 6a8e6413..1e08c7ec 100644
--- a/src/node.h
+++ b/src/node.h
@@ -13,17 +13,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include <event.h>
+
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
-#include "event.h"
+#include "digest.h"
 #include "list.h"
 #include "subnet.h"
 
@@ -39,38 +42,29 @@ typedef struct node_status_t {
 
 typedef struct node_t {
 	char *name;				/* name of this node */
-	long int options;			/* options turned on for this node */
+	uint32_t options;			/* options turned on for this node */
 
 	sockaddr_t address;			/* his real (internet) ip to send UDP packets to */
 	char *hostname;				/* the hostname of its real ip */
 
 	node_status_t status;
 
-	const EVP_CIPHER *incipher;		/* Cipher type for UDP packets received from him */
-	char *inkey;				/* Cipher key and iv */
-	int inkeylength;			/* Cipher key and iv length */
-	EVP_CIPHER_CTX inctx;			/* Cipher context */
-	
-	const EVP_CIPHER *outcipher;		/* Cipher type for UDP packets sent to him*/
-	char *outkey;				/* Cipher key and iv */
-	int outkeylength;			/* Cipher key and iv length */
-	EVP_CIPHER_CTX outctx;			/* Cipher context */
-	
-	const EVP_MD *indigest;			/* Digest type for MAC of packets received from him */
-	int inmaclength;			/* Length of MAC */
-
-	const EVP_MD *outdigest;		/* Digest type for MAC of packets sent to him*/
-	int outmaclength;			/* Length of MAC */
+	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 */
 
+	int distance;
 	struct node_t *nexthop;			/* nearest node from us to him */
 	struct node_t *via;			/* next hop for UDP packets */
 
-	avl_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
+	splay_tree_t *subnet_tree;		/* Pointer to a tree of subnets belonging to this node */
 
-	avl_tree_t *edge_tree;			/* Edges with this node as one of the endpoints */
+	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) */
 
@@ -82,12 +76,12 @@ typedef struct node_t {
 	length_t minmtu;			/* Probed minimum MTU */
 	length_t maxmtu;			/* Probed maximum MTU */
 	int mtuprobes;				/* Number of probes */
-	event_t *mtuevent;			/* Probe event */
+	struct event mtuevent;			/* Probe event */
 } node_t;
 
 extern struct node_t *myself;
-extern avl_tree_t *node_tree;
-extern avl_tree_t *node_udp_tree;
+extern splay_tree_t *node_tree;
+extern splay_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);
@@ -97,7 +91,7 @@ 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 int dump_nodes(struct evbuffer *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
-extern void dump_nodes(void);
 
 #endif							/* __TINC_NODE_H__ */