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

Diff Legend

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