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.28 by pcg, Tue Mar 1 04:38:21 2005 UTC vs.
Revision 1.38 by pcg, Wed Mar 23 17:03:58 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));
… …
113 116
114 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
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 = PROT_UDPv4; 121 default_node.protocols = 0;
119 default_node.max_retry = DEFAULT_MAX_RETRY; 122 default_node.max_retry = DEFAULT_MAX_RETRY;
123
124#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client
126
127 dns_forw_host = strdup ("127.0.0.1");
128 dns_forw_port = 53;
129 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
130 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
131 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
132 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
133#endif
120 134
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 135 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
122} 136}
123 137
124void configuration::cleanup() 138void configuration::cleanup()
… …
149 163
150 cleanup (); 164 cleanup ();
151 init (); 165 init ();
152} 166}
153 167
154#define parse_bool(target,name,trueval,falseval) \ 168#define parse_bool(target,name,trueval,falseval) do { \
155 if (!strcmp (val, "yes")) target = trueval; \ 169 if (!strcmp (val, "yes")) target = trueval; \
156 else if (!strcmp (val, "no")) target = falseval; \ 170 else if (!strcmp (val, "no")) target = falseval; \
157 else if (!strcmp (val, "true")) target = trueval; \ 171 else if (!strcmp (val, "true")) target = trueval; \
158 else if (!strcmp (val, "false")) target = falseval; \ 172 else if (!strcmp (val, "false")) target = falseval; \
159 else if (!strcmp (val, "on")) target = trueval; \ 173 else if (!strcmp (val, "on")) target = trueval; \
160 else if (!strcmp (val, "off")) target = falseval; \ 174 else if (!strcmp (val, "off")) target = falseval; \
161 else \ 175 else \
162 slog (L_WARN, \ 176 slog (L_WARN, \
163 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 177 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
164 name, var, fname, lineno); 178 name, var, fname, lineno); \
179} while (0)
165 180
166void configuration::read_config (bool need_keys) 181void configuration::read_config (bool need_keys)
167{ 182{
168 char *fname; 183 char *fname;
169 FILE *f; 184 FILE *f;
… …
208 val = strtok (NULL, "\t\n\r ="); 223 val = strtok (NULL, "\t\n\r =");
209 224
210 if (!val || val[0] == '#') 225 if (!val || val[0] == '#')
211 { 226 {
212 slog (L_WARN, 227 slog (L_WARN,
213 _("no value for variable `%s', at '%s' line %d"), 228 _("no value for variable `%s', at '%s' line %d, skipping."),
214 var, fname, lineno); 229 var, fname, lineno);
215 break; 230 continue;
216 } 231 }
217 232
218 if (!strcmp (var, "on")) 233 if (!strcmp (var, "on"))
219 { 234 {
220 if (!::thisnode 235 if (!::thisnode
… …
292 thisnode = node; 307 thisnode = node;
293 } 308 }
294 else if (!strcmp (var, "private-key")) 309 else if (!strcmp (var, "private-key"))
295 free (prikeyfile), prikeyfile = strdup (val); 310 free (prikeyfile), prikeyfile = strdup (val);
296 else if (!strcmp (var, "ifpersist")) 311 else if (!strcmp (var, "ifpersist"))
297 {
298 parse_bool (ifpersist, "ifpersist", true, false); 312 parse_bool (ifpersist, "ifpersist", true, false);
299 }
300 else if (!strcmp (var, "ifname")) 313 else if (!strcmp (var, "ifname"))
301 free (ifname), ifname = strdup (val); 314 free (ifname), ifname = strdup (val);
302 else if (!strcmp (var, "rekey")) 315 else if (!strcmp (var, "rekey"))
303 rekey = atoi (val); 316 rekey = atoi (val);
304 else if (!strcmp (var, "keepalive")) 317 else if (!strcmp (var, "keepalive"))
… …
311 free (script_node_up), script_node_up = strdup (val); 324 free (script_node_up), script_node_up = strdup (val);
312 else if (!strcmp (var, "node-down")) 325 else if (!strcmp (var, "node-down"))
313 free (script_node_down), script_node_down = strdup (val); 326 free (script_node_down), script_node_down = strdup (val);
314 else if (!strcmp (var, "pid-file")) 327 else if (!strcmp (var, "pid-file"))
315 free (pidfilename), pidfilename = strdup (val); 328 free (pidfilename), pidfilename = strdup (val);
316 else if (!strcmp (var, "dns-forwarder-host")) 329 else if (!strcmp (var, "dns-forw-host"))
317 { 330 {
318#if ENABLE_DNS 331#if ENABLE_DNS
319 free (dns_forw_host), dns_forw_host = strdup (val); 332 free (dns_forw_host), dns_forw_host = strdup (val);
320#endif 333#endif
321 } 334 }
322 else if (!strcmp (var, "dns-forwarder-port")) 335 else if (!strcmp (var, "dns-forw-port"))
323 { 336 {
324#if ENABLE_DNS 337#if ENABLE_DNS
325 dns_forw_port = atoi (val); 338 dns_forw_port = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-timeout-factor"))
342 {
343#if ENABLE_DNS
344 dns_timeout_factor = atof (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-send-interval"))
348 {
349#if ENABLE_DNS
350 dns_send_interval = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-overlap-factor"))
354 {
355#if ENABLE_DNS
356 dns_overlap_factor = atof (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-max-outstanding"))
360 {
361#if ENABLE_DNS
362 dns_max_outstanding = atoi (val);
326#endif 363#endif
327 } 364 }
328 else if (!strcmp (var, "http-proxy-host")) 365 else if (!strcmp (var, "http-proxy-host"))
329 { 366 {
330#if ENABLE_HTTP_PROXY 367#if ENABLE_HTTP_PROXY
… …
351 /* node-specific, defaultable */ 388 /* node-specific, defaultable */
352 else if (!strcmp (var, "udp-port")) 389 else if (!strcmp (var, "udp-port"))
353 node->udp_port = atoi (val); 390 node->udp_port = atoi (val);
354 else if (!strcmp (var, "tcp-port")) 391 else if (!strcmp (var, "tcp-port"))
355 node->tcp_port = atoi (val); 392 node->tcp_port = atoi (val);
393 else if (!strcmp (var, "dns-hostname"))
394 {
395#if ENABLE_DNS
396 free (node->dns_hostname), node->dns_hostname = strdup (val);
397#endif
398 }
356 else if (!strcmp (var, "dns-port")) 399 else if (!strcmp (var, "dns-port"))
357 { 400 {
358#if ENABLE_DNS 401#if ENABLE_DNS
359 node->dns_port = atoi (val); 402 node->dns_port = atoi (val);
360#endif 403#endif
… …
379 node->connectmode = conf_node::C_ALWAYS; 422 node->connectmode = conf_node::C_ALWAYS;
380 else if (!strcmp (val, "disabled")) 423 else if (!strcmp (val, "disabled"))
381 node->connectmode = conf_node::C_DISABLED; 424 node->connectmode = conf_node::C_DISABLED;
382 else 425 else
383 slog (L_WARN, 426 slog (L_WARN,
384 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 427 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
385 var, fname, lineno); 428 var, fname, lineno);
386 } 429 }
387 else if (!strcmp (var, "inherit-tos")) 430 else if (!strcmp (var, "inherit-tos"))
388 {
389 parse_bool (node->inherit_tos, "inherit-tos", true, false); 431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
390 }
391 else if (!strcmp (var, "compress")) 432 else if (!strcmp (var, "compress"))
392 {
393 parse_bool (node->compress, "compress", true, false); 433 parse_bool (node->compress, "compress", true, false);
394 }
395 // all these bool options really really cost a lot of executable size! 434 // all these bool options really really cost a lot of executable size!
396 else if (!strcmp (var, "enable-tcp")) 435 else if (!strcmp (var, "enable-tcp"))
397 { 436 {
398#if ENABLE_TCP 437#if ENABLE_TCP
399 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 438 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
421 } 460 }
422 461
423 // unknown or misplaced 462 // unknown or misplaced
424 else 463 else
425 slog (L_WARN, 464 slog (L_WARN,
426 _("unknown or misplaced variable `%s', at '%s' line %d"), 465 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
427 var, fname, lineno); 466 var, fname, lineno);
428 } 467 }
429 468
430 fclose (f); 469 fclose (f);
431 } 470 }

Diff Legend

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