ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.C
(Generate patch)

Comparing gvpe/src/conf.C (file contents):
Revision 1.42 by pcg, Mon Dec 5 12:58:08 2005 UTC vs.
Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <cstdio> 34#include <cstdio>
147 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 157 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
148 default_node.connectmode = conf_node::C_ALWAYS; 158 default_node.connectmode = conf_node::C_ALWAYS;
149 default_node.compress = true; 159 default_node.compress = true;
150 default_node.protocols = 0; 160 default_node.protocols = 0;
151 default_node.max_retry = DEFAULT_MAX_RETRY; 161 default_node.max_retry = DEFAULT_MAX_RETRY;
162 default_node.max_ttl = DEFAULT_MAX_TTL;
163 default_node.max_queue = DEFAULT_MAX_QUEUE;
152 default_node.if_up_data = strdup (""); 164 default_node.if_up_data = strdup ("");
153 165
154#if ENABLE_DNS 166#if ENABLE_DNS
155 default_node.dns_port = 0; // default is 0 == client 167 default_node.dns_port = 0; // default is 0 == client
156 168
460 } 472 }
461 else if (!strcmp (var, "allow-direct")) 473 else if (!strcmp (var, "allow-direct"))
462 node->allow_direct.push_back (strdup (val)); 474 node->allow_direct.push_back (strdup (val));
463 else if (!strcmp (var, "deny-direct")) 475 else if (!strcmp (var, "deny-direct"))
464 node->deny_direct.push_back (strdup (val)); 476 node->deny_direct.push_back (strdup (val));
477 else if (!strcmp (var, "max-ttl"))
478 node->max_ttl = atof (val);
479 else if (!strcmp (var, "max-queue"))
480 {
481 node->max_queue = atoi (val);
482
483 if (node->max_queue < 1)
484 node->max_queue = 1;
485 }
465 486
466 // unknown or misplaced 487 // unknown or misplaced
467 else 488 else
468 return _("unknown configuration directive. (ignored)"); 489 return _("unknown configuration directive. (ignored)");
469 490

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines