--- gvpe/src/conf.h	2009/03/23 15:22:00	1.36
+++ gvpe/src/conf.h	2012/01/17 21:38:11	1.41
@@ -59,6 +59,7 @@
   PROT_TCPv4  = 0x04, // tcp over ipv4 (server)
   PROT_ICMPv4 = 0x08, // icmp over ipv4
   PROT_DNSv4  = 0x10, // dns tunnel ipv4 (server)
+  PROT_ALL    = 0x1f
 };
 
 #define PROT_RELIABLE (PROT_TCPv4 | PROT_DNSv4)
@@ -133,12 +134,16 @@
   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
 
   char *script_if_up;
   char *script_node_up;
+  char *script_node_change;
   char *script_node_down;
   char *pidfilename;
 
@@ -150,6 +155,7 @@
 
 #if ENABLE_DNS
   char *dns_forw_host;
+  bool dns_case_preserving;
   u16 dns_forw_port;
   float dns_timeout_factor;
   float dns_send_interval;
@@ -163,7 +169,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 ();
 
@@ -183,6 +189,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 ();
 };