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.19 by pcg, Thu Oct 16 20:35:14 2003 UTC vs.
Revision 1.34 by pcg, Thu Mar 17 23:59:37 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];
… …
225 else 246 else
226 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 247 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
227 } 248 }
228 else if (!strcmp (var, "ip-proto")) 249 else if (!strcmp (var, "ip-proto"))
229 ip_proto = atoi (val); 250 ip_proto = atoi (val);
251 else if (!strcmp (var, "icmp-type"))
252 {
230#if ENABLE_ICMP 253#if ENABLE_ICMP
231 //TODO: error message
232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val); 254 icmp_type = atoi (val);
234#endif 255#endif
256 }
235 257
236 // per config 258 // per config
237 else if (!strcmp (var, "node")) 259 else if (!strcmp (var, "node"))
238 { 260 {
239 default_node.id++; 261 default_node.id++;
… …
257 279
258 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 280 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
259 { 281 {
260 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 282 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
261 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));
262 exit (1); 284 exit (EXIT_FAILURE);
263 } 285 }
264 286
265 RSA_blinding_on (node->rsa_key, 0); 287 require (RSA_blinding_on (node->rsa_key, 0));
266 288
267 fclose (f); 289 fclose (f);
268 } 290 }
269 else 291 else
270 { 292 {
271 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));
272 294
273 if (need_keys) 295 if (need_keys)
274 exit (1); 296 exit (EXIT_FAILURE);
275 } 297 }
276 298
277 free (fname); 299 free (fname);
278 } 300 }
279 301
280 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 302 if (::thisnode && !strcmp (node->nodename, ::thisnode))
281 thisnode = node; 303 thisnode = node;
282 } 304 }
283 else if (!strcmp (var, "private-key")) 305 else if (!strcmp (var, "private-key"))
284 prikeyfile = strdup (val); 306 free (prikeyfile), prikeyfile = strdup (val);
285 else if (!strcmp (var, "ifpersist")) 307 else if (!strcmp (var, "ifpersist"))
286 { 308 {
287 parse_bool (ifpersist, "ifpersist", true, false); 309 parse_bool (ifpersist, "ifpersist", true, false);
288 } 310 }
289 else if (!strcmp (var, "ifname")) 311 else if (!strcmp (var, "ifname"))
290 ifname = strdup (val); 312 free (ifname), ifname = strdup (val);
291 else if (!strcmp (var, "rekey")) 313 else if (!strcmp (var, "rekey"))
292 rekey = atoi (val); 314 rekey = atoi (val);
293 else if (!strcmp (var, "keepalive")) 315 else if (!strcmp (var, "keepalive"))
294 keepalive = atoi (val); 316 keepalive = atoi (val);
295 else if (!strcmp (var, "mtu")) 317 else if (!strcmp (var, "mtu"))
296 mtu = atoi (val); 318 mtu = atoi (val);
297 else if (!strcmp (var, "if-up")) 319 else if (!strcmp (var, "if-up"))
298 script_if_up = strdup (val); 320 free (script_if_up), script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up")) 321 else if (!strcmp (var, "node-up"))
300 script_node_up = strdup (val); 322 free (script_node_up), script_node_up = strdup (val);
301 else if (!strcmp (var, "node-down")) 323 else if (!strcmp (var, "node-down"))
302 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 else if (!strcmp (var, "dns-forw-host"))
328 {
329#if ENABLE_DNS
330 free (dns_forw_host), dns_forw_host = strdup (val);
331#endif
332 }
333 else if (!strcmp (var, "dns-forw-port"))
334 {
335#if ENABLE_DNS
336 dns_forw_port = atoi (val);
337#endif
338 }
339 else if (!strcmp (var, "http-proxy-host"))
340 {
303#if ENABLE_HTTP_PROXY 341#if ENABLE_HTTP_PROXY
304 else if (!strcmp (var, "http-proxy-host"))
305 proxy_host = strdup (val); 342 free (proxy_host), proxy_host = strdup (val);
343#endif
344 }
306 else if (!strcmp (var, "http-proxy-port")) 345 else if (!strcmp (var, "http-proxy-port"))
346 {
347#if ENABLE_HTTP_PROXY
307 proxy_port = atoi (val); 348 proxy_port = atoi (val);
349#endif
350 }
308 else if (!strcmp (var, "http-proxy-auth")) 351 else if (!strcmp (var, "http-proxy-auth"))
352 {
353#if ENABLE_HTTP_PROXY
309 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 354 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
310#endif 355#endif
356 }
311 357
312 /* node-specific, non-defaultable */ 358 /* node-specific, non-defaultable */
313 else if (node != &default_node && !strcmp (var, "hostname")) 359 else if (node != &default_node && !strcmp (var, "hostname"))
314 {
315 free (node->hostname);
316 node->hostname = strdup (val); 360 free (node->hostname), node->hostname = strdup (val);
317 }
318 361
319 /* node-specific, defaultable */ 362 /* node-specific, defaultable */
320 else if (!strcmp (var, "udp-port")) 363 else if (!strcmp (var, "udp-port"))
321 node->udp_port = atoi (val); 364 node->udp_port = atoi (val);
322 else if (!strcmp (var, "tcp-port")) 365 else if (!strcmp (var, "tcp-port"))
323 node->tcp_port = atoi (val); 366 node->tcp_port = atoi (val);
367 else if (!strcmp (var, "dns-hostname"))
368 {
369#if ENABLE_DNS
370 free (node->dns_hostname), node->dns_hostname = strdup (val);
371#endif
372 }
373 else if (!strcmp (var, "dns-port"))
374 {
375#if ENABLE_DNS
376 node->dns_port = atoi (val);
377#endif
378 }
379 else if (!strcmp (var, "dns-domain"))
380 {
381#if ENABLE_DNS
382 free (node->domain), node->domain = strdup (val);
383#endif
384 }
324 else if (!strcmp (var, "router-priority")) 385 else if (!strcmp (var, "router-priority"))
325 node->routerprio = atoi (val); 386 node->routerprio = atoi (val);
387 else if (!strcmp (var, "max-retry"))
388 node->max_retry = atoi (val);
326 else if (!strcmp (var, "connect")) 389 else if (!strcmp (var, "connect"))
327 { 390 {
328 if (!strcmp (val, "ondemand")) 391 if (!strcmp (val, "ondemand"))
329 node->connectmode = conf_node::C_ONDEMAND; 392 node->connectmode = conf_node::C_ONDEMAND;
330 else if (!strcmp (val, "never")) 393 else if (!strcmp (val, "never"))
… …
333 node->connectmode = conf_node::C_ALWAYS; 396 node->connectmode = conf_node::C_ALWAYS;
334 else if (!strcmp (val, "disabled")) 397 else if (!strcmp (val, "disabled"))
335 node->connectmode = conf_node::C_DISABLED; 398 node->connectmode = conf_node::C_DISABLED;
336 else 399 else
337 slog (L_WARN, 400 slog (L_WARN,
338 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 401 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
339 var, fname, lineno); 402 var, fname, lineno);
340 } 403 }
341 else if (!strcmp (var, "inherit-tos")) 404 else if (!strcmp (var, "inherit-tos"))
342 { 405 {
343 parse_bool (node->inherit_tos, "inherit-tos", true, false); 406 parse_bool (node->inherit_tos, "inherit-tos", true, false);
344 } 407 }
… …
355 } 418 }
356 else if (!strcmp (var, "enable-icmp")) 419 else if (!strcmp (var, "enable-icmp"))
357 { 420 {
358#if ENABLE_ICMP 421#if ENABLE_ICMP
359 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 422 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
423#endif
424 }
425 else if (!strcmp (var, "enable-dns"))
426 {
427#if ENABLE_DNS
428 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
360#endif 429#endif
361 } 430 }
362 else if (!strcmp (var, "enable-udp")) 431 else if (!strcmp (var, "enable-udp"))
363 { 432 {
364 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 433 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
378 fclose (f); 447 fclose (f);
379 } 448 }
380 else 449 else
381 { 450 {
382 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 451 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
383 exit (1); 452 exit (EXIT_FAILURE);
384 } 453 }
385 454
386 free (fname); 455 free (fname);
387 456
388 fname = config_filename (prikeyfile, "hostkey"); 457 fname = config_filename (prikeyfile, "hostkey");
… …
394 463
395 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 464 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
396 { 465 {
397 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 466 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
398 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 467 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
399 exit (1); 468 exit (EXIT_FAILURE);
400 } 469 }
401 470
402 RSA_blinding_on (rsa_key, 0); 471 require (RSA_blinding_on (rsa_key, 0));
403 472
404 fclose (f); 473 fclose (f);
405 } 474 }
406 else 475 else
407 { 476 {
408 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 477 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
409 478
410 if (need_keys) 479 if (need_keys)
411 exit (1); 480 exit (EXIT_FAILURE);
412 } 481 }
482
483 if (need_keys && ::thisnode
484 && rsa_key && thisnode && thisnode->rsa_key)
485 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
486 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
487 {
488 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
489 exit (EXIT_FAILURE);
490 }
413 491
414 free (fname); 492 free (fname);
415} 493}
416 494
417char *configuration::config_filename (const char *name, const char *dflt) 495char *configuration::config_filename (const char *name, const char *dflt)
… …
453 printf ("\n"); 531 printf ("\n");
454} 532}
455 533
456configuration::configuration () 534configuration::configuration ()
457{ 535{
536 asprintf (&confbase, "%s/gvpe", CONFDIR);
537
458 init (); 538 init ();
459} 539}
460 540
461configuration::~configuration () 541configuration::~configuration ()
462{ 542{

Diff Legend

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