--- gvpe/src/conf.h	2004/04/02 14:42:45	1.20
+++ gvpe/src/conf.h	2005/03/01 04:38:21	1.22
@@ -31,13 +31,14 @@
 #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  = 0x01, // udp over ipv4
   PROT_IPv4   = 0x02, // generic ip protocol
-  PROT_TCPv4  = 0x04, // tcp over ipv4
+  PROT_TCPv4  = 0x04, // tcp over ipv4 (server)
   PROT_ICMPv4 = 0x08, // icmp over ipv4
-  PROT_DNSv4  = 0x10, // dns tunnel over ipv4
+  PROT_DNSv4  = 0x10, // dns tunnel ipv4 (server)
 };
 
 // select the "best" protocol of the available ones
@@ -49,11 +50,15 @@
 
   RSA *rsa_key;   // his public key
   char *nodename; // nodename, an internal nickname.
-
   char *hostname; // hostname, if known, or NULL.
+#if ENABLE_DNS
+  char *domain;   // dns tunnel domain
+  u16 dns_port;
+#endif
 
   u8 protocols;   // protocols this host can send & receive
-  u16 udp_port, tcp_port, dns_port;   // the port to bind to
+  u16 udp_port, tcp_port;   // the port to bind to
+  int max_retry;
 
   enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS, C_DISABLED } connectmode;
   bool compress;
@@ -94,6 +99,10 @@
   char *proxy_host;	// the proxy hostname, e.g. proxy1.example.net
   u16 proxy_port;	// the proxy port, e.g. 3128
 #endif
+#if ENABLE_DNS
+  char *dns_forw_host;
+  u16 dns_forw_port;
+#endif
 
   void init ();
   void cleanup ();