X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=4d4047a692bd63ede9a8f4a94cefc7ced2dc86cf;hp=c1db544e3ac179bba3f305683fe75de8b80c475f;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=9c2f805255fa36b05e8fe9391f639581d938b653

diff --git a/src/conf.h b/src/conf.h
index c1db544e..4d4047a6 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
-                            2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 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,85 +17,47 @@
     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.14 2000/10/24 15:46:16 guus Exp $
+    $Id$
 */
 
 #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 {
-  tincname = 1,
-  connectto,
-  pingtimeout,
-  tapdevice,
-  tapsubnet,
-  privatekey,
-  keyexpire,
-  resolve_dns,
-  interface,
-  interfaceip,
-  address,
-  port,
-  publickey,
-  subnet,
-  restricthosts,
-  restrictsubnets,
-  restrictaddress,
-  restrictport,
-  indirectdata,
-  tcponly,
-} which_t;
+#include "avl_tree.h"
 
 typedef struct config_t {
-  struct config_t *next;
-  which_t which;
-  int argtype;
-  union data {
-    unsigned long val;
-    void *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;
+#include "subnet.h"
 
-enum {
-  stupid_false = 1,
-  stupid_true
-};
+extern avl_tree_t *config_tree;
 
-enum {
-  TYPE_NAME = 1,
-  TYPE_INT,
-  TYPE_IP,
-  TYPE_BOOL
-};
-
-extern config_t *config;
-extern int debug_lvl;
-extern int timeout;
-extern int sighup;
+extern int pingtimeout;
+extern int maxtimeout;
+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);
-
-#endif /* __TINC_CONF_H__ */
+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(avl_tree_t *, char *);
+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 bool read_server_config(void);
+extern FILE *ask_and_open(const char *, const char *, const char *);
+extern bool is_safe_path(const char *);
+
+#endif							/* __TINC_CONF_H__ */