X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=de527d25fde3407760a4c2b115e0897870bdbac4;hp=39f9053140b1b2853def89a3c756151053d63e53;hb=e1707f7739f450c729e26b921e459d5da07602f9;hpb=6e39481d8f2406e60b5e329ace08b5a005d5cc43

diff --git a/src/conf.h b/src/conf.h
index 39f90531..de527d25 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,53 +17,56 @@
     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.10 2000/10/11 13:42:52 guus Exp $
+    $Id: conf.h,v 1.6.4.19 2000/12/22 21:34:20 guus Exp $
 */
 
 #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 {
-  unsigned long ip;
-  unsigned long mask;
+  ipv4_t address;
+  ipv4_t mask;
 } ip_mask_t;
 
-typedef union data_t {
-  unsigned long val;
-  void *ptr;
-  ip_mask_t *ip;
-} data_t;
-
 typedef enum which_t {
-  tincname = 1,
-  connectto,
-  pingtimeout,
-  tapdevice,
-  privatekey,
-  keyexpire,
-  resolve_dns,
-  interface,
-  interfaceip,
-  configuration
-  address,
-  port,
-  publickey,
-  subnet,
-  restricthosts,
-  restrictsubnets,
-  restrictaddress,
-  restrictport,
-  indirectdata,
-  tcponly,
+  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,
 } which_t;
 
 typedef struct config_t {
   struct config_t *next;
   which_t which;
   int argtype;
-  data_t data;
+  union data {
+    unsigned long val;
+    void *ptr;
+    ip_mask_t *ip;
+    struct config_t *next;	/* For nested configs! */
+  } data;
 } config_t;
 
 typedef struct internal_config_t {
@@ -87,14 +90,15 @@ enum {
 extern config_t *config;
 extern int debug_lvl;
 extern int timeout;
-extern int upstreamindex;
 extern int sighup;
-extern char *configfilename;
+extern char *confbase;
+extern char *netname;
 
 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 const config_t *get_next_config_val(which_t type, int);
+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*);
 
 #endif /* __TINC_CONF_H__ */