X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=4407f993c6ee4d5df49767fe55fe57c92f255fb0;hp=085d6a4f134190a6afc208223f3adec611989ae1;hb=9bde92ce97d5503ff2d31dcc6f0648902580ec14;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/node.h b/src/node.h
index 085d6a4f..4407f993 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,20 +17,16 @@
     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.24 2003/07/12 17:41:46 guus Exp $
+    $Id: node.h,v 1.1.2.29 2003/07/30 21:52:41 guus Exp $
 */
 
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#include <avl_tree.h>
-
-#include "subnet.h"
+#include "avl_tree.h"
 #include "connection.h"
+#include "list.h"
+#include "subnet.h"
 
 typedef struct node_status_t {
 	int active:1;				/* 1 if active.. */
@@ -49,7 +45,7 @@ typedef struct node_t {
 	sockaddr_t address;			/* his real (internet) ip to send UDP packets to */
 	char *hostname;				/* the hostname of its real ip */
 
-	struct node_status_t status;
+	node_status_t status;
 
 	const EVP_CIPHER *cipher;	/* Cipher type for UDP packets */
 	char *key;					/* Cipher key and iv */
@@ -83,12 +79,12 @@ extern avl_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);
-extern node_t *new_node(void) __attribute__ ((malloc));
+extern node_t *new_node(void) __attribute__ ((__malloc__));
 extern void free_node(node_t *);
 extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
-extern node_t *lookup_node_udp(sockaddr_t *);
+extern node_t *lookup_node_udp(const sockaddr_t *);
 extern void dump_nodes(void);
 
 #endif							/* __TINC_NODE_H__ */