- Lots o' buglets fixed (-Wall helps)

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 673573b..ca3c27e 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+                            2000 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
@@ -15,11 +16,15 @@
     You should have received a copy of the GNU General Public License
     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.7 2000/08/07 16:27:27 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;
@@ -41,12 +46,16 @@ typedef enum which_t {
   allowconnect,
   pingtimeout,
   keyexpire,
-  proxymode
+  vpnmask,
+  resolve_dns,
+  indirectdata,
+  tcponly,
 } which_t;
 
 typedef struct config_t {
   struct config_t *next;
   which_t which;
+  int argtype;
   data_t data;
 } config_t;
 
@@ -65,9 +74,14 @@ enum {
 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__ */