Merge branch 'master' into 1.1

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 830dcac685b7336af38cdede089011a7c3ff4aec..f5ebde3b3f45be4d4591f75d8151d28f14b2c5de 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -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"
@@ -42,7 +40,7 @@ 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 */
@@ -91,7 +89,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__ */