get_config_{ip,port} removed.

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 60dee5c..0d3d664 100644 (file)
--- 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-2001 Ivo Timmermans <itimmermans@bigfoot.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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,86 +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.18 2000/12/06 13:33:49 zarq Exp $
+    $Id: conf.h,v 1.6.4.30 2001/11/16 12:14:20 zarq Exp $
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
+#include <avl_tree.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_keyexpire,
-  config_hostnames,
-  config_interface,
-  config_interfaceip,
-  config_address,
-  config_port,
-  config_publickey,
-  config_subnet,
-  config_restricthosts,
-  config_restrictsubnets,
-  config_restrictaddress,
-  config_restrictport,
-  config_indirectdata,
-  config_tcponly,
-} which_t;
+#include "subnet.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;
-
-enum {
-  stupid_false = 1,
-  stupid_true
-};
-
-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 maxtimeout;
 extern int sighup;
+extern int 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 void init_configuration(avl_tree_t **);
+extern void exit_configuration(avl_tree_t **);
+extern config_t *new_config(void);
+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_string(config_t *, char **);
+struct subnet_t; /* Needed for next line. */
+extern int 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*);
+extern FILE *ask_and_safe_open(const char*, const char*, const char *);
+extern int is_safe_path(const char *);
 
 #endif /* __TINC_CONF_H__ */