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.29 by pcg, Tue Mar 1 06:27:20 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-2004 Marc Lehmann <pcg@goof.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
33 33
34#include <openssl/err.h> 34#include <openssl/err.h>
35#include <openssl/pem.h> 35#include <openssl/pem.h>
36#include <openssl/rsa.h> 36#include <openssl/rsa.h>
37#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
38 39
39#include "gettext.h" 40#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 free (domain);
96} 99}
97 100
98void configuration::init () 101void configuration::init ()
99{ 102{
100 memset (this, 0, sizeof (*this)); 103 memset (this, 0, sizeof (*this));
… …
107#if ENABLE_ICMP 110#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 111 icmp_type = ICMP_ECHOREPLY;
109#endif 112#endif
110 113
111 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 117 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 118 default_node.protocols = 0;
119 default_node.max_retry = DEFAULT_MAX_RETRY;
120
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
116} 122}
117 123
118void configuration::cleanup() 124void configuration::cleanup()
119{ 125{
120 if (rsa_key) 126 if (rsa_key)
121 RSA_free (rsa_key); 127 RSA_free (rsa_key);
122 128
123 rsa_key = 0; 129 rsa_key = 0;
124 130
131 free (pidfilename); pidfilename = 0;
125 free (ifname); ifname = 0; 132 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 133#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 134 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 135 free (proxy_auth); proxy_auth = 0;
136#endif
137#if ENABLE_DNS
138 free (dns_forw_host); dns_forw_host = 0;
129#endif 139#endif
130} 140}
131 141
132void 142void
133configuration::clear_config () 143configuration::clear_config ()
… …
158 char *fname; 168 char *fname;
159 FILE *f; 169 FILE *f;
160 170
161 clear_config (); 171 clear_config ();
162 172
163 asprintf (&fname, "%s/vped.conf", confbase); 173 asprintf (&fname, "%s/gvpe.conf", confbase);
164 f = fopen (fname, "r"); 174 f = fopen (fname, "r");
165 175
166 if (f) 176 if (f)
167 { 177 {
168 char line[16384]; 178 char line[16384];
… …
258 268
259 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 269 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
260 { 270 {
261 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 271 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)); 272 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
263 exit (1); 273 exit (EXIT_FAILURE);
264 } 274 }
265 275
266 RSA_blinding_on (node->rsa_key, 0); 276 require (RSA_blinding_on (node->rsa_key, 0));
267 277
268 fclose (f); 278 fclose (f);
269 } 279 }
270 else 280 else
271 { 281 {
272 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 282 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
273 283
274 if (need_keys) 284 if (need_keys)
275 exit (1); 285 exit (EXIT_FAILURE);
276 } 286 }
277 287
278 free (fname); 288 free (fname);
279 } 289 }
280 290
281 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 291 if (::thisnode && !strcmp (node->nodename, ::thisnode))
282 thisnode = node; 292 thisnode = node;
283 } 293 }
284 else if (!strcmp (var, "private-key")) 294 else if (!strcmp (var, "private-key"))
285 prikeyfile = strdup (val); 295 free (prikeyfile), prikeyfile = strdup (val);
286 else if (!strcmp (var, "ifpersist")) 296 else if (!strcmp (var, "ifpersist"))
287 { 297 {
288 parse_bool (ifpersist, "ifpersist", true, false); 298 parse_bool (ifpersist, "ifpersist", true, false);
289 } 299 }
290 else if (!strcmp (var, "ifname")) 300 else if (!strcmp (var, "ifname"))
291 ifname = strdup (val); 301 free (ifname), ifname = strdup (val);
292 else if (!strcmp (var, "rekey")) 302 else if (!strcmp (var, "rekey"))
293 rekey = atoi (val); 303 rekey = atoi (val);
294 else if (!strcmp (var, "keepalive")) 304 else if (!strcmp (var, "keepalive"))
295 keepalive = atoi (val); 305 keepalive = atoi (val);
296 else if (!strcmp (var, "mtu")) 306 else if (!strcmp (var, "mtu"))
297 mtu = atoi (val); 307 mtu = atoi (val);
298 else if (!strcmp (var, "if-up")) 308 else if (!strcmp (var, "if-up"))
299 script_if_up = strdup (val); 309 free (script_if_up), script_if_up = strdup (val);
300 else if (!strcmp (var, "node-up")) 310 else if (!strcmp (var, "node-up"))
301 script_node_up = strdup (val); 311 free (script_node_up), script_node_up = strdup (val);
302 else if (!strcmp (var, "node-down")) 312 else if (!strcmp (var, "node-down"))
303 script_node_down = strdup (val); 313 free (script_node_down), script_node_down = strdup (val);
314 else if (!strcmp (var, "pid-file"))
315 free (pidfilename), pidfilename = strdup (val);
316 else if (!strcmp (var, "dns-forw-host"))
317 {
318#if ENABLE_DNS
319 free (dns_forw_host), dns_forw_host = strdup (val);
320#endif
321 }
322 else if (!strcmp (var, "dns-forw-port"))
323 {
324#if ENABLE_DNS
325 dns_forw_port = atoi (val);
326#endif
327 }
304 else if (!strcmp (var, "http-proxy-host")) 328 else if (!strcmp (var, "http-proxy-host"))
305 { 329 {
306#if ENABLE_HTTP_PROXY 330#if ENABLE_HTTP_PROXY
307 proxy_host = strdup (val); 331 free (proxy_host), proxy_host = strdup (val);
308#endif 332#endif
309 } 333 }
310 else if (!strcmp (var, "http-proxy-port")) 334 else if (!strcmp (var, "http-proxy-port"))
311 { 335 {
312#if ENABLE_HTTP_PROXY 336#if ENABLE_HTTP_PROXY
… …
320#endif 344#endif
321 } 345 }
322 346
323 /* node-specific, non-defaultable */ 347 /* node-specific, non-defaultable */
324 else if (node != &default_node && !strcmp (var, "hostname")) 348 else if (node != &default_node && !strcmp (var, "hostname"))
325 {
326 free (node->hostname);
327 node->hostname = strdup (val); 349 free (node->hostname), node->hostname = strdup (val);
328 }
329 350
330 /* node-specific, defaultable */ 351 /* node-specific, defaultable */
331 else if (!strcmp (var, "udp-port")) 352 else if (!strcmp (var, "udp-port"))
332 node->udp_port = atoi (val); 353 node->udp_port = atoi (val);
333 else if (!strcmp (var, "tcp-port")) 354 else if (!strcmp (var, "tcp-port"))
334 node->tcp_port = atoi (val); 355 node->tcp_port = atoi (val);
356 else if (!strcmp (var, "dns-port"))
357 {
358#if ENABLE_DNS
359 node->dns_port = atoi (val);
360#endif
361 }
362 else if (!strcmp (var, "dns-domain"))
363 {
364#if ENABLE_DNS
365 free (node->domain), node->domain = strdup (val);
366#endif
367 }
335 else if (!strcmp (var, "router-priority")) 368 else if (!strcmp (var, "router-priority"))
336 node->routerprio = atoi (val); 369 node->routerprio = atoi (val);
370 else if (!strcmp (var, "max-retry"))
371 node->max_retry = atoi (val);
337 else if (!strcmp (var, "connect")) 372 else if (!strcmp (var, "connect"))
338 { 373 {
339 if (!strcmp (val, "ondemand")) 374 if (!strcmp (val, "ondemand"))
340 node->connectmode = conf_node::C_ONDEMAND; 375 node->connectmode = conf_node::C_ONDEMAND;
341 else if (!strcmp (val, "never")) 376 else if (!strcmp (val, "never"))
… …
344 node->connectmode = conf_node::C_ALWAYS; 379 node->connectmode = conf_node::C_ALWAYS;
345 else if (!strcmp (val, "disabled")) 380 else if (!strcmp (val, "disabled"))
346 node->connectmode = conf_node::C_DISABLED; 381 node->connectmode = conf_node::C_DISABLED;
347 else 382 else
348 slog (L_WARN, 383 slog (L_WARN,
349 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 384 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
350 var, fname, lineno); 385 var, fname, lineno);
351 } 386 }
352 else if (!strcmp (var, "inherit-tos")) 387 else if (!strcmp (var, "inherit-tos"))
353 { 388 {
354 parse_bool (node->inherit_tos, "inherit-tos", true, false); 389 parse_bool (node->inherit_tos, "inherit-tos", true, false);
355 } 390 }
… …
366 } 401 }
367 else if (!strcmp (var, "enable-icmp")) 402 else if (!strcmp (var, "enable-icmp"))
368 { 403 {
369#if ENABLE_ICMP 404#if ENABLE_ICMP
370 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 405 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
406#endif
407 }
408 else if (!strcmp (var, "enable-dns"))
409 {
410#if ENABLE_DNS
411 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
371#endif 412#endif
372 } 413 }
373 else if (!strcmp (var, "enable-udp")) 414 else if (!strcmp (var, "enable-udp"))
374 { 415 {
375 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 416 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
389 fclose (f); 430 fclose (f);
390 } 431 }
391 else 432 else
392 { 433 {
393 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 434 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
394 exit (1); 435 exit (EXIT_FAILURE);
395 } 436 }
396 437
397 free (fname); 438 free (fname);
398 439
399 fname = config_filename (prikeyfile, "hostkey"); 440 fname = config_filename (prikeyfile, "hostkey");
… …
405 446
406 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 447 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
407 { 448 {
408 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 449 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)); 450 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
410 exit (1); 451 exit (EXIT_FAILURE);
411 } 452 }
412 453
413 RSA_blinding_on (rsa_key, 0); 454 require (RSA_blinding_on (rsa_key, 0));
414 455
415 fclose (f); 456 fclose (f);
416 } 457 }
417 else 458 else
418 { 459 {
419 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 460 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
420 461
421 if (need_keys) 462 if (need_keys)
422 exit (1); 463 exit (EXIT_FAILURE);
423 } 464 }
465
466 if (need_keys && ::thisnode
467 && rsa_key && thisnode && thisnode->rsa_key)
468 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
469 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
470 {
471 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
472 exit (EXIT_FAILURE);
473 }
424 474
425 free (fname); 475 free (fname);
426} 476}
427 477
428char *configuration::config_filename (const char *name, const char *dflt) 478char *configuration::config_filename (const char *name, const char *dflt)
… …
464 printf ("\n"); 514 printf ("\n");
465} 515}
466 516
467configuration::configuration () 517configuration::configuration ()
468{ 518{
519 asprintf (&confbase, "%s/gvpe", CONFDIR);
520
469 init (); 521 init ();
470} 522}
471 523
472configuration::~configuration () 524configuration::~configuration ()
473{ 525{

Diff Legend

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