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.22 by pcg, Thu Jan 29 18:55:10 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) 55 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 56 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
57 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
58 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
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";
68 69
69 return "<unknown>"; 70 return "<unknown>";
70} 71}
71 72
72configuration::configuration () 73void
74conf_node::print ()
73{ 75{
74 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 );
75} 88}
76 89
77configuration::~configuration () 90conf_node::~conf_node ()
78{ 91{
79 cleanup (); 92 if (rsa_key)
93 RSA_free (rsa_key);
94
95 free (nodename);
96 free (hostname);
80} 97}
81 98
82void configuration::init () 99void configuration::init ()
83{ 100{
84 memset (this, 0, sizeof (*this)); 101 memset (this, 0, sizeof (*this));
85 102
103 mtu = DEFAULT_MTU;
86 rekey = DEFAULT_REKEY; 104 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 105 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 106 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 107 ip_proto = IPPROTO_GRE;
108#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY;
110#endif
90 111
91 default_node.udp_port = DEFAULT_UDPPORT; 112 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT;
92 default_node.connectmode = conf_node::C_ALWAYS; 114 default_node.connectmode = conf_node::C_ALWAYS;
93 default_node.compress = true; 115 default_node.compress = true;
94 default_node.protocols = PROT_UDPv4; 116 default_node.protocols = PROT_UDPv4;
95} 117}
96 118
97void configuration::cleanup() 119void configuration::cleanup()
98{ 120{
99 if (rsa_key) 121 if (rsa_key)
100 RSA_free (rsa_key); 122 RSA_free (rsa_key);
101 123
102 free (ifname);
103
104 rsa_key = 0; 124 rsa_key = 0;
105 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
106} 131}
107 132
108void 133void
109configuration::clear_config () 134configuration::clear_config ()
110{ 135{
… …
201 else 226 else
202 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);
203 } 228 }
204 else if (!strcmp (var, "ip-proto")) 229 else if (!strcmp (var, "ip-proto"))
205 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 }
206 237
207 // per config 238 // per config
208 else if (!strcmp (var, "node")) 239 else if (!strcmp (var, "node"))
209 { 240 {
210 default_node.id++; 241 default_node.id++;
… …
228 259
229 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
230 { 261 {
231 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 262 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)); 263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
233 exit (1); 264 exit (EXIT_FAILURE);
234 } 265 }
235 266
236 RSA_blinding_on (node->rsa_key, 0); 267 require (RSA_blinding_on (node->rsa_key, 0));
237 268
238 fclose (f); 269 fclose (f);
239 } 270 }
240 else 271 else
241 { 272 {
242 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));
243 274
244 if (need_keys) 275 if (need_keys)
245 exit (1); 276 exit (EXIT_FAILURE);
246 } 277 }
247 278
248 free (fname); 279 free (fname);
249 } 280 }
250 281
… …
269 script_if_up = strdup (val); 300 script_if_up = strdup (val);
270 else if (!strcmp (var, "node-up")) 301 else if (!strcmp (var, "node-up"))
271 script_node_up = strdup (val); 302 script_node_up = strdup (val);
272 else if (!strcmp (var, "node-down")) 303 else if (!strcmp (var, "node-down"))
273 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 }
274 323
275 /* node-specific, non-defaultable */ 324 /* node-specific, non-defaultable */
276 else if (node != &default_node && !strcmp (var, "hostname")) 325 else if (node != &default_node && !strcmp (var, "hostname"))
277 { 326 {
278 free (node->hostname); 327 free (node->hostname);
… …
280 } 329 }
281 330
282 /* node-specific, defaultable */ 331 /* node-specific, defaultable */
283 else if (!strcmp (var, "udp-port")) 332 else if (!strcmp (var, "udp-port"))
284 node->udp_port = atoi (val); 333 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val);
285 else if (!strcmp (var, "router-priority")) 336 else if (!strcmp (var, "router-priority"))
286 node->routerprio = atoi (val); 337 node->routerprio = atoi (val);
287 else if (!strcmp (var, "connect")) 338 else if (!strcmp (var, "connect"))
288 { 339 {
289 if (!strcmp (val, "ondemand")) 340 if (!strcmp (val, "ondemand"))
… …
306 else if (!strcmp (var, "compress")) 357 else if (!strcmp (var, "compress"))
307 { 358 {
308 parse_bool (node->compress, "compress", true, false); 359 parse_bool (node->compress, "compress", true, false);
309 } 360 }
310 // all these bool options really really cost a lot of executable size! 361 // all these bool options really really cost a lot of executable size!
362 else if (!strcmp (var, "enable-tcp"))
363 {
364#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
366#endif
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 }
311 else if (!strcmp (var, "enable-udp")) 374 else if (!strcmp (var, "enable-udp"))
312 { 375 {
313 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;
314 } 377 }
315 else if (!strcmp (var, "enable-rawip")) 378 else if (!strcmp (var, "enable-rawip"))
… …
317 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;
318 } 381 }
319 382
320 // unknown or misplaced 383 // unknown or misplaced
321 else 384 else
322 {
323 slog (L_WARN, 385 slog (L_WARN,
324 _("unknown or misplaced variable `%s', at '%s' line %d"), 386 _("unknown or misplaced variable `%s', at '%s' line %d"),
325 var, fname, lineno); 387 var, fname, lineno);
326 }
327 } 388 }
328 389
329 fclose (f); 390 fclose (f);
330 } 391 }
331 else 392 else
332 { 393 {
333 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));
334 exit (1); 395 exit (EXIT_FAILURE);
335 } 396 }
336 397
337 free (fname); 398 free (fname);
338 399
339 fname = config_filename (prikeyfile, "hostkey"); 400 fname = config_filename (prikeyfile, "hostkey");
… …
345 406
346 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 407 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
347 { 408 {
348 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 409 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)); 410 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
350 exit (1); 411 exit (EXIT_FAILURE);
351 } 412 }
352 413
353 RSA_blinding_on (rsa_key, 0); 414 require (RSA_blinding_on (rsa_key, 0));
354 415
355 fclose (f); 416 fclose (f);
356 } 417 }
357 else 418 else
358 { 419 {
359 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));
360 421
361 if (need_keys) 422 if (need_keys)
362 exit (1); 423 exit (EXIT_FAILURE);
363 } 424 }
425
426 if (need_keys && rsa_key && thisnode && thisnode->rsa_key)
427 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
428 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
429 {
430 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
431 exit (EXIT_FAILURE);
432 }
364 433
365 free (fname); 434 free (fname);
366} 435}
367 436
368char *configuration::config_filename (const char *name, const char *dflt) 437char *configuration::config_filename (const char *name, const char *dflt)
… …
390 printf (_("MTU: %d\n"), mtu); 459 printf (_("MTU: %d\n"), mtu);
391 printf (_("rekeying interval: %d\n"), rekey); 460 printf (_("rekeying interval: %d\n"), rekey);
392 printf (_("keepalive interval: %d\n"), keepalive); 461 printf (_("keepalive interval: %d\n"), keepalive);
393 printf (_("interface: %s\n"), ifname); 462 printf (_("interface: %s\n"), ifname);
394 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 463 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
395 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 464 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
396 printf ("\n"); 465 printf ("\n");
397 466
398 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 467 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
399 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 468 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
400 469
… …
402 (*i)->print (); 471 (*i)->print ();
403 472
404 printf ("\n"); 473 printf ("\n");
405} 474}
406 475
407void 476configuration::configuration ()
408conf_node::print ()
409{ 477{
410 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 478 init ();
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} 479}
423 480
481configuration::~configuration ()
482{
483 cleanup ();
484}
485
486

Diff Legend

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