- Lots of little stuff modified

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index d930912..c1db544 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,44 +17,62 @@
     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.14 2000/10/24 15:46:16 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 {
-  passphrasesdir = 1,
-  upstreamip,
-  upstreamport,
-  listenport,
-  myvpnip,
-  tapdevice,
-  allowconnect,
+  tincname = 1,
+  connectto,
   pingtimeout,
+  tapdevice,
+  tapsubnet,
+  privatekey,
   keyexpire,
-  vpnmask,
   resolve_dns,
-  indirectdata
+  interface,
+  interfaceip,
+  address,
+  port,
+  publickey,
+  subnet,
+  restricthosts,
+  restrictsubnets,
+  restrictaddress,
+  restrictport,
+  indirectdata,
+  tcponly,
 } which_t;
 
 typedef struct config_t {
   struct config_t *next;
   which_t which;
-  data_t data;
+  int argtype;
+  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 {
+  char *name;
+  enum which_t which;
+  int argtype;
+} internal_config_t;
+
 enum {
   stupid_false = 1,
   stupid_true
@@ -70,11 +88,14 @@ enum {
 extern config_t *config;
 extern int debug_lvl;
 extern int timeout;
-extern int upstreamindex;
+extern int sighup;
+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);
 
 #endif /* __TINC_CONF_H__ */