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.30 by pcg, Thu Mar 3 07:24:57 2005 UTC vs.
Revision 1.39 by pcg, Sat Mar 26 03:16:24 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
… …
88 ); 88 );
89} 89}
90 90
91conf_node::~conf_node () 91conf_node::~conf_node ()
92{ 92{
93#if 0
94 // does not work, because string pointers etc. are shared
95 // is not called, however
93 if (rsa_key) 96 if (rsa_key)
94 RSA_free (rsa_key); 97 RSA_free (rsa_key);
95 98
96 free (nodename); 99 free (nodename);
97 free (hostname); 100 free (hostname);
101 free (if_up_data);
98#if ENABLE_DNS 102#if ENABLE_DNS
99 free (domain); 103 free (domain);
100 free (dns_hostname); 104 free (dns_hostname);
105#endif
101#endif 106#endif
102} 107}
103 108
104void configuration::init () 109void configuration::init ()
105{ 110{
… …
118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119 default_node.connectmode = conf_node::C_ALWAYS; 124 default_node.connectmode = conf_node::C_ALWAYS;
120 default_node.compress = true; 125 default_node.compress = true;
121 default_node.protocols = 0; 126 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY; 127 default_node.max_retry = DEFAULT_MAX_RETRY;
128 default_node.if_up_data = strdup ("");
123 129
124#if ENABLE_DNS 130#if ENABLE_DNS
125 default_node.dns_port = 53; 131 default_node.dns_port = 0; // default is 0 == client
132
133 dns_forw_host = strdup ("127.0.0.1");
126 dns_forw_port = 53; 134 dns_forw_port = 53;
135 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
127#endif 139#endif
128 140
129 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
130} 142}
131 143
… …
157 169
158 cleanup (); 170 cleanup ();
159 init (); 171 init ();
160} 172}
161 173
162#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
163 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
164 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
165 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
166 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
167 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
168 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
169 else \ 181 else \
170 slog (L_WARN, \ 182 slog (L_WARN, \
171 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
172 name, var, fname, lineno); 184 name, var, fname, lineno); \
185} while (0)
173 186
174void configuration::read_config (bool need_keys) 187void configuration::read_config (bool need_keys)
175{ 188{
176 char *fname; 189 char *fname;
177 FILE *f; 190 FILE *f;
… …
216 val = strtok (NULL, "\t\n\r ="); 229 val = strtok (NULL, "\t\n\r =");
217 230
218 if (!val || val[0] == '#') 231 if (!val || val[0] == '#')
219 { 232 {
220 slog (L_WARN, 233 slog (L_WARN,
221 _("no value for variable `%s', at '%s' line %d"), 234 _("no value for variable `%s', at '%s' line %d, skipping."),
222 var, fname, lineno); 235 var, fname, lineno);
223 break; 236 continue;
224 } 237 }
225 238
226 if (!strcmp (var, "on")) 239 if (!strcmp (var, "on"))
227 { 240 {
228 if (!::thisnode 241 if (!::thisnode
… …
300 thisnode = node; 313 thisnode = node;
301 } 314 }
302 else if (!strcmp (var, "private-key")) 315 else if (!strcmp (var, "private-key"))
303 free (prikeyfile), prikeyfile = strdup (val); 316 free (prikeyfile), prikeyfile = strdup (val);
304 else if (!strcmp (var, "ifpersist")) 317 else if (!strcmp (var, "ifpersist"))
305 {
306 parse_bool (ifpersist, "ifpersist", true, false); 318 parse_bool (ifpersist, "ifpersist", true, false);
307 }
308 else if (!strcmp (var, "ifname")) 319 else if (!strcmp (var, "ifname"))
309 free (ifname), ifname = strdup (val); 320 free (ifname), ifname = strdup (val);
310 else if (!strcmp (var, "rekey")) 321 else if (!strcmp (var, "rekey"))
311 rekey = atoi (val); 322 rekey = atoi (val);
312 else if (!strcmp (var, "keepalive")) 323 else if (!strcmp (var, "keepalive"))
… …
319 free (script_node_up), script_node_up = strdup (val); 330 free (script_node_up), script_node_up = strdup (val);
320 else if (!strcmp (var, "node-down")) 331 else if (!strcmp (var, "node-down"))
321 free (script_node_down), script_node_down = strdup (val); 332 free (script_node_down), script_node_down = strdup (val);
322 else if (!strcmp (var, "pid-file")) 333 else if (!strcmp (var, "pid-file"))
323 free (pidfilename), pidfilename = strdup (val); 334 free (pidfilename), pidfilename = strdup (val);
324#if ENABLE_DNS
325 else if (!strcmp (var, "dns-forw-host")) 335 else if (!strcmp (var, "dns-forw-host"))
336 {
337#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val); 338 free (dns_forw_host), dns_forw_host = strdup (val);
339#endif
340 }
327 else if (!strcmp (var, "dns-forw-port")) 341 else if (!strcmp (var, "dns-forw-port"))
342 {
343#if ENABLE_DNS
328 dns_forw_port = atoi (val); 344 dns_forw_port = atoi (val);
329#endif 345#endif
346 }
347 else if (!strcmp (var, "dns-timeout-factor"))
348 {
349#if ENABLE_DNS
350 dns_timeout_factor = atof (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-send-interval"))
354 {
355#if ENABLE_DNS
356 dns_send_interval = atoi (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-overlap-factor"))
360 {
361#if ENABLE_DNS
362 dns_overlap_factor = atof (val);
363#endif
364 }
365 else if (!strcmp (var, "dns-max-outstanding"))
366 {
367#if ENABLE_DNS
368 dns_max_outstanding = atoi (val);
369#endif
370 }
330 else if (!strcmp (var, "http-proxy-host")) 371 else if (!strcmp (var, "http-proxy-host"))
331 { 372 {
332#if ENABLE_HTTP_PROXY 373#if ENABLE_HTTP_PROXY
333 free (proxy_host), proxy_host = strdup (val); 374 free (proxy_host), proxy_host = strdup (val);
334#endif 375#endif
… …
353 /* node-specific, defaultable */ 394 /* node-specific, defaultable */
354 else if (!strcmp (var, "udp-port")) 395 else if (!strcmp (var, "udp-port"))
355 node->udp_port = atoi (val); 396 node->udp_port = atoi (val);
356 else if (!strcmp (var, "tcp-port")) 397 else if (!strcmp (var, "tcp-port"))
357 node->tcp_port = atoi (val); 398 node->tcp_port = atoi (val);
358#if ENABLE_DNS
359 else if (!strcmp (var, "dns-hostname")) 399 else if (!strcmp (var, "dns-hostname"))
400 {
401#if ENABLE_DNS
360 free (node->dns_hostname), node->dns_hostname = strdup (val); 402 free (node->dns_hostname), node->dns_hostname = strdup (val);
403#endif
404 }
361 else if (!strcmp (var, "dns-port")) 405 else if (!strcmp (var, "dns-port"))
406 {
407#if ENABLE_DNS
362 node->dns_port = atoi (val); 408 node->dns_port = atoi (val);
363#endif 409#endif
410 }
364 else if (!strcmp (var, "dns-domain")) 411 else if (!strcmp (var, "dns-domain"))
365 { 412 {
366#if ENABLE_DNS 413#if ENABLE_DNS
367 free (node->domain), node->domain = strdup (val); 414 free (node->domain), node->domain = strdup (val);
368#endif 415#endif
369 } 416 }
417 else if (!strcmp (var, "if-up-data"))
418 free (node->if_up_data), node->if_up_data = strdup (val);
370 else if (!strcmp (var, "router-priority")) 419 else if (!strcmp (var, "router-priority"))
371 node->routerprio = atoi (val); 420 node->routerprio = atoi (val);
372 else if (!strcmp (var, "max-retry")) 421 else if (!strcmp (var, "max-retry"))
373 node->max_retry = atoi (val); 422 node->max_retry = atoi (val);
374 else if (!strcmp (var, "connect")) 423 else if (!strcmp (var, "connect"))
… …
381 node->connectmode = conf_node::C_ALWAYS; 430 node->connectmode = conf_node::C_ALWAYS;
382 else if (!strcmp (val, "disabled")) 431 else if (!strcmp (val, "disabled"))
383 node->connectmode = conf_node::C_DISABLED; 432 node->connectmode = conf_node::C_DISABLED;
384 else 433 else
385 slog (L_WARN, 434 slog (L_WARN,
386 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 435 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
387 var, fname, lineno); 436 var, fname, lineno);
388 } 437 }
389 else if (!strcmp (var, "inherit-tos")) 438 else if (!strcmp (var, "inherit-tos"))
390 {
391 parse_bool (node->inherit_tos, "inherit-tos", true, false); 439 parse_bool (node->inherit_tos, "inherit-tos", true, false);
392 }
393 else if (!strcmp (var, "compress")) 440 else if (!strcmp (var, "compress"))
394 {
395 parse_bool (node->compress, "compress", true, false); 441 parse_bool (node->compress, "compress", true, false);
396 }
397 // all these bool options really really cost a lot of executable size! 442 // all these bool options really really cost a lot of executable size!
398 else if (!strcmp (var, "enable-tcp")) 443 else if (!strcmp (var, "enable-tcp"))
399 { 444 {
400#if ENABLE_TCP 445#if ENABLE_TCP
401 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 446 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
423 } 468 }
424 469
425 // unknown or misplaced 470 // unknown or misplaced
426 else 471 else
427 slog (L_WARN, 472 slog (L_WARN,
428 _("unknown or misplaced variable `%s', at '%s' line %d"), 473 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
429 var, fname, lineno); 474 var, fname, lineno);
430 } 475 }
431 476
432 fclose (f); 477 fclose (f);
433 } 478 }

Diff Legend

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