Fix compile errors and warnings.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index b5cd8a7..4f1406c 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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,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.23 2003/07/06 23:16:28 guus Exp $
+    $Id: node.h,v 1.1.2.28 2003/07/29 10:50:15 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 */
@@ -88,7 +84,7 @@ 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__ */