X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=3a040c7b74cdb9b5502210e764b59d6e13ecc059;hp=0d66313b9830a233b50866271b6edabbc2f8a88b;hb=84531fb6e621959e06519fdbb7f2a8f7578f66bd;hpb=8caa1b9d750bb7467d1c3330780b05ac2bbf9883

diff --git a/src/conf.h b/src/conf.h
index 0d66313b..3a040c7b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2012 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
@@ -12,61 +13,55 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-typedef struct ip_mask_t {
-  unsigned long ip;
-  unsigned long mask;
-} ip_mask_t;
-
-typedef union data_t {
-  unsigned long val;
-  void *ptr;
-  ip_mask_t *ip;
-} data_t;
-
-typedef enum which_t {
-  passphrasesdir = 1,
-  upstreamip,
-  upstreamport,
-  listenport,
-  myvpnip,
-  tapdevice,
-  allowconnect,
-  pingtimeout,
-  keyexpire
-} which_t;
+#include "avl_tree.h"
+#include "list.h"
 
 typedef struct config_t {
-  struct config_t *next;
-  which_t which;
-  data_t data;
+	char *variable;
+	char *value;
+	char *file;
+	int line;
 } config_t;
 
-enum {
-  stupid_false = 1,
-  stupid_true
-};
+#include "subnet.h"
+
+extern avl_tree_t *config_tree;
 
-enum {
-  TYPE_NAME = 1,
-  TYPE_INT,
-  TYPE_IP,
-  TYPE_BOOL
-};
+extern int pinginterval;
+extern int pingtimeout;
+extern int maxtimeout;
+extern bool bypass_security;
+extern char *confbase;
+extern char *netname;
+extern list_t *cmdline_conf;
 
-extern config_t *config;
-extern int debug_lvl;
-extern int timeout;
+extern void init_configuration(avl_tree_t **);
+extern void exit_configuration(avl_tree_t **);
+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(const avl_tree_t *, char *);
+extern config_t *lookup_config_next(const 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 config_t *add_config_val(config_t **, int, char *);
-extern int read_config_file(const char *);
-extern const config_t *get_config_val(which_t type);
+extern config_t *parse_config_line(char *, const char *, int);
+extern bool read_config_file(avl_tree_t *, const char *);
+extern void read_config_options(avl_tree_t *, const char *);
+extern bool read_server_config(void);
+extern bool read_connection_config(struct connection_t *);
+extern FILE *ask_and_open(const char *, const char *);
+extern bool is_safe_path(const char *);
 
-#endif /* __TINC_CONF_H__ */
+#endif							/* __TINC_CONF_H__ */