--- gvpe/src/conf.h	2003/04/07 01:12:56	1.12
+++ gvpe/src/conf.h	2004/06/11 15:56:33	1.21
@@ -1,5 +1,6 @@
 /*
     conf.h -- configuration database
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     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
@@ -19,21 +20,25 @@
 #ifndef VPE_CONF_H__
 #define VPE_CONF_H__
 
-#include <openssl/rsa.h>
-
 #include <vector>
 
+#include <openssl/rsa.h>
+
 #include "slog.h"
 #include "global.h"
 
 #define DEFAULT_REKEY		3600
 #define DEFAULT_KEEPALIVE	60	// one keepalive/minute (it's just 8 bytes...)
 #define DEFAULT_UDPPORT		655	// same as tinc, conflicts would be rare
+#define DEFAULT_MTU		1500	// let's ether-net
+#define DEFAULT_MAX_RETRY	28800	// retry at least this often
 
 enum {
-  PROT_UDPv4 = 1, // udp over ipv4
-  PROT_IPv4  = 2, // generic ip protocol
-  PROT_TCPv4 = 4, // tcp over ipv4 (NYI)
+  PROT_UDPv4  = 0x01, // udp over ipv4
+  PROT_IPv4   = 0x02, // generic ip protocol
+  PROT_TCPv4  = 0x04, // tcp over ipv4
+  PROT_ICMPv4 = 0x08, // icmp over ipv4
+  PROT_DNSv4  = 0x10, // dns tunnel over ipv4
 };
 
 // select the "best" protocol of the available ones
@@ -49,7 +54,8 @@
   char *hostname; // hostname, if known, or NULL.
 
   u8 protocols;   // protocols this host can send & receive
-  u16 udp_port, tcp_port;   // the port to bind to
+  u16 udp_port, tcp_port, dns_port;   // the port to bind to
+  int max_retry;
 
   enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS, C_DISABLED } connectmode;
   bool compress;
@@ -75,11 +81,15 @@
   char *prikeyfile;
   RSA *rsa_key;     // our private rsa key
   loglevel llevel;
-  u8 ip_proto;    // the ip protocol to use
+  u8 ip_proto;      // the ip protocol to use
+#if ENABLE_ICMP
+  u8 icmp_type;     // the icmp type for the icmp-protocol
+#endif
 
   char *script_if_up;
   char *script_node_up;
   char *script_node_down;
+  char *pidfilename;
 
 #if ENABLE_HTTP_PROXY
   char *proxy_auth;	// login:password