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.21 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.31 by pcg, Thu Mar 3 16:54:34 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
… …
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 = 53;
128 dns_forw_port = 53;
129#endif
130
131 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
116} 132}
117 133
118void configuration::cleanup() 134void configuration::cleanup()
119{ 135{
120 if (rsa_key) 136 if (rsa_key)
121 RSA_free (rsa_key); 137 RSA_free (rsa_key);
122 138
123 rsa_key = 0; 139 rsa_key = 0;
124 140
141 free (pidfilename); pidfilename = 0;
125 free (ifname); ifname = 0; 142 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 143#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 144 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 145 free (proxy_auth); proxy_auth = 0;
146#endif
147#if ENABLE_DNS
148 free (dns_forw_host); dns_forw_host = 0;
129#endif 149#endif
130} 150}
131 151
132void 152void
133configuration::clear_config () 153configuration::clear_config ()
… …
158 char *fname; 178 char *fname;
159 FILE *f; 179 FILE *f;
160 180
161 clear_config (); 181 clear_config ();
162 182
163 asprintf (&fname, "%s/vped.conf", confbase); 183 asprintf (&fname, "%s/gvpe.conf", confbase);
164 f = fopen (fname, "r"); 184 f = fopen (fname, "r");
165 185
166 if (f) 186 if (f)
167 { 187 {
168 char line[16384]; 188 char line[16384];
… …
258 278
259 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 279 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
260 { 280 {
261 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 281 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)); 282 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
263 exit (1); 283 exit (EXIT_FAILURE);
264 } 284 }
265 285
266 RSA_blinding_on (node->rsa_key, 0); 286 require (RSA_blinding_on (node->rsa_key, 0));
267 287
268 fclose (f); 288 fclose (f);
269 } 289 }
270 else 290 else
271 { 291 {
272 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 292 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
273 293
274 if (need_keys) 294 if (need_keys)
275 exit (1); 295 exit (EXIT_FAILURE);
276 } 296 }
277 297
278 free (fname); 298 free (fname);
279 } 299 }
280 300
281 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 301 if (::thisnode && !strcmp (node->nodename, ::thisnode))
282 thisnode = node; 302 thisnode = node;
283 } 303 }
284 else if (!strcmp (var, "private-key")) 304 else if (!strcmp (var, "private-key"))
285 prikeyfile = strdup (val); 305 free (prikeyfile), prikeyfile = strdup (val);
286 else if (!strcmp (var, "ifpersist")) 306 else if (!strcmp (var, "ifpersist"))
287 { 307 {
288 parse_bool (ifpersist, "ifpersist", true, false); 308 parse_bool (ifpersist, "ifpersist", true, false);
289 } 309 }
290 else if (!strcmp (var, "ifname")) 310 else if (!strcmp (var, "ifname"))
291 ifname = strdup (val); 311 free (ifname), ifname = strdup (val);
292 else if (!strcmp (var, "rekey")) 312 else if (!strcmp (var, "rekey"))
293 rekey = atoi (val); 313 rekey = atoi (val);
294 else if (!strcmp (var, "keepalive")) 314 else if (!strcmp (var, "keepalive"))
295 keepalive = atoi (val); 315 keepalive = atoi (val);
296 else if (!strcmp (var, "mtu")) 316 else if (!strcmp (var, "mtu"))
297 mtu = atoi (val); 317 mtu = atoi (val);
298 else if (!strcmp (var, "if-up")) 318 else if (!strcmp (var, "if-up"))
299 script_if_up = strdup (val); 319 free (script_if_up), script_if_up = strdup (val);
300 else if (!strcmp (var, "node-up")) 320 else if (!strcmp (var, "node-up"))
301 script_node_up = strdup (val); 321 free (script_node_up), script_node_up = strdup (val);
302 else if (!strcmp (var, "node-down")) 322 else if (!strcmp (var, "node-down"))
303 script_node_down = strdup (val); 323 free (script_node_down), script_node_down = strdup (val);
324 else if (!strcmp (var, "pid-file"))
325 free (pidfilename), pidfilename = strdup (val);
326#if ENABLE_DNS
327 else if (!strcmp (var, "dns-forw-host"))
328 free (dns_forw_host), dns_forw_host = strdup (val);
329 else if (!strcmp (var, "dns-forw-port"))
330 dns_forw_port = atoi (val);
331#endif
304 else if (!strcmp (var, "http-proxy-host")) 332 else if (!strcmp (var, "http-proxy-host"))
305 { 333 {
306#if ENABLE_HTTP_PROXY 334#if ENABLE_HTTP_PROXY
307 proxy_host = strdup (val); 335 free (proxy_host), proxy_host = strdup (val);
308#endif 336#endif
309 } 337 }
310 else if (!strcmp (var, "http-proxy-port")) 338 else if (!strcmp (var, "http-proxy-port"))
311 { 339 {
312#if ENABLE_HTTP_PROXY 340#if ENABLE_HTTP_PROXY
… …
320#endif 348#endif
321 } 349 }
322 350
323 /* node-specific, non-defaultable */ 351 /* node-specific, non-defaultable */
324 else if (node != &default_node && !strcmp (var, "hostname")) 352 else if (node != &default_node && !strcmp (var, "hostname"))
325 {
326 free (node->hostname);
327 node->hostname = strdup (val); 353 free (node->hostname), node->hostname = strdup (val);
328 }
329 354
330 /* node-specific, defaultable */ 355 /* node-specific, defaultable */
331 else if (!strcmp (var, "udp-port")) 356 else if (!strcmp (var, "udp-port"))
332 node->udp_port = atoi (val); 357 node->udp_port = atoi (val);
333 else if (!strcmp (var, "tcp-port")) 358 else if (!strcmp (var, "tcp-port"))
334 node->tcp_port = atoi (val); 359 node->tcp_port = atoi (val);
360#if ENABLE_DNS
361 else if (!strcmp (var, "dns-hostname"))
362 free (node->dns_hostname), node->dns_hostname = strdup (val);
363 else if (!strcmp (var, "dns-port"))
364 node->dns_port = atoi (val);
365#endif
366 else if (!strcmp (var, "dns-domain"))
367 {
368#if ENABLE_DNS
369 free (node->domain), node->domain = strdup (val);
370#endif
371 }
335 else if (!strcmp (var, "router-priority")) 372 else if (!strcmp (var, "router-priority"))
336 node->routerprio = atoi (val); 373 node->routerprio = atoi (val);
374 else if (!strcmp (var, "max-retry"))
375 node->max_retry = atoi (val);
337 else if (!strcmp (var, "connect")) 376 else if (!strcmp (var, "connect"))
338 { 377 {
339 if (!strcmp (val, "ondemand")) 378 if (!strcmp (val, "ondemand"))
340 node->connectmode = conf_node::C_ONDEMAND; 379 node->connectmode = conf_node::C_ONDEMAND;
341 else if (!strcmp (val, "never")) 380 else if (!strcmp (val, "never"))
… …
344 node->connectmode = conf_node::C_ALWAYS; 383 node->connectmode = conf_node::C_ALWAYS;
345 else if (!strcmp (val, "disabled")) 384 else if (!strcmp (val, "disabled"))
346 node->connectmode = conf_node::C_DISABLED; 385 node->connectmode = conf_node::C_DISABLED;
347 else 386 else
348 slog (L_WARN, 387 slog (L_WARN,
349 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 388 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
350 var, fname, lineno); 389 var, fname, lineno);
351 } 390 }
352 else if (!strcmp (var, "inherit-tos")) 391 else if (!strcmp (var, "inherit-tos"))
353 { 392 {
354 parse_bool (node->inherit_tos, "inherit-tos", true, false); 393 parse_bool (node->inherit_tos, "inherit-tos", true, false);
355 } 394 }
… …
366 } 405 }
367 else if (!strcmp (var, "enable-icmp")) 406 else if (!strcmp (var, "enable-icmp"))
368 { 407 {
369#if ENABLE_ICMP 408#if ENABLE_ICMP
370 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 409 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
410#endif
411 }
412 else if (!strcmp (var, "enable-dns"))
413 {
414#if ENABLE_DNS
415 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
371#endif 416#endif
372 } 417 }
373 else if (!strcmp (var, "enable-udp")) 418 else if (!strcmp (var, "enable-udp"))
374 { 419 {
375 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 420 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
389 fclose (f); 434 fclose (f);
390 } 435 }
391 else 436 else
392 { 437 {
393 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 438 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
394 exit (1); 439 exit (EXIT_FAILURE);
395 } 440 }
396 441
397 free (fname); 442 free (fname);
398 443
399 fname = config_filename (prikeyfile, "hostkey"); 444 fname = config_filename (prikeyfile, "hostkey");
… …
405 450
406 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 451 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
407 { 452 {
408 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 453 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)); 454 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
410 exit (1); 455 exit (EXIT_FAILURE);
411 } 456 }
412 457
413 RSA_blinding_on (rsa_key, 0); 458 require (RSA_blinding_on (rsa_key, 0));
414 459
415 fclose (f); 460 fclose (f);
416 } 461 }
417 else 462 else
418 { 463 {
419 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 464 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
420 465
421 if (need_keys) 466 if (need_keys)
422 exit (1); 467 exit (EXIT_FAILURE);
423 } 468 }
469
470 if (need_keys && ::thisnode
471 && rsa_key && thisnode && thisnode->rsa_key)
472 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
473 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
474 {
475 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
476 exit (EXIT_FAILURE);
477 }
424 478
425 free (fname); 479 free (fname);
426} 480}
427 481
428char *configuration::config_filename (const char *name, const char *dflt) 482char *configuration::config_filename (const char *name, const char *dflt)
… …
464 printf ("\n"); 518 printf ("\n");
465} 519}
466 520
467configuration::configuration () 521configuration::configuration ()
468{ 522{
523 asprintf (&confbase, "%s/gvpe", CONFDIR);
524
469 init (); 525 init ();
470} 526}
471 527
472configuration::~configuration () 528configuration::~configuration ()
473{ 529{

Diff Legend

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