--- gvpe/src/conf.C	2003/03/01 15:53:03	1.1
+++ gvpe/src/conf.C	2003/03/23 14:49:16	1.4
@@ -67,6 +67,7 @@
 
   rekey     = DEFAULT_REKEY;
   keepalive = DEFAULT_KEEPALIVE;
+  llevel    = L_INFO;
 
   default_node.port        = DEFAULT_PORT;
   default_node.connectmode = conf_node::C_ALWAYS;
@@ -164,7 +165,7 @@
               loglevel l = string_to_loglevel (val);
 
               if (l != L_NONE)
-                set_loglevel (l);
+                llevel = l;
               else
                 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
             }
@@ -252,7 +253,9 @@
             }
 
           /* node-specific, defaultable */
-          else if (!strcmp (var, "port"))
+          else if (!strcmp (var, "udp-port"))
+            node->port = atoi (val);
+          else if (!strcmp (var, "port")) //deprecated
             node->port = atoi (val);
           else if (!strcmp (var, "router-priority"))
             node->routerprio = atoi (val);
@@ -264,11 +267,25 @@
                 node->connectmode = conf_node::C_NEVER;
               else if (!strcmp (val, "always"))
                 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' or 'always', at '%s' line %d"),
+                        _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
                         var, fname, lineno);
             }
+          else if (!strcmp (var, "inherit-tos"))
+            {
+              if (!strcmp (val, "yes"))
+                node->inherit_tos = true;
+              else if (!strcmp (val, "no"))
+                node->inherit_tos = false;
+              else
+                slog (L_WARN,
+                        _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
+                        var, fname, lineno);
+            }
+
           else if (!strcmp (var, "compress"))
             {
               if (!strcmp (val, "yes"))