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.11 by pcg, Wed Apr 2 21:43:44 2003 UTC vs.
Revision 1.23 by pcg, Thu Jan 29 19:30:08 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"
… …
53 50
54struct configuration conf; 51struct configuration conf;
55 52
56u8 best_protocol (u8 protset) 53u8 best_protocol (u8 protset)
57{ 54{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 55 if (protset & PROT_IPv4 ) return PROT_IPv4;
56 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 57 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 58 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 59
62 return 0; 60 return 0;
63} 61}
64 62
65const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
66{ 64{
67 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
70 69
71 return "<unknown>"; 70 return "<unknown>";
72} 71}
73 72
74configuration::configuration () 73void
74conf_node::print ()
75{ 75{
76 init (); 76 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
77 id,
78 id >> 8, id & 0xff,
79 compress ? 'Y' : 'N',
80 connectmode == C_ONDEMAND ? "ondemand" :
81 connectmode == C_NEVER ? "never" :
82 connectmode == C_ALWAYS ? "always" : "",
83 nodename,
84 hostname ? hostname : "",
85 hostname ? ":" : "",
86 hostname ? udp_port : 0
87 );
77} 88}
78 89
79configuration::~configuration () 90conf_node::~conf_node ()
80{ 91{
81 cleanup (); 92 if (rsa_key)
93 RSA_free (rsa_key);
94
95 free (nodename);
96 free (hostname);
82} 97}
83 98
84void configuration::init () 99void configuration::init ()
85{ 100{
86 memset (this, 0, sizeof (*this)); 101 memset (this, 0, sizeof (*this));
87 102
103 mtu = DEFAULT_MTU;
88 rekey = DEFAULT_REKEY; 104 rekey = DEFAULT_REKEY;
89 keepalive = DEFAULT_KEEPALIVE; 105 keepalive = DEFAULT_KEEPALIVE;
90 llevel = L_INFO; 106 llevel = L_INFO;
91 ip_proto = IPPROTO_GRE; 107 ip_proto = IPPROTO_GRE;
108#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY;
110#endif
92 111
93 default_node.udp_port = DEFAULT_UDPPORT; 112 default_node.udp_port = DEFAULT_UDPPORT;
94 default_node.tcp_port = DEFAULT_UDPPORT; 113 default_node.tcp_port = DEFAULT_UDPPORT;
95 default_node.connectmode = conf_node::C_ALWAYS; 114 default_node.connectmode = conf_node::C_ALWAYS;
96 default_node.compress = true; 115 default_node.compress = true;
… …
100void configuration::cleanup() 119void configuration::cleanup()
101{ 120{
102 if (rsa_key) 121 if (rsa_key)
103 RSA_free (rsa_key); 122 RSA_free (rsa_key);
104 123
105 free (ifname);
106
107 rsa_key = 0; 124 rsa_key = 0;
108 ifname = 0; 125
126 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0;
130#endif
109} 131}
110 132
111void 133void
112configuration::clear_config () 134configuration::clear_config ()
113{ 135{
… …
204 else 226 else
205 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 227 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
206 } 228 }
207 else if (!strcmp (var, "ip-proto")) 229 else if (!strcmp (var, "ip-proto"))
208 ip_proto = atoi (val); 230 ip_proto = atoi (val);
231 else if (!strcmp (var, "icmp-type"))
232 {
233#if ENABLE_ICMP
234 icmp_type = atoi (val);
235#endif
236 }
209 237
210 // per config 238 // per config
211 else if (!strcmp (var, "node")) 239 else if (!strcmp (var, "node"))
212 { 240 {
213 default_node.id++; 241 default_node.id++;
… …
231 259
232 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
233 { 261 {
234 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
235 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
236 exit (1); 264 exit (EXIT_FAILURE);
237 } 265 }
238 266
239 RSA_blinding_on (node->rsa_key, 0); 267 require (RSA_blinding_on (node->rsa_key, 0));
240 268
241 fclose (f); 269 fclose (f);
242 } 270 }
243 else 271 else
244 { 272 {
245 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 273 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
246 274
247 if (need_keys) 275 if (need_keys)
248 exit (1); 276 exit (EXIT_FAILURE);
249 } 277 }
250 278
251 free (fname); 279 free (fname);
252 } 280 }
253 281
254 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 282 if (::thisnode && !strcmp (node->nodename, ::thisnode))
255 thisnode = node; 283 thisnode = node;
256 } 284 }
257 else if (!strcmp (var, "private-key")) 285 else if (!strcmp (var, "private-key"))
258 prikeyfile = strdup (val); 286 prikeyfile = strdup (val);
259 else if (!strcmp (var, "ifpersist")) 287 else if (!strcmp (var, "ifpersist"))
… …
272 script_if_up = strdup (val); 300 script_if_up = strdup (val);
273 else if (!strcmp (var, "node-up")) 301 else if (!strcmp (var, "node-up"))
274 script_node_up = strdup (val); 302 script_node_up = strdup (val);
275 else if (!strcmp (var, "node-down")) 303 else if (!strcmp (var, "node-down"))
276 script_node_down = strdup (val); 304 script_node_down = strdup (val);
305 else if (!strcmp (var, "http-proxy-host"))
306 {
307#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val);
309#endif
310 }
311 else if (!strcmp (var, "http-proxy-port"))
312 {
313#if ENABLE_HTTP_PROXY
314 proxy_port = atoi (val);
315#endif
316 }
317 else if (!strcmp (var, "http-proxy-auth"))
318 {
319#if ENABLE_HTTP_PROXY
320 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
321#endif
322 }
277 323
278 /* node-specific, non-defaultable */ 324 /* node-specific, non-defaultable */
279 else if (node != &default_node && !strcmp (var, "hostname")) 325 else if (node != &default_node && !strcmp (var, "hostname"))
280 { 326 {
281 free (node->hostname); 327 free (node->hostname);
… …
317 { 363 {
318#if ENABLE_TCP 364#if ENABLE_TCP
319 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
320#endif 366#endif
321 } 367 }
368 else if (!strcmp (var, "enable-icmp"))
369 {
370#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
372#endif
373 }
322 else if (!strcmp (var, "enable-udp")) 374 else if (!strcmp (var, "enable-udp"))
323 { 375 {
324 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
325 } 377 }
326 else if (!strcmp (var, "enable-rawip")) 378 else if (!strcmp (var, "enable-rawip"))
… …
328 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 380 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
329 } 381 }
330 382
331 // unknown or misplaced 383 // unknown or misplaced
332 else 384 else
333 {
334 slog (L_WARN, 385 slog (L_WARN,
335 _("unknown or misplaced variable `%s', at '%s' line %d"), 386 _("unknown or misplaced variable `%s', at '%s' line %d"),
336 var, fname, lineno); 387 var, fname, lineno);
337 }
338 } 388 }
339 389
340 fclose (f); 390 fclose (f);
341 } 391 }
342 else 392 else
343 { 393 {
344 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 394 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
345 exit (1); 395 exit (EXIT_FAILURE);
346 } 396 }
347 397
348 free (fname); 398 free (fname);
349 399
350 fname = config_filename (prikeyfile, "hostkey"); 400 fname = config_filename (prikeyfile, "hostkey");
… …
356 406
357 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 407 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
358 { 408 {
359 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 409 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
360 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 410 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
361 exit (1); 411 exit (EXIT_FAILURE);
362 } 412 }
363 413
364 RSA_blinding_on (rsa_key, 0); 414 require (RSA_blinding_on (rsa_key, 0));
365 415
366 fclose (f); 416 fclose (f);
367 } 417 }
368 else 418 else
369 { 419 {
370 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 420 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
371 421
372 if (need_keys) 422 if (need_keys)
373 exit (1); 423 exit (EXIT_FAILURE);
374 } 424 }
425
426 if (need_keys && ::thisnode
427 && rsa_key && thisnode && thisnode->rsa_key)
428 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
429 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
430 {
431 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
432 exit (EXIT_FAILURE);
433 }
375 434
376 free (fname); 435 free (fname);
377} 436}
378 437
379char *configuration::config_filename (const char *name, const char *dflt) 438char *configuration::config_filename (const char *name, const char *dflt)
… …
401 printf (_("MTU: %d\n"), mtu); 460 printf (_("MTU: %d\n"), mtu);
402 printf (_("rekeying interval: %d\n"), rekey); 461 printf (_("rekeying interval: %d\n"), rekey);
403 printf (_("keepalive interval: %d\n"), keepalive); 462 printf (_("keepalive interval: %d\n"), keepalive);
404 printf (_("interface: %s\n"), ifname); 463 printf (_("interface: %s\n"), ifname);
405 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 464 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
406 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 465 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
407 printf ("\n"); 466 printf ("\n");
408 467
409 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 468 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
410 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 469 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
411 470
… …
413 (*i)->print (); 472 (*i)->print ();
414 473
415 printf ("\n"); 474 printf ("\n");
416} 475}
417 476
418void 477configuration::configuration ()
419conf_node::print ()
420{ 478{
421 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 479 init ();
422 id,
423 id >> 8, id & 0xff,
424 compress ? 'Y' : 'N',
425 connectmode == C_ONDEMAND ? "ondemand" :
426 connectmode == C_NEVER ? "never" :
427 connectmode == C_ALWAYS ? "always" : "",
428 nodename,
429 hostname ? hostname : "",
430 hostname ? ":" : "",
431 hostname ? udp_port : 0
432 );
433} 480}
434 481
482configuration::~configuration ()
483{
484 cleanup ();
485}
486
487

Diff Legend

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