--- gvpe/src/conf.h	2004/06/11 15:56:33	1.21
+++ gvpe/src/conf.h	2005/03/03 16:54:34	1.25
@@ -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
 */
 
@@ -36,9 +38,9 @@
 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
@@ -50,11 +52,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
+#endif
+  char *dns_hostname;
+  u16 dns_port;
 
   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;
@@ -97,6 +103,11 @@
   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 ();
   void read_config (bool need_keys);