X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.h;h=0476cdb062430de506dce3c01e124e2b73874d5d;hb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;hp=7ce17ebf09edf5abc6bb56214d1c0036c612dd0f;hpb=6b12bea62fe2e4bd8b5b6bd0e5ca7f53318705db;p=tinc

diff --git a/src/node.h b/src/node.h
index 7ce17ebf..0476cdb0 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2005 Ivo Timmermans
 
     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
@@ -17,26 +17,28 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.h,v 1.1.2.30 2003/12/20 19:47:52 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
-#include "event.h"
 #include "list.h"
 #include "subnet.h"
 
-typedef struct node_status_t {
-	int active:1;				/* 1 if active.. */
-	int validkey:1;				/* 1 if we currently have a valid key for him */
-	int waitingforkey:1;			/* 1 if we already sent out a request */
-	int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
-	int reachable:1;			/* 1 if this node is reachable in the graph */
-	int indirect:1;				/* 1 if this node is not directly reachable by us */
-	int unused:26;
+typedef union node_status_t {
+	struct {
+		int unused_active:1;			/* 1 if active (not used for nodes) */
+		int validkey:1;				/* 1 if we currently have a valid key for him */
+		int waitingforkey:1;			/* 1 if we already sent out a request */
+		int visited:1;				/* 1 if this node has been visited by one of the graph algorithms */
+		int reachable:1;			/* 1 if this node is reachable in the graph */
+		int indirect:1;				/* 1 if this node is not directly reachable by us */
+		int unused:26;
+	};
+	uint32_t value;
 } node_status_t;
 
 typedef struct node_t {
@@ -63,9 +65,9 @@ typedef struct node_t {
 	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) */
 
@@ -74,14 +76,15 @@ typedef struct node_t {
 	unsigned char late[16];			/* Bitfield marking late packets */
 
 	length_t mtu;				/* Maximum size of packets to send to this node */
-	length_t probedmtu;			/* Probed MTU */
+	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);
@@ -91,6 +94,6 @@ 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 dump_nodes(void);
+extern int dump_nodes(struct evbuffer *);
 
 #endif							/* __TINC_NODE_H__ */