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.20 by pcg, Thu Oct 16 21:57:54 2003 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 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
… …
33 35
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 40#include <openssl/bn.h>
39#include "gettext.h"
40 41
41#include "conf.h" 42#include "conf.h"
42#include "slog.h" 43#include "slog.h"
43#include "util.h" 44#include "util.h"
44 45
45char *confbase; 46char *confbase;
46char *thisnode; 47char *thisnode;
47char *identname; 48char *identname;
48char *pidfilename;
49 49
50struct configuration conf; 50struct configuration conf;
51 51
52u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
53{ 53{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 59
59 return 0; 60 return 0;
60} 61}
61 62
62const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
63{ 64{
64 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
66 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
67 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
68 70
69 return "<unknown>"; 71 return "<unknown>";
70} 72}
71 73
72void 74void
… …
91 if (rsa_key) 93 if (rsa_key)
92 RSA_free (rsa_key); 94 RSA_free (rsa_key);
93 95
94 free (nodename); 96 free (nodename);
95 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
96} 102}
97 103
98void configuration::init () 104void configuration::init ()
99{ 105{
100 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
107#if ENABLE_ICMP 113#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 114 icmp_type = ICMP_ECHOREPLY;
109#endif 115#endif
110 116
111 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 120 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY;
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
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
116} 131}
117 132
118void configuration::cleanup() 133void configuration::cleanup()
119{ 134{
120 if (rsa_key) 135 if (rsa_key)
121 RSA_free (rsa_key); 136 RSA_free (rsa_key);
122 137
123 rsa_key = 0; 138 rsa_key = 0;
124 139
140 free (pidfilename); pidfilename = 0;
125 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
128 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;
129#endif 148#endif
130} 149}
131 150
132void 151void
133configuration::clear_config () 152configuration::clear_config ()
… …
158 char *fname; 177 char *fname;
159 FILE *f; 178 FILE *f;
160 179
161 clear_config (); 180 clear_config ();
162 181
163 asprintf (&fname, "%s/vped.conf", confbase); 182 asprintf (&fname, "%s/gvpe.conf", confbase);
164 f = fopen (fname, "r"); 183 f = fopen (fname, "r");
165 184
166 if (f) 185 if (f)
167 { 186 {
168 char line[16384]; 187 char line[16384];
… …
198 val = strtok (NULL, "\t\n\r ="); 217 val = strtok (NULL, "\t\n\r =");
199 218
200 if (!val || val[0] == '#') 219 if (!val || val[0] == '#')
201 { 220 {
202 slog (L_WARN, 221 slog (L_WARN,
203 _("no value for variable `%s', at '%s' line %d"), 222 _("no value for variable `%s', at '%s' line %d, skipping."),
204 var, fname, lineno); 223 var, fname, lineno);
205 break; 224 continue;
206 } 225 }
207 226
208 if (!strcmp (var, "on")) 227 if (!strcmp (var, "on"))
209 { 228 {
210 if (!::thisnode 229 if (!::thisnode
… …
258 277
259 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 278 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
260 { 279 {
261 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 280 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
262 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 281 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
263 exit (1); 282 exit (EXIT_FAILURE);
264 } 283 }
265 284
266 RSA_blinding_on (node->rsa_key, 0); 285 require (RSA_blinding_on (node->rsa_key, 0));
267 286
268 fclose (f); 287 fclose (f);
269 } 288 }
270 else 289 else
271 { 290 {
272 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 291 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
273 292
274 if (need_keys) 293 if (need_keys)
275 exit (1); 294 exit (EXIT_FAILURE);
276 } 295 }
277 296
278 free (fname); 297 free (fname);
279 } 298 }
280 299
281 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
282 thisnode = node; 301 thisnode = node;
283 } 302 }
284 else if (!strcmp (var, "private-key")) 303 else if (!strcmp (var, "private-key"))
285 prikeyfile = strdup (val); 304 free (prikeyfile), prikeyfile = strdup (val);
286 else if (!strcmp (var, "ifpersist")) 305 else if (!strcmp (var, "ifpersist"))
287 {
288 parse_bool (ifpersist, "ifpersist", true, false); 306 parse_bool (ifpersist, "ifpersist", true, false);
289 }
290 else if (!strcmp (var, "ifname")) 307 else if (!strcmp (var, "ifname"))
291 ifname = strdup (val); 308 free (ifname), ifname = strdup (val);
292 else if (!strcmp (var, "rekey")) 309 else if (!strcmp (var, "rekey"))
293 rekey = atoi (val); 310 rekey = atoi (val);
294 else if (!strcmp (var, "keepalive")) 311 else if (!strcmp (var, "keepalive"))
295 keepalive = atoi (val); 312 keepalive = atoi (val);
296 else if (!strcmp (var, "mtu")) 313 else if (!strcmp (var, "mtu"))
297 mtu = atoi (val); 314 mtu = atoi (val);
298 else if (!strcmp (var, "if-up")) 315 else if (!strcmp (var, "if-up"))
299 script_if_up = strdup (val); 316 free (script_if_up), script_if_up = strdup (val);
300 else if (!strcmp (var, "node-up")) 317 else if (!strcmp (var, "node-up"))
301 script_node_up = strdup (val); 318 free (script_node_up), script_node_up = strdup (val);
302 else if (!strcmp (var, "node-down")) 319 else if (!strcmp (var, "node-down"))
303 script_node_down = strdup (val); 320 free (script_node_down), script_node_down = strdup (val);
321 else if (!strcmp (var, "pid-file"))
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 }
304 else if (!strcmp (var, "http-proxy-host")) 335 else if (!strcmp (var, "http-proxy-host"))
305 { 336 {
306#if ENABLE_HTTP_PROXY 337#if ENABLE_HTTP_PROXY
307 proxy_host = strdup (val); 338 free (proxy_host), proxy_host = strdup (val);
308#endif 339#endif
309 } 340 }
310 else if (!strcmp (var, "http-proxy-port")) 341 else if (!strcmp (var, "http-proxy-port"))
311 { 342 {
312#if ENABLE_HTTP_PROXY 343#if ENABLE_HTTP_PROXY
… …
320#endif 351#endif
321 } 352 }
322 353
323 /* node-specific, non-defaultable */ 354 /* node-specific, non-defaultable */
324 else if (node != &default_node && !strcmp (var, "hostname")) 355 else if (node != &default_node && !strcmp (var, "hostname"))
325 {
326 free (node->hostname);
327 node->hostname = strdup (val); 356 free (node->hostname), node->hostname = strdup (val);
328 }
329 357
330 /* node-specific, defaultable */ 358 /* node-specific, defaultable */
331 else if (!strcmp (var, "udp-port")) 359 else if (!strcmp (var, "udp-port"))
332 node->udp_port = atoi (val); 360 node->udp_port = atoi (val);
333 else if (!strcmp (var, "tcp-port")) 361 else if (!strcmp (var, "tcp-port"))
334 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 }
369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
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 }
335 else if (!strcmp (var, "router-priority")) 381 else if (!strcmp (var, "router-priority"))
336 node->routerprio = atoi (val); 382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
337 else if (!strcmp (var, "connect")) 385 else if (!strcmp (var, "connect"))
338 { 386 {
339 if (!strcmp (val, "ondemand")) 387 if (!strcmp (val, "ondemand"))
340 node->connectmode = conf_node::C_ONDEMAND; 388 node->connectmode = conf_node::C_ONDEMAND;
341 else if (!strcmp (val, "never")) 389 else if (!strcmp (val, "never"))
… …
344 node->connectmode = conf_node::C_ALWAYS; 392 node->connectmode = conf_node::C_ALWAYS;
345 else if (!strcmp (val, "disabled")) 393 else if (!strcmp (val, "disabled"))
346 node->connectmode = conf_node::C_DISABLED; 394 node->connectmode = conf_node::C_DISABLED;
347 else 395 else
348 slog (L_WARN, 396 slog (L_WARN,
349 _("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."),
350 var, fname, lineno); 398 var, fname, lineno);
351 } 399 }
352 else if (!strcmp (var, "inherit-tos")) 400 else if (!strcmp (var, "inherit-tos"))
353 {
354 parse_bool (node->inherit_tos, "inherit-tos", true, false); 401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
355 }
356 else if (!strcmp (var, "compress")) 402 else if (!strcmp (var, "compress"))
357 {
358 parse_bool (node->compress, "compress", true, false); 403 parse_bool (node->compress, "compress", true, false);
359 }
360 // 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!
361 else if (!strcmp (var, "enable-tcp")) 405 else if (!strcmp (var, "enable-tcp"))
362 { 406 {
363#if ENABLE_TCP 407#if ENABLE_TCP
364 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;
… …
366 } 410 }
367 else if (!strcmp (var, "enable-icmp")) 411 else if (!strcmp (var, "enable-icmp"))
368 { 412 {
369#if ENABLE_ICMP 413#if ENABLE_ICMP
370 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 414 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-dns"))
418 {
419#if ENABLE_DNS
420 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
371#endif 421#endif
372 } 422 }
373 else if (!strcmp (var, "enable-udp")) 423 else if (!strcmp (var, "enable-udp"))
374 { 424 {
375 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;
… …
380 } 430 }
381 431
382 // unknown or misplaced 432 // unknown or misplaced
383 else 433 else
384 slog (L_WARN, 434 slog (L_WARN,
385 _("unknown or misplaced variable `%s', at '%s' line %d"), 435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
386 var, fname, lineno); 436 var, fname, lineno);
387 } 437 }
388 438
389 fclose (f); 439 fclose (f);
390 } 440 }
391 else 441 else
392 { 442 {
393 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 443 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
394 exit (1); 444 exit (EXIT_FAILURE);
395 } 445 }
396 446
397 free (fname); 447 free (fname);
398 448
399 fname = config_filename (prikeyfile, "hostkey"); 449 fname = config_filename (prikeyfile, "hostkey");
… …
405 455
406 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 456 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
407 { 457 {
408 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 458 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
409 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 459 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
410 exit (1); 460 exit (EXIT_FAILURE);
411 } 461 }
412 462
413 RSA_blinding_on (rsa_key, 0); 463 require (RSA_blinding_on (rsa_key, 0));
414 464
415 fclose (f); 465 fclose (f);
416 } 466 }
417 else 467 else
418 { 468 {
419 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 469 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
420 470
421 if (need_keys) 471 if (need_keys)
422 exit (1); 472 exit (EXIT_FAILURE);
423 } 473 }
474
475 if (need_keys && ::thisnode
476 && rsa_key && thisnode && thisnode->rsa_key)
477 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
478 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
479 {
480 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
481 exit (EXIT_FAILURE);
482 }
424 483
425 free (fname); 484 free (fname);
426} 485}
427 486
428char *configuration::config_filename (const char *name, const char *dflt) 487char *configuration::config_filename (const char *name, const char *dflt)
… …
464 printf ("\n"); 523 printf ("\n");
465} 524}
466 525
467configuration::configuration () 526configuration::configuration ()
468{ 527{
528 asprintf (&confbase, "%s/gvpe", CONFDIR);
529
469 init (); 530 init ();
470} 531}
471 532
472configuration::~configuration () 533configuration::~configuration ()
473{ 534{

Diff Legend

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