Merge branch 'master' into 1.1

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 4186d06193ecd31d1695142ed1813f720a50a96d..f4fc88bbc5fc887a7f0740c37810ef12578226c1 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
+#include <event.h>
+
 #include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
@@ -58,8 +60,7 @@ typedef struct node_t {
 
        int compression;                        /* Compressionlevel, 0 = no compression */
 
-       list_t *queue;                          /* Queue for packets awaiting to be encrypted */
-
+       int distance;
        struct node_t *nexthop;                 /* nearest node from us to him */
        struct node_t *via;                     /* next hop for UDP packets */
 
@@ -92,6 +93,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__ */