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.26 by pcg, Wed May 12 13:32:13 2004 UTC vs.
Revision 1.36 by pcg, Sun Mar 20 02:34:16 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
99 free (domain);
100 free (dns_hostname);
101#endif
98} 102}
99 103
100void configuration::init () 104void configuration::init ()
101{ 105{
102 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
112 116
113 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 120 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY;
118 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
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid"); 130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
120} 131}
121 132
122void configuration::cleanup() 133void configuration::cleanup()
123{ 134{
124 if (rsa_key) 135 if (rsa_key)
125 RSA_free (rsa_key); 136 RSA_free (rsa_key);
126 137
127 rsa_key = 0; 138 rsa_key = 0;
128 139
129 free (pidfilename); pidfilename = 0; 140 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0; 144 free (proxy_auth); proxy_auth = 0;
145#endif
146#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0;
134#endif 148#endif
135} 149}
136 150
137void 151void
138configuration::clear_config () 152configuration::clear_config ()
… …
163 char *fname; 177 char *fname;
164 FILE *f; 178 FILE *f;
165 179
166 clear_config (); 180 clear_config ();
167 181
168 asprintf (&fname, "%s/vped.conf", confbase); 182 asprintf (&fname, "%s/gvpe.conf", confbase);
169 f = fopen (fname, "r"); 183 f = fopen (fname, "r");
170 184
171 if (f) 185 if (f)
172 { 186 {
173 char line[16384]; 187 char line[16384];
… …
203 val = strtok (NULL, "\t\n\r ="); 217 val = strtok (NULL, "\t\n\r =");
204 218
205 if (!val || val[0] == '#') 219 if (!val || val[0] == '#')
206 { 220 {
207 slog (L_WARN, 221 slog (L_WARN,
208 _("no value for variable `%s', at '%s' line %d"), 222 _("no value for variable `%s', at '%s' line %d, skipping."),
209 var, fname, lineno); 223 var, fname, lineno);
210 break; 224 continue;
211 } 225 }
212 226
213 if (!strcmp (var, "on")) 227 if (!strcmp (var, "on"))
214 { 228 {
215 if (!::thisnode 229 if (!::thisnode
… …
287 thisnode = node; 301 thisnode = node;
288 } 302 }
289 else if (!strcmp (var, "private-key")) 303 else if (!strcmp (var, "private-key"))
290 free (prikeyfile), prikeyfile = strdup (val); 304 free (prikeyfile), prikeyfile = strdup (val);
291 else if (!strcmp (var, "ifpersist")) 305 else if (!strcmp (var, "ifpersist"))
292 {
293 parse_bool (ifpersist, "ifpersist", true, false); 306 parse_bool (ifpersist, "ifpersist", true, false);
294 }
295 else if (!strcmp (var, "ifname")) 307 else if (!strcmp (var, "ifname"))
296 free (ifname), ifname = strdup (val); 308 free (ifname), ifname = strdup (val);
297 else if (!strcmp (var, "rekey")) 309 else if (!strcmp (var, "rekey"))
298 rekey = atoi (val); 310 rekey = atoi (val);
299 else if (!strcmp (var, "keepalive")) 311 else if (!strcmp (var, "keepalive"))
… …
306 free (script_node_up), script_node_up = strdup (val); 318 free (script_node_up), script_node_up = strdup (val);
307 else if (!strcmp (var, "node-down")) 319 else if (!strcmp (var, "node-down"))
308 free (script_node_down), script_node_down = strdup (val); 320 free (script_node_down), script_node_down = strdup (val);
309 else if (!strcmp (var, "pid-file")) 321 else if (!strcmp (var, "pid-file"))
310 free (pidfilename), pidfilename = strdup (val); 322 free (pidfilename), pidfilename = strdup (val);
323 else if (!strcmp (var, "dns-forw-host"))
324 {
325#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-forw-port"))
330 {
331#if ENABLE_DNS
332 dns_forw_port = atoi (val);
333#endif
334 }
311 else if (!strcmp (var, "http-proxy-host")) 335 else if (!strcmp (var, "http-proxy-host"))
312 { 336 {
313#if ENABLE_HTTP_PROXY 337#if ENABLE_HTTP_PROXY
314 free (proxy_host), proxy_host = strdup (val); 338 free (proxy_host), proxy_host = strdup (val);
315#endif 339#endif
… …
334 /* node-specific, defaultable */ 358 /* node-specific, defaultable */
335 else if (!strcmp (var, "udp-port")) 359 else if (!strcmp (var, "udp-port"))
336 node->udp_port = atoi (val); 360 node->udp_port = atoi (val);
337 else if (!strcmp (var, "tcp-port")) 361 else if (!strcmp (var, "tcp-port"))
338 node->tcp_port = atoi (val); 362 node->tcp_port = atoi (val);
363 else if (!strcmp (var, "dns-hostname"))
364 {
365#if ENABLE_DNS
366 free (node->dns_hostname), node->dns_hostname = strdup (val);
367#endif
368 }
339 else if (!strcmp (var, "dns-port")) 369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
340 node->dns_port = atoi (val); 372 node->dns_port = atoi (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-domain"))
376 {
377#if ENABLE_DNS
378 free (node->domain), node->domain = strdup (val);
379#endif
380 }
341 else if (!strcmp (var, "router-priority")) 381 else if (!strcmp (var, "router-priority"))
342 node->routerprio = atoi (val); 382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
343 else if (!strcmp (var, "connect")) 385 else if (!strcmp (var, "connect"))
344 { 386 {
345 if (!strcmp (val, "ondemand")) 387 if (!strcmp (val, "ondemand"))
346 node->connectmode = conf_node::C_ONDEMAND; 388 node->connectmode = conf_node::C_ONDEMAND;
347 else if (!strcmp (val, "never")) 389 else if (!strcmp (val, "never"))
… …
350 node->connectmode = conf_node::C_ALWAYS; 392 node->connectmode = conf_node::C_ALWAYS;
351 else if (!strcmp (val, "disabled")) 393 else if (!strcmp (val, "disabled"))
352 node->connectmode = conf_node::C_DISABLED; 394 node->connectmode = conf_node::C_DISABLED;
353 else 395 else
354 slog (L_WARN, 396 slog (L_WARN,
355 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 397 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
356 var, fname, lineno); 398 var, fname, lineno);
357 } 399 }
358 else if (!strcmp (var, "inherit-tos")) 400 else if (!strcmp (var, "inherit-tos"))
359 {
360 parse_bool (node->inherit_tos, "inherit-tos", true, false); 401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
361 }
362 else if (!strcmp (var, "compress")) 402 else if (!strcmp (var, "compress"))
363 {
364 parse_bool (node->compress, "compress", true, false); 403 parse_bool (node->compress, "compress", true, false);
365 }
366 // all these bool options really really cost a lot of executable size! 404 // all these bool options really really cost a lot of executable size!
367 else if (!strcmp (var, "enable-tcp")) 405 else if (!strcmp (var, "enable-tcp"))
368 { 406 {
369#if ENABLE_TCP 407#if ENABLE_TCP
370 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 408 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
385 else if (!strcmp (var, "enable-udp")) 423 else if (!strcmp (var, "enable-udp"))
386 { 424 {
387 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 425 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
388 } 426 }
389 else if (!strcmp (var, "enable-rawip")) 427 else if (!strcmp (var, "enable-rawip"))
390 {; 428 {
391 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 429 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
392 } 430 }
393 431
394 // unknown or misplaced 432 // unknown or misplaced
395 else 433 else
396 slog (L_WARN, 434 slog (L_WARN,
397 _("unknown or misplaced variable `%s', at '%s' line %d"), 435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
398 var, fname, lineno); 436 var, fname, lineno);
399 } 437 }
400 438
401 fclose (f); 439 fclose (f);
402 } 440 }
… …
485 printf ("\n"); 523 printf ("\n");
486} 524}
487 525
488configuration::configuration () 526configuration::configuration ()
489{ 527{
490 asprintf (&confbase, "%s/vpe", CONFDIR); 528 asprintf (&confbase, "%s/gvpe", CONFDIR);
491 529
492 init (); 530 init ();
493} 531}
494 532
495configuration::~configuration () 533configuration::~configuration ()

Diff Legend

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