--- gvpe/src/conf.C	2005/03/06 18:34:46	1.33
+++ gvpe/src/conf.C	2005/03/26 03:16:24	1.39
@@ -39,8 +39,6 @@
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 
-#include "gettext.h"
-
 #include "conf.h"
 #include "slog.h"
 #include "util.h"
@@ -92,15 +90,20 @@
 
 conf_node::~conf_node ()
 {
+#if 0
+  // does not work, because string pointers etc. are shared
+  // is not called, however
   if (rsa_key)
     RSA_free (rsa_key);
 
   free (nodename);
   free (hostname);
+  free (if_up_data);
 #if ENABLE_DNS
   free (domain);
   free (dns_hostname);
 #endif
+#endif
 }
 
 void configuration::init ()
@@ -122,11 +125,17 @@
   default_node.compress    = true;
   default_node.protocols   = 0;
   default_node.max_retry   = DEFAULT_MAX_RETRY;
+  default_node.if_up_data  = strdup ("");
 
 #if ENABLE_DNS
   default_node.dns_port    = 0; // default is 0 == client
-  dns_forw_host            = strdup ("127.0.0.1");
-  dns_forw_port            = 53;
+
+  dns_forw_host       = strdup ("127.0.0.1");
+  dns_forw_port       = 53;
+  dns_timeout_factor  = DEFAULT_DNS_TIMEOUT_FACTOR;
+  dns_send_interval   = DEFAULT_DNS_SEND_INTERVAL;
+  dns_overlap_factor  = DEFAULT_DNS_OVERLAP_FACTOR;
+  dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
 #endif
 
   conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
@@ -162,8 +171,8 @@
   init ();
 }
 
-#define parse_bool(target,name,trueval,falseval)		\
-  if (!strcmp (val, "yes"))		target = trueval;	\
+#define parse_bool(target,name,trueval,falseval) do {		\
+  if      (!strcmp (val, "yes"))	target = trueval;	\
   else if (!strcmp (val, "no"))		target = falseval;	\
   else if (!strcmp (val, "true"))	target = trueval;	\
   else if (!strcmp (val, "false"))	target = falseval;	\
@@ -172,7 +181,8 @@
   else								\
     slog (L_WARN,						\
             _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
-            name, var, fname, lineno);
+            name, var, fname, lineno);				 \
+} while (0)
 
 void configuration::read_config (bool need_keys)
 {
@@ -221,9 +231,9 @@
           if (!val || val[0] == '#')
             {
               slog (L_WARN,
-                      _("no value for variable `%s', at '%s' line %d"),
+                      _("no value for variable `%s', at '%s' line %d, skipping."),
                       var, fname, lineno);
-              break;
+              continue;
             }
 
           if (!strcmp (var, "on"))
@@ -305,9 +315,7 @@
           else if (!strcmp (var, "private-key"))
             free (prikeyfile), prikeyfile = strdup (val);
           else if (!strcmp (var, "ifpersist"))
-            {
-              parse_bool (ifpersist, "ifpersist", true, false);
-            }
+            parse_bool (ifpersist, "ifpersist", true, false);
           else if (!strcmp (var, "ifname"))
             free (ifname), ifname = strdup (val);
           else if (!strcmp (var, "rekey"))
@@ -324,12 +332,42 @@
             free (script_node_down), script_node_down = strdup (val);
           else if (!strcmp (var, "pid-file"))
             free (pidfilename), pidfilename = strdup (val);
-#if ENABLE_DNS
           else if (!strcmp (var, "dns-forw-host"))
-            free (dns_forw_host), dns_forw_host = strdup (val);
+            {
+#if ENABLE_DNS
+              free (dns_forw_host), dns_forw_host = strdup (val);
+#endif
+            }
           else if (!strcmp (var, "dns-forw-port"))
-            dns_forw_port = atoi (val);
+            {
+#if ENABLE_DNS
+              dns_forw_port = atoi (val);
+#endif
+            }
+          else if (!strcmp (var, "dns-timeout-factor"))
+            {
+#if ENABLE_DNS
+              dns_timeout_factor = atof (val);
+#endif
+            }
+          else if (!strcmp (var, "dns-send-interval"))
+            {
+#if ENABLE_DNS
+              dns_send_interval = atoi (val);
+#endif
+            }
+          else if (!strcmp (var, "dns-overlap-factor"))
+            {
+#if ENABLE_DNS
+              dns_overlap_factor = atof (val);
+#endif
+            }
+          else if (!strcmp (var, "dns-max-outstanding"))
+            {
+#if ENABLE_DNS
+              dns_max_outstanding = atoi (val);
 #endif
+            }
           else if (!strcmp (var, "http-proxy-host"))
             {
 #if ENABLE_HTTP_PROXY
@@ -358,14 +396,26 @@
             node->udp_port = atoi (val);
           else if (!strcmp (var, "tcp-port"))
             node->tcp_port = atoi (val);
-#if ENABLE_DNS
           else if (!strcmp (var, "dns-hostname"))
-            free (node->dns_hostname), node->dns_hostname = strdup (val);
+            {
+#if ENABLE_DNS
+              free (node->dns_hostname), node->dns_hostname = strdup (val);
+#endif
+            }
           else if (!strcmp (var, "dns-port"))
-            node->dns_port = atoi (val);
+            {
+#if ENABLE_DNS
+              node->dns_port = atoi (val);
+#endif
+            }
           else if (!strcmp (var, "dns-domain"))
-            free (node->domain), node->domain = strdup (val);
+            {
+#if ENABLE_DNS
+              free (node->domain), node->domain = strdup (val);
 #endif
+            }
+          else if (!strcmp (var, "if-up-data"))
+            free (node->if_up_data), node->if_up_data = strdup (val);
           else if (!strcmp (var, "router-priority"))
             node->routerprio = atoi (val);
           else if (!strcmp (var, "max-retry"))
@@ -382,17 +432,13 @@
                 node->connectmode = conf_node::C_DISABLED;
               else
                 slog (L_WARN,
-                      _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
+                      _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
                       var, fname, lineno);
             }
           else if (!strcmp (var, "inherit-tos"))
-            {
-              parse_bool (node->inherit_tos, "inherit-tos", true, false);
-            }
+            parse_bool (node->inherit_tos, "inherit-tos", true, false);
           else if (!strcmp (var, "compress"))
-            {
-              parse_bool (node->compress, "compress", true, false);
-            }
+            parse_bool (node->compress, "compress", true, false);
           // all these bool options really really cost a lot of executable size!
           else if (!strcmp (var, "enable-tcp"))
             {
@@ -424,7 +470,7 @@
           // unknown or misplaced
           else
             slog (L_WARN,
-                    _("unknown or misplaced variable `%s', at '%s' line %d"),
+                    _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
                     var, fname, lineno);
         }