--- gvpe/src/conf.C	2005/12/05 12:58:08	1.42
+++ gvpe/src/conf.C	2008/08/08 16:48:00	1.45
@@ -1,22 +1,32 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
  
     This file is part of GVPE.
 
-    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 gvpe; if not, write to the Free Software
-    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    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 3 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, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
 #include "config.h"
@@ -149,6 +159,8 @@
   default_node.compress    = true;
   default_node.protocols   = 0;
   default_node.max_retry   = DEFAULT_MAX_RETRY;
+  default_node.max_ttl     = DEFAULT_MAX_TTL;
+  default_node.max_queue   = DEFAULT_MAX_QUEUE;
   default_node.if_up_data  = strdup ("");
 
 #if ENABLE_DNS
@@ -462,6 +474,15 @@
     node->allow_direct.push_back (strdup (val));
   else if (!strcmp (var, "deny-direct"))
     node->deny_direct.push_back (strdup (val));
+  else if (!strcmp (var, "max-ttl"))
+    node->max_ttl = atof (val);
+  else if (!strcmp (var, "max-queue"))
+    {
+      node->max_queue = atoi (val);
+
+      if (node->max_queue < 1)
+        node->max_queue = 1;
+    }
 
   // unknown or misplaced
   else