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

diff --git a/src/conf.h b/src/conf.h
index d9309128..39f90531 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,12 +17,14 @@
     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.3 2000/06/27 20:10:47 guus Exp $
+    $Id: conf.h,v 1.6.4.10 2000/10/11 13:42:52 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_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;
@@ -35,26 +37,41 @@ typedef union data_t {
 } data_t;
 
 typedef enum which_t {
-  passphrasesdir = 1,
-  upstreamip,
-  upstreamport,
-  listenport,
-  myvpnip,
-  tapdevice,
-  allowconnect,
+  tincname = 1,
+  connectto,
   pingtimeout,
+  tapdevice,
+  privatekey,
   keyexpire,
-  vpnmask,
   resolve_dns,
-  indirectdata
+  interface,
+  interfaceip,
+  configuration
+  address,
+  port,
+  publickey,
+  subnet,
+  restricthosts,
+  restrictsubnets,
+  restrictaddress,
+  restrictport,
+  indirectdata,
+  tcponly,
 } which_t;
 
 typedef struct config_t {
   struct config_t *next;
   which_t which;
+  int argtype;
   data_t data;
 } config_t;
 
+typedef struct internal_config_t {
+  char *name;
+  enum which_t which;
+  int argtype;
+} internal_config_t;
+
 enum {
   stupid_false = 1,
   stupid_true
@@ -71,10 +88,13 @@ extern config_t *config;
 extern int debug_lvl;
 extern int timeout;
 extern int upstreamindex;
+extern int sighup;
+extern char *configfilename;
 
 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 void clear_config();
 
 #endif /* __TINC_CONF_H__ */