X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=eb2e0dd62cc99e85be205a37a948d3a7c5e7a84a;hp=9136efa7b9cb7d0e2e323922f2aacb7c7982bacb;hb=23730375f27c32e0fe1a59c7a761dd85296a7a4a;hpb=82e383710980534d38bb9a8ef22f20677cd85861

diff --git a/src/conf.h b/src/conf.h
index 9136efa7..eb2e0dd6 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.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,50 +17,49 @@
     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.28 2001/10/27 12:13:17 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-#include <avl_tree.h>
-#include "net.h"
-#include "subnet.h"
+#include "avl_tree.h"
 
 typedef struct config_t {
-  char *variable;
-  char *value;
-  char *file;
-  int line;
+	char *variable;
+	char *value;
+	char *file;
+	int line;
 } config_t;
 
+#include "subnet.h"
+
 extern avl_tree_t *config_tree;
 
-extern int debug_lvl;
-extern int timeout;
+extern int pinginterval;
+extern int pingtimeout;
 extern int maxtimeout;
-extern int sighup;
+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_ip(config_t *, struct ip_mask_t **);
-struct subnet_t; /* Needed for next line. */
-extern int get_config_subnet(config_t *, struct subnet_t **);
+extern config_t *lookup_config_next(avl_tree_t *, const config_t *);
+extern bool get_config_bool(const config_t *, bool *);
+extern bool get_config_int(const config_t *, int *);
+extern bool get_config_string(const config_t *, char **);
+extern bool get_config_address(const config_t *, struct addrinfo **);
+extern bool get_config_subnet(const 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_open(const char *, const char *);
+extern bool is_safe_path(const char *);
+extern bool disable_old_keys(FILE *);
 
-#endif /* __TINC_CONF_H__ */
+#endif							/* __TINC_CONF_H__ */