--- gvpe/src/conf.h	2009/07/18 05:59:16	1.37
+++ gvpe/src/conf.h	2011/12/17 22:05:34	1.39
@@ -59,6 +59,8 @@
   PROT_TCPv4  = 0x04, // tcp over ipv4 (server)
   PROT_ICMPv4 = 0x08, // icmp over ipv4
   PROT_DNSv4  = 0x10, // dns tunnel ipv4 (server)
+  PROT_IPv42  = 0x20, // temporary hack to invetsigate packet loss
+  PROT_EMPTY  = 0x00  // not used
 };
 
 #define PROT_RELIABLE (PROT_TCPv4 | PROT_DNSv4)
@@ -133,6 +135,9 @@
   RSA *rsa_key;     // our private rsa key
   loglevel llevel;
   u8 ip_proto;      // the ip protocol to use
+#if 1//D2
+  u8 ip2_proto;      // the ip protocol to use
+#endif
 #if ENABLE_ICMP
   u8 icmp_type;     // the icmp type for the icmp-protocol
 #endif
@@ -151,6 +156,7 @@
 
 #if ENABLE_DNS
   char *dns_forw_host;
+  bool dns_case_preserving;
   u16 dns_forw_port;
   float dns_timeout_factor;
   float dns_send_interval;
@@ -164,7 +170,7 @@
 
   // create a filename from string, replacing %s by the nodename
   // and using relative paths under confbase.
-  char *config_filename (const char *name, const char *dflt);
+  char *config_filename (const char *name, const char *dflt = 0);
 
   void print ();
 
@@ -184,6 +190,7 @@
 
   configuration_parser (configuration &conf, bool need_keys, int argc, char **argv);
 
+  void parse_file (const char *fname);
   const char *parse_line (char *line);
   void parse_argv ();
 };