X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=770ada7f05488715fa921eb1a66babb7f3c80ac4;hp=8f0c2b343ae9467ad734a6350f9ded57fee44501;hb=57bc9a1835bcb6a8df7963ee4ab04fde34f28eaf;hpb=7bd7f5b4363f222340e5c058c243d31c576fba88

diff --git a/src/conf.h b/src/conf.h
index 8f0c2b34..770ada7f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,10 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     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-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
@@ -13,94 +16,52 @@
     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.
-
-    $Id: conf.h,v 1.6.4.24 2001/06/05 19:39:54 guus Exp $
+    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__
-
-#include "net.h"
-
-#define MAXTIMEOUT 900  /* Maximum timeout value for retries. Should this be a configuration option? */
-
-typedef struct ip_mask_t {
-  ipv4_t address;
-  ipv4_t mask;
-} ip_mask_t;
-
-typedef enum which_t {
-  config_dummy = 0,
-  config_name = 1,
-  config_connectto,
-  config_pingtimeout,
-  config_tapdevice,
-  config_privatekey,
-  config_privatekeyfile,
-  config_keyexpire,
-  config_hostnames,
-  config_interface,
-  config_interfaceip,
-  config_address,
-  config_port,
-  config_publickey,
-  config_publickeyfile,
-  config_subnet,
-  config_restricthosts,
-  config_restrictsubnets,
-  config_restrictaddress,
-  config_restrictport,
-  config_indirectdata,
-  config_tcponly,
-  config_mode,
-} which_t;
+#include "avl_tree.h"
+#include "list.h"
 
 typedef struct config_t {
-  struct config_t *next;
-  which_t which;
-  int argtype;
-  union data {
-    unsigned long val;
-    char *ptr;
-    ip_mask_t *ip;
-    struct config_t *next;	/* For nested configs! */
-  } data;
+	char *variable;
+	char *value;
+	char *file;
+	int line;
 } config_t;
 
-typedef struct internal_config_t {
-  char *name;
-  enum which_t which;
-  int argtype;
-} internal_config_t;
-
-enum {
-  stupid_false = 1,
-  stupid_true
-};
+#include "subnet.h"
 
-enum {
-  TYPE_NAME = 1,
-  TYPE_INT,
-  TYPE_IP,
-  TYPE_BOOL
-};
+extern avl_tree_t *config_tree;
 
-extern config_t *config;
-extern int debug_lvl;
-extern int timeout;
-extern int sighup;
+extern int pinginterval;
+extern int pingtimeout;
+extern int maxtimeout;
+extern int mintimeout;
+extern bool bypass_security;
 extern char *confbase;
 extern char *netname;
-
-extern config_t *add_config_val(config_t **, int, char *);
-extern int read_config_file(config_t **, const char *);
-extern const config_t *get_config_val(config_t *, which_t type);
-extern void clear_config();
-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 *);
-
-#endif /* __TINC_CONF_H__ */
+extern list_t *cmdline_conf;
+
+extern void init_configuration(avl_tree_t **config_tree);
+extern void exit_configuration(avl_tree_t **config_tree);
+extern config_t *new_config(void) __attribute__((__malloc__));
+extern void free_config(config_t *cfg);
+extern void config_add(avl_tree_t *config_tree, config_t *cfg);
+extern config_t *lookup_config(const avl_tree_t *config_tree, char *variable);
+extern config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg);
+extern bool get_config_bool(const config_t *cfg, bool *result);
+extern bool get_config_int(const config_t *cfg, int *result);
+extern bool get_config_string(const config_t *cfg, char **result);
+extern bool get_config_address(const config_t *cfg, struct addrinfo **result);
+extern bool get_config_subnet(const config_t *cfg, struct subnet_t **result);
+
+extern config_t *parse_config_line(char *line, const char *fname, int lineno);
+extern bool read_config_file(avl_tree_t *config_tree, const char *fname);
+extern void read_config_options(avl_tree_t *config_tree, const char *prefix);
+extern bool read_server_config(void);
+extern bool read_connection_config(struct connection_t *c);
+extern FILE *ask_and_open(const char *fname, const char *what);
+
+#endif