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.5 by pcg, Fri Mar 28 04:05:10 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"
… …
51char *identname; 48char *identname;
52char *pidfilename; 49char *pidfilename;
53 50
54struct configuration conf; 51struct configuration conf;
55 52
56configuration::configuration () 53u8 best_protocol (u8 protset)
57{ 54{
58 init (); 55 if (protset & PROT_IPv4 ) return PROT_IPv4;
59} 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
61configuration::~configuration () 60 return 0;
61}
62
63const char *strprotocol (u8 protocol)
62{ 64{
63 cleanup (); 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp";
69
70 return "<unknown>";
71}
72
73void
74conf_node::print ()
75{
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 );
88}
89
90conf_node::~conf_node ()
91{
92 if (rsa_key)
93 RSA_free (rsa_key);
94
95 free (nodename);
96 free (hostname);
64} 97}
65 98
66void configuration::init () 99void configuration::init ()
67{ 100{
68 memset (this, 0, sizeof (*this)); 101 memset (this, 0, sizeof (*this));
69 102
103 mtu = DEFAULT_MTU;
70 rekey = DEFAULT_REKEY; 104 rekey = DEFAULT_REKEY;
71 keepalive = DEFAULT_KEEPALIVE; 105 keepalive = DEFAULT_KEEPALIVE;
72 llevel = L_INFO; 106 llevel = L_INFO;
73 ip_proto = IPPROTO_GRE; 107 ip_proto = IPPROTO_GRE;
108#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY;
110#endif
74 111
75 default_node.udp_port = DEFAULT_UDPPORT; 112 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT;
76 default_node.connectmode = conf_node::C_ALWAYS; 114 default_node.connectmode = conf_node::C_ALWAYS;
77 default_node.compress = true; 115 default_node.compress = true;
78 default_node.can_send = PROT_UDPv4; 116 default_node.protocols = PROT_UDPv4;
79 default_node.can_recv = PROT_IPv4;
80} 117}
81 118
82void configuration::cleanup() 119void configuration::cleanup()
83{ 120{
84 if (rsa_key) 121 if (rsa_key)
85 RSA_free (rsa_key); 122 RSA_free (rsa_key);
86 123
87 free (ifname);
88
89 rsa_key = 0; 124 rsa_key = 0;
90 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
91} 131}
92 132
93void 133void
94configuration::clear_config () 134configuration::clear_config ()
95{ 135{
… …
186 else 226 else
187 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);
188 } 228 }
189 else if (!strcmp (var, "ip-proto")) 229 else if (!strcmp (var, "ip-proto"))
190 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 }
191 237
192 // per config 238 // per config
193 else if (!strcmp (var, "node")) 239 else if (!strcmp (var, "node"))
194 { 240 {
195 default_node.id++; 241 default_node.id++;
… …
213 259
214 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
215 { 261 {
216 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
217 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));
218 exit (1); 264 exit (EXIT_FAILURE);
219 } 265 }
220 266
221 RSA_blinding_on (node->rsa_key, 0); 267 require (RSA_blinding_on (node->rsa_key, 0));
222 268
223 fclose (f); 269 fclose (f);
224 } 270 }
225 else 271 else
226 { 272 {
227 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));
228 274
229 if (need_keys) 275 if (need_keys)
230 exit (1); 276 exit (EXIT_FAILURE);
231 } 277 }
232 278
233 free (fname); 279 free (fname);
234 } 280 }
235 281
… …
254 script_if_up = strdup (val); 300 script_if_up = strdup (val);
255 else if (!strcmp (var, "node-up")) 301 else if (!strcmp (var, "node-up"))
256 script_node_up = strdup (val); 302 script_node_up = strdup (val);
257 else if (!strcmp (var, "node-down")) 303 else if (!strcmp (var, "node-down"))
258 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 }
259 323
260 /* node-specific, non-defaultable */ 324 /* node-specific, non-defaultable */
261 else if (node != &default_node && !strcmp (var, "hostname")) 325 else if (node != &default_node && !strcmp (var, "hostname"))
262 { 326 {
263 free (node->hostname); 327 free (node->hostname);
… …
265 } 329 }
266 330
267 /* node-specific, defaultable */ 331 /* node-specific, defaultable */
268 else if (!strcmp (var, "udp-port")) 332 else if (!strcmp (var, "udp-port"))
269 node->udp_port = atoi (val); 333 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val);
270 else if (!strcmp (var, "router-priority")) 336 else if (!strcmp (var, "router-priority"))
271 node->routerprio = atoi (val); 337 node->routerprio = atoi (val);
272 else if (!strcmp (var, "connect")) 338 else if (!strcmp (var, "connect"))
273 { 339 {
274 if (!strcmp (val, "ondemand")) 340 if (!strcmp (val, "ondemand"))
… …
291 else if (!strcmp (var, "compress")) 357 else if (!strcmp (var, "compress"))
292 { 358 {
293 parse_bool (node->compress, "compress", true, false); 359 parse_bool (node->compress, "compress", true, false);
294 } 360 }
295 // 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!
296 else if (!strcmp (var, "can-send-udp")) 362 else if (!strcmp (var, "enable-tcp"))
297 {
298 u8 v; parse_bool (v, "can-send-udp", PROT_UDPv4, 0); node->can_send = (node->can_send & ~PROT_UDPv4) | v;
299 } 363 {
300 else if (!strcmp (var, "can-recv-udp")) 364#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
366#endif
301 { 367 }
302 u8 v; parse_bool (v, "can-recv-udp", PROT_UDPv4, 0); node->can_recv = (node->can_recv & ~PROT_UDPv4) | v; 368 else if (!strcmp (var, "enable-icmp"))
303 } 369 {
304 else if (!strcmp (var, "can-send-rawip")) 370#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
372#endif
305 { 373 }
306 u8 v; parse_bool (v, "can-send-rawip", PROT_IPv4, 0); node->can_send = (node->can_send & ~PROT_IPv4) | v; 374 else if (!strcmp (var, "enable-udp"))
307 } 375 {
308 else if (!strcmp (var, "can-recv-rawip")) 376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
309 { 377 }
378 else if (!strcmp (var, "enable-rawip"))
379 {
310 u8 v; parse_bool (v, "can-recv-rawip", PROT_IPv4, 0); node->can_recv = (node->can_recv & ~PROT_IPv4) | v; 380 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
311 } 381 }
312 382
313 // unknown or misplaced 383 // unknown or misplaced
314 else 384 else
315 {
316 slog (L_WARN, 385 slog (L_WARN,
317 _("unknown or misplaced variable `%s', at '%s' line %d"), 386 _("unknown or misplaced variable `%s', at '%s' line %d"),
318 var, fname, lineno); 387 var, fname, lineno);
319 }
320 } 388 }
321 389
322 fclose (f); 390 fclose (f);
323 } 391 }
324 else 392 else
325 { 393 {
326 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));
327 exit (1); 395 exit (EXIT_FAILURE);
328 } 396 }
329 397
330 free (fname); 398 free (fname);
331 399
332 fname = config_filename (prikeyfile, "hostkey"); 400 fname = config_filename (prikeyfile, "hostkey");
… …
338 406
339 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 407 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
340 { 408 {
341 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 409 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
342 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));
343 exit (1); 411 exit (EXIT_FAILURE);
344 } 412 }
345 413
346 RSA_blinding_on (rsa_key, 0); 414 require (RSA_blinding_on (rsa_key, 0));
347 415
348 fclose (f); 416 fclose (f);
349 } 417 }
350 else 418 else
351 { 419 {
352 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));
353 421
354 if (need_keys) 422 if (need_keys)
355 exit (1); 423 exit (EXIT_FAILURE);
356 } 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 }
357 433
358 free (fname); 434 free (fname);
359} 435}
360 436
361char *configuration::config_filename (const char *name, const char *dflt) 437char *configuration::config_filename (const char *name, const char *dflt)
… …
383 printf (_("MTU: %d\n"), mtu); 459 printf (_("MTU: %d\n"), mtu);
384 printf (_("rekeying interval: %d\n"), rekey); 460 printf (_("rekeying interval: %d\n"), rekey);
385 printf (_("keepalive interval: %d\n"), keepalive); 461 printf (_("keepalive interval: %d\n"), keepalive);
386 printf (_("interface: %s\n"), ifname); 462 printf (_("interface: %s\n"), ifname);
387 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 463 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
388 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);
389 printf ("\n"); 465 printf ("\n");
390 466
391 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 467 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
392 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 468 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
393 469
… …
395 (*i)->print (); 471 (*i)->print ();
396 472
397 printf ("\n"); 473 printf ("\n");
398} 474}
399 475
400void 476configuration::configuration ()
401conf_node::print ()
402{ 477{
403 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 478 init ();
404 id,
405 id >> 8, id & 0xff,
406 compress ? 'Y' : 'N',
407 connectmode == C_ONDEMAND ? "ondemand" :
408 connectmode == C_NEVER ? "never" :
409 connectmode == C_ALWAYS ? "always" : "",
410 nodename,
411 hostname ? hostname : "",
412 hostname ? ":" : "",
413 hostname ? udp_port : 0
414 );
415} 479}
416 480
481configuration::~configuration ()
482{
483 cleanup ();
484}
485
486

Diff Legend

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