Use bools and enums where appropriate.

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 32bb909..b4064cd 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,14 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.h,v 1.6.4.39 2003/07/17 15:06:26 guus Exp $
+    $Id: conf.h,v 1.6.4.40 2003/07/22 20:55:19 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
 #include "avl_tree.h"
-#include "subnet.h"
 
 typedef struct config_t {
        char *variable;
@@ -33,11 +32,13 @@ typedef struct config_t {
        int line;
 } config_t;
 
+#include "subnet.h"
+
 extern avl_tree_t *config_tree;
 
 extern int pingtimeout;
 extern int maxtimeout;
-extern int bypass_security;
+extern bool bypass_security;
 extern char *confbase;
 extern char *netname;
 
@@ -48,15 +49,15 @@ extern void free_config(config_t *);
 extern void config_add(avl_tree_t *, config_t *);
 extern config_t *lookup_config(avl_tree_t *, char *);
 extern config_t *lookup_config_next(avl_tree_t *, config_t *);
-extern int get_config_bool(config_t *, int *);
-extern int get_config_int(config_t *, int *);
-extern int get_config_string(config_t *, char **);
-extern int get_config_address(config_t *, struct addrinfo **);
-extern int get_config_subnet(config_t *, struct subnet_t **);
+extern bool get_config_bool(config_t *, bool *);
+extern bool get_config_int(config_t *, int *);
+extern bool get_config_string(config_t *, char **);
+extern bool get_config_address(config_t *, struct addrinfo **);
+extern bool get_config_subnet(config_t *, struct subnet_t **);
 
 extern int read_config_file(avl_tree_t *, const char *);
-extern int read_server_config(void);
-extern FILE *ask_and_safe_open(const char *, const char *, const char *);
-extern int is_safe_path(const char *);
+extern bool read_server_config(void);
+extern FILE *ask_and_safe_open(const char *, const char *, bool, const char *);
+extern bool is_safe_path(const char *);
 
 #endif                                                 /* __TINC_CONF_H__ */