--- gvpe/src/conf.h	2005/03/01 06:27:20	1.23
+++ gvpe/src/conf.h	2005/03/07 01:31:26	1.26
@@ -1,8 +1,10 @@
 /*
     conf.h -- configuration database
-    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -13,7 +15,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -31,7 +33,7 @@
 #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
+#define DEFAULT_MAX_RETRY	3600	// retry at least this often
 
 enum {
   PROT_UDPv4  = 0x01, // udp over ipv4
@@ -41,6 +43,9 @@
   PROT_DNSv4  = 0x10, // dns tunnel ipv4 (server)
 };
 
+#define PROT_RELIABLE (PROT_TCPv4 | PROT_DNSv4)
+#define PROT_SLOW     PROT_DNSv4
+
 // select the "best" protocol of the available ones
 u8 best_protocol (u8 protset);
 const char *strprotocol (u8 protocol);
@@ -53,8 +58,9 @@
   char *hostname; // hostname, if known, or NULL.
 #if ENABLE_DNS
   char *domain;   // dns tunnel domain
-  u16 dns_port;
 #endif
+  char *dns_hostname;
+  u16 dns_port;
 
   u8 protocols;   // protocols this host can send & receive
   u16 udp_port, tcp_port;   // the port to bind to
@@ -100,8 +106,10 @@
   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 ();