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.7 by pcg, Fri Mar 28 16:21:09 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.
… …
31#include <netdb.h> 27#include <netdb.h>
32#include <sys/stat.h> 28#include <sys/stat.h>
33#include <sys/types.h> 29#include <sys/types.h>
34#include <unistd.h> 30#include <unistd.h>
35 31
36#include <netinet/in.h> 32#include "netcompat.h"
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) 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
60 59
61 return PROT_UDPv4; 60 return 0;
62} 61}
63 62
64const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
65{ 64{
66 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
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
72configuration::configuration () 74void
75conf_node::print ()
73{ 76{
74 init (); 77 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
78 id,
79 id >> 8, id & 0xff,
80 compress ? 'Y' : 'N',
81 connectmode == C_ONDEMAND ? "ondemand" :
82 connectmode == C_NEVER ? "never" :
83 connectmode == C_ALWAYS ? "always" : "",
84 nodename,
85 hostname ? hostname : "",
86 hostname ? ":" : "",
87 hostname ? udp_port : 0
88 );
75} 89}
76 90
77configuration::~configuration () 91conf_node::~conf_node ()
78{ 92{
79 cleanup (); 93 if (rsa_key)
94 RSA_free (rsa_key);
95
96 free (nodename);
97 free (hostname);
80} 98}
81 99
82void configuration::init () 100void configuration::init ()
83{ 101{
84 memset (this, 0, sizeof (*this)); 102 memset (this, 0, sizeof (*this));
85 103
104 mtu = DEFAULT_MTU;
86 rekey = DEFAULT_REKEY; 105 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 106 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 107 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 108 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP
110 icmp_type = ICMP_ECHOREPLY;
111#endif
90 112
91 default_node.udp_port = DEFAULT_UDPPORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
92 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
93 default_node.compress = true; 116 default_node.compress = true;
94 default_node.protocols = PROT_UDPv4; 117 default_node.protocols = PROT_UDPv4;
118
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid");
95} 120}
96 121
97void configuration::cleanup() 122void configuration::cleanup()
98{ 123{
99 if (rsa_key) 124 if (rsa_key)
100 RSA_free (rsa_key); 125 RSA_free (rsa_key);
101 126
102 free (ifname);
103
104 rsa_key = 0; 127 rsa_key = 0;
105 ifname = 0; 128
129 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0;
134#endif
106} 135}
107 136
108void 137void
109configuration::clear_config () 138configuration::clear_config ()
110{ 139{
… …
201 else 230 else
202 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);
203 } 232 }
204 else if (!strcmp (var, "ip-proto")) 233 else if (!strcmp (var, "ip-proto"))
205 ip_proto = atoi (val); 234 ip_proto = atoi (val);
235 else if (!strcmp (var, "icmp-type"))
236 {
237#if ENABLE_ICMP
238 icmp_type = atoi (val);
239#endif
240 }
206 241
207 // per config 242 // per config
208 else if (!strcmp (var, "node")) 243 else if (!strcmp (var, "node"))
209 { 244 {
210 default_node.id++; 245 default_node.id++;
… …
228 263
229 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 264 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
230 { 265 {
231 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 266 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
232 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));
233 exit (1); 268 exit (EXIT_FAILURE);
234 } 269 }
235 270
236 RSA_blinding_on (node->rsa_key, 0); 271 require (RSA_blinding_on (node->rsa_key, 0));
237 272
238 fclose (f); 273 fclose (f);
239 } 274 }
240 else 275 else
241 { 276 {
242 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));
243 278
244 if (need_keys) 279 if (need_keys)
245 exit (1); 280 exit (EXIT_FAILURE);
246 } 281 }
247 282
248 free (fname); 283 free (fname);
249 } 284 }
250 285
251 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 286 if (::thisnode && !strcmp (node->nodename, ::thisnode))
252 thisnode = node; 287 thisnode = node;
253 } 288 }
254 else if (!strcmp (var, "private-key")) 289 else if (!strcmp (var, "private-key"))
255 prikeyfile = strdup (val); 290 free (prikeyfile), prikeyfile = strdup (val);
256 else if (!strcmp (var, "ifpersist")) 291 else if (!strcmp (var, "ifpersist"))
257 { 292 {
258 parse_bool (ifpersist, "ifpersist", true, false); 293 parse_bool (ifpersist, "ifpersist", true, false);
259 } 294 }
260 else if (!strcmp (var, "ifname")) 295 else if (!strcmp (var, "ifname"))
261 ifname = strdup (val); 296 free (ifname), ifname = strdup (val);
262 else if (!strcmp (var, "rekey")) 297 else if (!strcmp (var, "rekey"))
263 rekey = atoi (val); 298 rekey = atoi (val);
264 else if (!strcmp (var, "keepalive")) 299 else if (!strcmp (var, "keepalive"))
265 keepalive = atoi (val); 300 keepalive = atoi (val);
266 else if (!strcmp (var, "mtu")) 301 else if (!strcmp (var, "mtu"))
267 mtu = atoi (val); 302 mtu = atoi (val);
268 else if (!strcmp (var, "if-up")) 303 else if (!strcmp (var, "if-up"))
269 script_if_up = strdup (val); 304 free (script_if_up), script_if_up = strdup (val);
270 else if (!strcmp (var, "node-up")) 305 else if (!strcmp (var, "node-up"))
271 script_node_up = strdup (val); 306 free (script_node_up), script_node_up = strdup (val);
272 else if (!strcmp (var, "node-down")) 307 else if (!strcmp (var, "node-down"))
273 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 {
313#if ENABLE_HTTP_PROXY
314 free (proxy_host), proxy_host = strdup (val);
315#endif
316 }
317 else if (!strcmp (var, "http-proxy-port"))
318 {
319#if ENABLE_HTTP_PROXY
320 proxy_port = atoi (val);
321#endif
322 }
323 else if (!strcmp (var, "http-proxy-auth"))
324 {
325#if ENABLE_HTTP_PROXY
326 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
327#endif
328 }
274 329
275 /* node-specific, non-defaultable */ 330 /* node-specific, non-defaultable */
276 else if (node != &default_node && !strcmp (var, "hostname")) 331 else if (node != &default_node && !strcmp (var, "hostname"))
277 {
278 free (node->hostname);
279 node->hostname = strdup (val); 332 free (node->hostname), node->hostname = strdup (val);
280 }
281 333
282 /* node-specific, defaultable */ 334 /* node-specific, defaultable */
283 else if (!strcmp (var, "udp-port")) 335 else if (!strcmp (var, "udp-port"))
284 node->udp_port = atoi (val); 336 node->udp_port = atoi (val);
337 else if (!strcmp (var, "tcp-port"))
338 node->tcp_port = atoi (val);
339 else if (!strcmp (var, "dns-port"))
340 node->dns_port = atoi (val);
285 else if (!strcmp (var, "router-priority")) 341 else if (!strcmp (var, "router-priority"))
286 node->routerprio = atoi (val); 342 node->routerprio = atoi (val);
287 else if (!strcmp (var, "connect")) 343 else if (!strcmp (var, "connect"))
288 { 344 {
289 if (!strcmp (val, "ondemand")) 345 if (!strcmp (val, "ondemand"))
… …
306 else if (!strcmp (var, "compress")) 362 else if (!strcmp (var, "compress"))
307 { 363 {
308 parse_bool (node->compress, "compress", true, false); 364 parse_bool (node->compress, "compress", true, false);
309 } 365 }
310 // all these bool options really really cost a lot of executable size! 366 // all these bool options really really cost a lot of executable size!
367 else if (!strcmp (var, "enable-tcp"))
368 {
369#if ENABLE_TCP
370 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
371#endif
372 }
373 else if (!strcmp (var, "enable-icmp"))
374 {
375#if ENABLE_ICMP
376 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
377#endif
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 }
311 else if (!strcmp (var, "enable-udp")) 385 else if (!strcmp (var, "enable-udp"))
312 { 386 {
313 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;
314 } 388 }
315 else if (!strcmp (var, "enable-rawip")) 389 else if (!strcmp (var, "enable-rawip"))
316 { 390 {;
317 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;
318 } 392 }
319 393
320 // unknown or misplaced 394 // unknown or misplaced
321 else 395 else
322 {
323 slog (L_WARN, 396 slog (L_WARN,
324 _("unknown or misplaced variable `%s', at '%s' line %d"), 397 _("unknown or misplaced variable `%s', at '%s' line %d"),
325 var, fname, lineno); 398 var, fname, lineno);
326 }
327 } 399 }
328 400
329 fclose (f); 401 fclose (f);
330 } 402 }
331 else 403 else
332 { 404 {
333 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));
334 exit (1); 406 exit (EXIT_FAILURE);
335 } 407 }
336 408
337 free (fname); 409 free (fname);
338 410
339 fname = config_filename (prikeyfile, "hostkey"); 411 fname = config_filename (prikeyfile, "hostkey");
… …
345 417
346 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 418 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
347 { 419 {
348 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 420 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
349 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));
350 exit (1); 422 exit (EXIT_FAILURE);
351 } 423 }
352 424
353 RSA_blinding_on (rsa_key, 0); 425 require (RSA_blinding_on (rsa_key, 0));
354 426
355 fclose (f); 427 fclose (f);
356 } 428 }
357 else 429 else
358 { 430 {
359 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));
360 432
361 if (need_keys) 433 if (need_keys)
362 exit (1); 434 exit (EXIT_FAILURE);
363 } 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 }
364 445
365 free (fname); 446 free (fname);
366} 447}
367 448
368char *configuration::config_filename (const char *name, const char *dflt) 449char *configuration::config_filename (const char *name, const char *dflt)
… …
390 printf (_("MTU: %d\n"), mtu); 471 printf (_("MTU: %d\n"), mtu);
391 printf (_("rekeying interval: %d\n"), rekey); 472 printf (_("rekeying interval: %d\n"), rekey);
392 printf (_("keepalive interval: %d\n"), keepalive); 473 printf (_("keepalive interval: %d\n"), keepalive);
393 printf (_("interface: %s\n"), ifname); 474 printf (_("interface: %s\n"), ifname);
394 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 475 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
395 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 476 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
396 printf ("\n"); 477 printf ("\n");
397 478
398 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 479 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
399 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 480 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
400 481
… …
402 (*i)->print (); 483 (*i)->print ();
403 484
404 printf ("\n"); 485 printf ("\n");
405} 486}
406 487
407void 488configuration::configuration ()
408conf_node::print ()
409{ 489{
410 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 490 asprintf (&confbase, "%s/vpe", CONFDIR);
411 id,
412 id >> 8, id & 0xff,
413 compress ? 'Y' : 'N',
414 connectmode == C_ONDEMAND ? "ondemand" :
415 connectmode == C_NEVER ? "never" :
416 connectmode == C_ALWAYS ? "always" : "",
417 nodename,
418 hostname ? hostname : "",
419 hostname ? ":" : "",
420 hostname ? udp_port : 0
421 );
422}
423 491
492 init ();
493}
494
495configuration::~configuration ()
496{
497 cleanup ();
498}
499
500

Diff Legend

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