--- gvpe/src/conf.C	2003/03/06 18:43:07	1.2
+++ gvpe/src/conf.C	2003/03/23 14:49:16	1.4
@@ -253,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);
@@ -265,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', '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 'connectmode', use one of 'ondemand', 'never' or 'always', at '%s' line %d"),
+                        _("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"))