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

diff --git a/src/conf.h b/src/conf.h
index c1db544e..de93f72e 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-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,7 +17,7 @@
     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: conf.h,v 1.6.4.26 2001/09/01 12:46:49 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -33,26 +33,29 @@ typedef struct ip_mask_t {
 } 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,
+  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;
 
 typedef struct config_t {
@@ -60,8 +63,8 @@ typedef struct config_t {
   which_t which;
   int argtype;
   union data {
-    unsigned long val;
-    void *ptr;
+    long val;
+    char *ptr;
     ip_mask_t *ip;
     struct config_t *next;	/* For nested configs! */
   } data;
@@ -94,8 +97,10 @@ 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 const config_t *get_config_val(config_t const *, 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__ */