[ViewVC] Diff of: cvs/gvpe/src/conf.C

Comparing gvpe/src/conf.C (file contents):
Revision 1.28 by pcg, Tue Mar 1 04:38:21 2005 UTC vs.
Revision 1.39 by pcg, Sat Mar 26 03:16:24 2005 UTC

 /*
     conf.c -- configuration code
-    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    This file is part of GVPE.
-    This program is free software; you can redistribute it and/or modify
+    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.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     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
 */
 #include "config.h"
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 #include <openssl/bn.h>
-#include "gettext.h"
 #include "conf.h"
 #include "slog.h"
 #include "util.h"
           );
 }
 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 ()
 {
   memset (this, 0, sizeof (*this));
   default_node.udp_port    = DEFAULT_UDPPORT;
   default_node.tcp_port    = DEFAULT_UDPPORT; // ehrm
   default_node.connectmode = conf_node::C_ALWAYS;
   default_node.compress    = true;
-  default_node.protocols   = PROT_UDPv4;
+  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_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");
 }
 void configuration::cleanup()
   cleanup ();
   init ();
 }
-#define parse_bool(target,name,trueval,falseval)		\
+#define parse_bool(target,name,trueval,falseval) do {		\
-  if (!strcmp (val, "yes"))		target = trueval;	\
+  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;	\
   else if (!strcmp (val, "on"))		target = trueval;	\
   else if (!strcmp (val, "off"))	target = falseval;	\
   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)
 {
   char *fname;
   FILE *f;
           val = strtok (NULL, "\t\n\r =");
           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"))
             {
               if (!::thisnode
                 thisnode = node;
             }
           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"))
             rekey = atoi (val);
           else if (!strcmp (var, "keepalive"))
             free (script_node_up), script_node_up = strdup (val);
           else if (!strcmp (var, "node-down"))
             free (script_node_down), script_node_down = strdup (val);
           else if (!strcmp (var, "pid-file"))
             free (pidfilename), pidfilename = strdup (val);
-          else if (!strcmp (var, "dns-forwarder-host"))
+          else if (!strcmp (var, "dns-forw-host"))
             {
 #if ENABLE_DNS
               free (dns_forw_host), dns_forw_host = strdup (val);
 #endif
             }
-          else if (!strcmp (var, "dns-forwarder-port"))
+          else if (!strcmp (var, "dns-forw-port"))
             {
 #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
           /* node-specific, defaultable */
           else if (!strcmp (var, "udp-port"))
             node->udp_port = atoi (val);
           else if (!strcmp (var, "tcp-port"))
             node->tcp_port = atoi (val);
+          else if (!strcmp (var, "dns-hostname"))
+            {
+#if ENABLE_DNS
+              free (node->dns_hostname), node->dns_hostname = strdup (val);
+#endif
+            }
           else if (!strcmp (var, "dns-port"))
             {
 #if ENABLE_DNS
               node->dns_port = atoi (val);
 #endif
             {
 #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"))
             node->max_retry = atoi (val);
           else if (!strcmp (var, "connect"))
                 node->connectmode = conf_node::C_ALWAYS;
               else if (!strcmp (val, "disabled"))
                 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"))
             {
 #if ENABLE_TCP
               u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
             }
           // 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);
         }
       fclose (f);
     }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/conf.C (file contents): Revision 1.28 by pcg, Tue Mar 1 04:38:21 2005 UTC vs. Revision 1.39 by pcg, Sat Mar 26 03:16:24 2005 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.28 by pcg, Tue Mar 1 04:38:21 2005 UTC vs.
Revision 1.39 by pcg, Sat Mar 26 03:16:24 2005 UTC