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.29 by pcg, Tue Mar 1 06:27:20 2005 UTC vs.
Revision 1.37 by pcg, Wed Mar 23 14:33:34 2005 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
34#include <openssl/err.h> 36#include <openssl/err.h>
35#include <openssl/pem.h> 37#include <openssl/pem.h>
36#include <openssl/rsa.h> 38#include <openssl/rsa.h>
37#include <openssl/rand.h> 39#include <openssl/rand.h>
38#include <openssl/bn.h> 40#include <openssl/bn.h>
39
40#include "gettext.h"
41 41
42#include "conf.h" 42#include "conf.h"
43#include "slog.h" 43#include "slog.h"
44#include "util.h" 44#include "util.h"
45 45
… …
93 if (rsa_key) 93 if (rsa_key)
94 RSA_free (rsa_key); 94 RSA_free (rsa_key);
95 95
96 free (nodename); 96 free (nodename);
97 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
98 free (domain); 99 free (domain);
100 free (dns_hostname);
101#endif
99} 102}
100 103
101void configuration::init () 104void configuration::init ()
102{ 105{
103 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
116 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 120 default_node.compress = true;
118 default_node.protocols = 0; 121 default_node.protocols = 0;
119 default_node.max_retry = DEFAULT_MAX_RETRY; 122 default_node.max_retry = DEFAULT_MAX_RETRY;
120 123
124#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client
126 dns_forw_host = strdup ("127.0.0.1");
127 dns_forw_port = 53;
128#endif
129
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
122} 131}
123 132
124void configuration::cleanup() 133void configuration::cleanup()
125{ 134{
… …
149 158
150 cleanup (); 159 cleanup ();
151 init (); 160 init ();
152} 161}
153 162
154#define parse_bool(target,name,trueval,falseval) \ 163#define parse_bool(target,name,trueval,falseval) do { \
155 if (!strcmp (val, "yes")) target = trueval; \ 164 if (!strcmp (val, "yes")) target = trueval; \
156 else if (!strcmp (val, "no")) target = falseval; \ 165 else if (!strcmp (val, "no")) target = falseval; \
157 else if (!strcmp (val, "true")) target = trueval; \ 166 else if (!strcmp (val, "true")) target = trueval; \
158 else if (!strcmp (val, "false")) target = falseval; \ 167 else if (!strcmp (val, "false")) target = falseval; \
159 else if (!strcmp (val, "on")) target = trueval; \ 168 else if (!strcmp (val, "on")) target = trueval; \
160 else if (!strcmp (val, "off")) target = falseval; \ 169 else if (!strcmp (val, "off")) target = falseval; \
161 else \ 170 else \
162 slog (L_WARN, \ 171 slog (L_WARN, \
163 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 172 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
164 name, var, fname, lineno); 173 name, var, fname, lineno); \
174} while (0)
165 175
166void configuration::read_config (bool need_keys) 176void configuration::read_config (bool need_keys)
167{ 177{
168 char *fname; 178 char *fname;
169 FILE *f; 179 FILE *f;
… …
208 val = strtok (NULL, "\t\n\r ="); 218 val = strtok (NULL, "\t\n\r =");
209 219
210 if (!val || val[0] == '#') 220 if (!val || val[0] == '#')
211 { 221 {
212 slog (L_WARN, 222 slog (L_WARN,
213 _("no value for variable `%s', at '%s' line %d"), 223 _("no value for variable `%s', at '%s' line %d, skipping."),
214 var, fname, lineno); 224 var, fname, lineno);
215 break; 225 continue;
216 } 226 }
217 227
218 if (!strcmp (var, "on")) 228 if (!strcmp (var, "on"))
219 { 229 {
220 if (!::thisnode 230 if (!::thisnode
… …
292 thisnode = node; 302 thisnode = node;
293 } 303 }
294 else if (!strcmp (var, "private-key")) 304 else if (!strcmp (var, "private-key"))
295 free (prikeyfile), prikeyfile = strdup (val); 305 free (prikeyfile), prikeyfile = strdup (val);
296 else if (!strcmp (var, "ifpersist")) 306 else if (!strcmp (var, "ifpersist"))
297 {
298 parse_bool (ifpersist, "ifpersist", true, false); 307 parse_bool (ifpersist, "ifpersist", true, false);
299 }
300 else if (!strcmp (var, "ifname")) 308 else if (!strcmp (var, "ifname"))
301 free (ifname), ifname = strdup (val); 309 free (ifname), ifname = strdup (val);
302 else if (!strcmp (var, "rekey")) 310 else if (!strcmp (var, "rekey"))
303 rekey = atoi (val); 311 rekey = atoi (val);
304 else if (!strcmp (var, "keepalive")) 312 else if (!strcmp (var, "keepalive"))
… …
351 /* node-specific, defaultable */ 359 /* node-specific, defaultable */
352 else if (!strcmp (var, "udp-port")) 360 else if (!strcmp (var, "udp-port"))
353 node->udp_port = atoi (val); 361 node->udp_port = atoi (val);
354 else if (!strcmp (var, "tcp-port")) 362 else if (!strcmp (var, "tcp-port"))
355 node->tcp_port = atoi (val); 363 node->tcp_port = atoi (val);
364 else if (!strcmp (var, "dns-hostname"))
365 {
366#if ENABLE_DNS
367 free (node->dns_hostname), node->dns_hostname = strdup (val);
368#endif
369 }
356 else if (!strcmp (var, "dns-port")) 370 else if (!strcmp (var, "dns-port"))
357 { 371 {
358#if ENABLE_DNS 372#if ENABLE_DNS
359 node->dns_port = atoi (val); 373 node->dns_port = atoi (val);
360#endif 374#endif
… …
379 node->connectmode = conf_node::C_ALWAYS; 393 node->connectmode = conf_node::C_ALWAYS;
380 else if (!strcmp (val, "disabled")) 394 else if (!strcmp (val, "disabled"))
381 node->connectmode = conf_node::C_DISABLED; 395 node->connectmode = conf_node::C_DISABLED;
382 else 396 else
383 slog (L_WARN, 397 slog (L_WARN,
384 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 398 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
385 var, fname, lineno); 399 var, fname, lineno);
386 } 400 }
387 else if (!strcmp (var, "inherit-tos")) 401 else if (!strcmp (var, "inherit-tos"))
388 {
389 parse_bool (node->inherit_tos, "inherit-tos", true, false); 402 parse_bool (node->inherit_tos, "inherit-tos", true, false);
390 }
391 else if (!strcmp (var, "compress")) 403 else if (!strcmp (var, "compress"))
392 {
393 parse_bool (node->compress, "compress", true, false); 404 parse_bool (node->compress, "compress", true, false);
394 }
395 // all these bool options really really cost a lot of executable size! 405 // all these bool options really really cost a lot of executable size!
396 else if (!strcmp (var, "enable-tcp")) 406 else if (!strcmp (var, "enable-tcp"))
397 { 407 {
398#if ENABLE_TCP 408#if ENABLE_TCP
399 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 409 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
421 } 431 }
422 432
423 // unknown or misplaced 433 // unknown or misplaced
424 else 434 else
425 slog (L_WARN, 435 slog (L_WARN,
426 _("unknown or misplaced variable `%s', at '%s' line %d"), 436 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
427 var, fname, lineno); 437 var, fname, lineno);
428 } 438 }
429 439
430 fclose (f); 440 fclose (f);
431 } 441 }

Diff Legend

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