X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=b4064cd11716b378e7f510de888acfab2cbac7bc;hp=e9fb2ae13e9770c662dee1f1148ebe7088e30f66;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/conf.h b/src/conf.h
index e9fb2ae1..b4064cd1 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
 
     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,19 +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.34 2002/09/09 21:24:31 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#include <avl_tree.h>
-#include "net.h"
-#include "subnet.h"
+#include "avl_tree.h"
 
 typedef struct config_t {
 	char *variable;
@@ -38,33 +32,32 @@ typedef struct config_t {
 	int line;
 } config_t;
 
+#include "subnet.h"
+
 extern avl_tree_t *config_tree;
 
-extern int debug_lvl;
 extern int pingtimeout;
 extern int maxtimeout;
-extern int bypass_security;
+extern bool bypass_security;
 extern char *confbase;
 extern char *netname;
 
 extern void init_configuration(avl_tree_t **);
 extern void exit_configuration(avl_tree_t **);
-extern config_t *new_config(void);
+extern config_t *new_config(void) __attribute__ ((malloc));
 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_port(config_t *, port_t *);
-extern int get_config_string(config_t *, char **);
-extern int get_config_address(config_t *, struct addrinfo **);
-struct subnet_t;				/* Needed for next line. */
-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__ */