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

diff --git a/src/node.h b/src/node.h
index 1e08c7ec..a9322aa5 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,6 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#include <event.h>
-
 #include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
@@ -33,7 +31,7 @@
 typedef struct node_status_t {
 	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 unused_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 */
@@ -48,6 +46,7 @@ typedef struct node_t {
 	char *hostname;				/* the hostname of its real ip */
 
 	node_status_t status;
+	time_t last_req_key;
 
 	cipher_t incipher;                        /* Cipher for UDP packets */
 	digest_t indigest;                        /* Digest for UDP packets */	
@@ -91,7 +90,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 bool dump_nodes(struct connection_t *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
 
 #endif							/* __TINC_NODE_H__ */