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.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.26 by pcg, Wed May 12 13:32:13 2004 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 1998 Robert van der Meulen 3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
9 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
10 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
11 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 8 (at your option) any later version.
… …
37 33
38#include <openssl/err.h> 34#include <openssl/err.h>
39#include <openssl/pem.h> 35#include <openssl/pem.h>
40#include <openssl/rsa.h> 36#include <openssl/rsa.h>
41#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
42 39
43#include "gettext.h" 40#include "gettext.h"
44 41
45#include "conf.h" 42#include "conf.h"
46#include "slog.h" 43#include "slog.h"
47#include "util.h" 44#include "util.h"
48 45
49char *confbase; 46char *confbase;
50char *thisnode; 47char *thisnode;
51char *identname; 48char *identname;
52char *pidfilename;
53 49
54struct configuration conf; 50struct configuration conf;
55 51
56u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
57{ 53{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
62 59
63 return 0; 60 return 0;
64} 61}
65 62
66const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
67{ 64{
68 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
70 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
72 70
73 return "<unknown>"; 71 return "<unknown>";
74} 72}
75 73
76void 74void
… …
101 99
102void configuration::init () 100void configuration::init ()
103{ 101{
104 memset (this, 0, sizeof (*this)); 102 memset (this, 0, sizeof (*this));
105 103
104 mtu = DEFAULT_MTU;
106 rekey = DEFAULT_REKEY; 105 rekey = DEFAULT_REKEY;
107 keepalive = DEFAULT_KEEPALIVE; 106 keepalive = DEFAULT_KEEPALIVE;
108 llevel = L_INFO; 107 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE; 108 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP 109#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 110 icmp_type = ICMP_ECHOREPLY;
112#endif 111#endif
113 112
114 default_node.udp_port = DEFAULT_UDPPORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; 114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 116 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 117 default_node.protocols = PROT_UDPv4;
118
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid");
119} 120}
120 121
121void configuration::cleanup() 122void configuration::cleanup()
122{ 123{
123 if (rsa_key) 124 if (rsa_key)
124 RSA_free (rsa_key); 125 RSA_free (rsa_key);
125 126
126 rsa_key = 0; 127 rsa_key = 0;
127 128
129 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 130 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 131#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 132 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0; 133 free (proxy_auth); proxy_auth = 0;
132#endif 134#endif
133} 135}
134 136
135void 137void
136configuration::clear_config () 138configuration::clear_config ()
… …
228 else 230 else
229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 231 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230 } 232 }
231 else if (!strcmp (var, "ip-proto")) 233 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 234 ip_proto = atoi (val);
235 else if (!strcmp (var, "icmp-type"))
236 {
233#if ENABLE_ICMP 237#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 238 icmp_type = atoi (val);
237#endif 239#endif
240 }
238 241
239 // per config 242 // per config
240 else if (!strcmp (var, "node")) 243 else if (!strcmp (var, "node"))
241 { 244 {
242 default_node.id++; 245 default_node.id++;
… …
260 263
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 264 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 265 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 266 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
264 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 267 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265 exit (1); 268 exit (EXIT_FAILURE);
266 } 269 }
267 270
268 RSA_blinding_on (node->rsa_key, 0); 271 require (RSA_blinding_on (node->rsa_key, 0));
269 272
270 fclose (f); 273 fclose (f);
271 } 274 }
272 else 275 else
273 { 276 {
274 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 277 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275 278
276 if (need_keys) 279 if (need_keys)
277 exit (1); 280 exit (EXIT_FAILURE);
278 } 281 }
279 282
280 free (fname); 283 free (fname);
281 } 284 }
282 285
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 286 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 287 thisnode = node;
285 } 288 }
286 else if (!strcmp (var, "private-key")) 289 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 290 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 291 else if (!strcmp (var, "ifpersist"))
289 { 292 {
290 parse_bool (ifpersist, "ifpersist", true, false); 293 parse_bool (ifpersist, "ifpersist", true, false);
291 } 294 }
292 else if (!strcmp (var, "ifname")) 295 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 296 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 297 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 298 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 299 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 300 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 301 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 302 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 303 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 304 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 305 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 306 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 307 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 308 free (script_node_down), script_node_down = strdup (val);
309 else if (!strcmp (var, "pid-file"))
310 free (pidfilename), pidfilename = strdup (val);
311 else if (!strcmp (var, "http-proxy-host"))
312 {
306#if ENABLE_HTTP_PROXY 313#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 314 free (proxy_host), proxy_host = strdup (val);
315#endif
316 }
309 else if (!strcmp (var, "http-proxy-port")) 317 else if (!strcmp (var, "http-proxy-port"))
318 {
319#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 320 proxy_port = atoi (val);
321#endif
322 }
311 else if (!strcmp (var, "http-proxy-auth")) 323 else if (!strcmp (var, "http-proxy-auth"))
324 {
325#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 326 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 327#endif
328 }
314 329
315 /* node-specific, non-defaultable */ 330 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 331 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 332 free (node->hostname), node->hostname = strdup (val);
320 }
321 333
322 /* node-specific, defaultable */ 334 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 335 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 336 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 337 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 338 node->tcp_port = atoi (val);
339 else if (!strcmp (var, "dns-port"))
340 node->dns_port = atoi (val);
327 else if (!strcmp (var, "router-priority")) 341 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 342 node->routerprio = atoi (val);
329 else if (!strcmp (var, "connect")) 343 else if (!strcmp (var, "connect"))
330 { 344 {
331 if (!strcmp (val, "ondemand")) 345 if (!strcmp (val, "ondemand"))
… …
360 { 374 {
361#if ENABLE_ICMP 375#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 376 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
363#endif 377#endif
364 } 378 }
379 else if (!strcmp (var, "enable-dns"))
380 {
381#if ENABLE_DNS
382 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
383#endif
384 }
365 else if (!strcmp (var, "enable-udp")) 385 else if (!strcmp (var, "enable-udp"))
366 { 386 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 387 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
368 } 388 }
369 else if (!strcmp (var, "enable-rawip")) 389 else if (!strcmp (var, "enable-rawip"))
370 { 390 {;
371 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 391 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
372 } 392 }
373 393
374 // unknown or misplaced 394 // unknown or misplaced
375 else 395 else
… …
381 fclose (f); 401 fclose (f);
382 } 402 }
383 else 403 else
384 { 404 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 405 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 406 exit (EXIT_FAILURE);
387 } 407 }
388 408
389 free (fname); 409 free (fname);
390 410
391 fname = config_filename (prikeyfile, "hostkey"); 411 fname = config_filename (prikeyfile, "hostkey");
… …
397 417
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 418 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 419 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 420 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
401 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 421 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 422 exit (EXIT_FAILURE);
403 } 423 }
404 424
405 RSA_blinding_on (rsa_key, 0); 425 require (RSA_blinding_on (rsa_key, 0));
406 426
407 fclose (f); 427 fclose (f);
408 } 428 }
409 else 429 else
410 { 430 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 431 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 432
413 if (need_keys) 433 if (need_keys)
414 exit (1); 434 exit (EXIT_FAILURE);
415 } 435 }
436
437 if (need_keys && ::thisnode
438 && rsa_key && thisnode && thisnode->rsa_key)
439 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
440 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
441 {
442 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
443 exit (EXIT_FAILURE);
444 }
416 445
417 free (fname); 446 free (fname);
418} 447}
419 448
420char *configuration::config_filename (const char *name, const char *dflt) 449char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 485 printf ("\n");
457} 486}
458 487
459configuration::configuration () 488configuration::configuration ()
460{ 489{
490 asprintf (&confbase, "%s/vpe", CONFDIR);
491
461 init (); 492 init ();
462} 493}
463 494
464configuration::~configuration () 495configuration::~configuration ()
465{ 496{

Diff Legend

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