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.24 by pcg, Fri Apr 2 14:42:45 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;
95} 118}
96 119
97void configuration::cleanup() 120void configuration::cleanup()
98{ 121{
99 if (rsa_key) 122 if (rsa_key)
100 RSA_free (rsa_key); 123 RSA_free (rsa_key);
101 124
102 free (ifname);
103
104 rsa_key = 0; 125 rsa_key = 0;
105 ifname = 0; 126
127 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0;
132#endif
106} 133}
107 134
108void 135void
109configuration::clear_config () 136configuration::clear_config ()
110{ 137{
… …
201 else 228 else
202 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
203 } 230 }
204 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
205 ip_proto = atoi (val); 232 ip_proto = atoi (val);
233 else if (!strcmp (var, "icmp-type"))
234 {
235#if ENABLE_ICMP
236 icmp_type = atoi (val);
237#endif
238 }
206 239
207 // per config 240 // per config
208 else if (!strcmp (var, "node")) 241 else if (!strcmp (var, "node"))
209 { 242 {
210 default_node.id++; 243 default_node.id++;
… …
228 261
229 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 262 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
230 { 263 {
231 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 264 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)); 265 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
233 exit (1); 266 exit (EXIT_FAILURE);
234 } 267 }
235 268
236 RSA_blinding_on (node->rsa_key, 0); 269 require (RSA_blinding_on (node->rsa_key, 0));
237 270
238 fclose (f); 271 fclose (f);
239 } 272 }
240 else 273 else
241 { 274 {
242 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 275 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
243 276
244 if (need_keys) 277 if (need_keys)
245 exit (1); 278 exit (EXIT_FAILURE);
246 } 279 }
247 280
248 free (fname); 281 free (fname);
249 } 282 }
250 283
251 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 284 if (::thisnode && !strcmp (node->nodename, ::thisnode))
252 thisnode = node; 285 thisnode = node;
253 } 286 }
254 else if (!strcmp (var, "private-key")) 287 else if (!strcmp (var, "private-key"))
255 prikeyfile = strdup (val); 288 free (prikeyfile), prikeyfile = strdup (val);
256 else if (!strcmp (var, "ifpersist")) 289 else if (!strcmp (var, "ifpersist"))
257 { 290 {
258 parse_bool (ifpersist, "ifpersist", true, false); 291 parse_bool (ifpersist, "ifpersist", true, false);
259 } 292 }
260 else if (!strcmp (var, "ifname")) 293 else if (!strcmp (var, "ifname"))
261 ifname = strdup (val); 294 free (ifname), ifname = strdup (val);
262 else if (!strcmp (var, "rekey")) 295 else if (!strcmp (var, "rekey"))
263 rekey = atoi (val); 296 rekey = atoi (val);
264 else if (!strcmp (var, "keepalive")) 297 else if (!strcmp (var, "keepalive"))
265 keepalive = atoi (val); 298 keepalive = atoi (val);
266 else if (!strcmp (var, "mtu")) 299 else if (!strcmp (var, "mtu"))
267 mtu = atoi (val); 300 mtu = atoi (val);
268 else if (!strcmp (var, "if-up")) 301 else if (!strcmp (var, "if-up"))
269 script_if_up = strdup (val); 302 free (script_if_up), script_if_up = strdup (val);
270 else if (!strcmp (var, "node-up")) 303 else if (!strcmp (var, "node-up"))
271 script_node_up = strdup (val); 304 free (script_node_up), script_node_up = strdup (val);
272 else if (!strcmp (var, "node-down")) 305 else if (!strcmp (var, "node-down"))
273 script_node_down = strdup (val); 306 free (script_node_down), script_node_down = strdup (val);
307 else if (!strcmp (var, "pid-file"))
308 free (pidfilename), pidfilename = strdup (val);
309 else if (!strcmp (var, "http-proxy-host"))
310 {
311#if ENABLE_HTTP_PROXY
312 free (proxy_host), proxy_host = strdup (val);
313#endif
314 }
315 else if (!strcmp (var, "http-proxy-port"))
316 {
317#if ENABLE_HTTP_PROXY
318 proxy_port = atoi (val);
319#endif
320 }
321 else if (!strcmp (var, "http-proxy-auth"))
322 {
323#if ENABLE_HTTP_PROXY
324 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
325#endif
326 }
274 327
275 /* node-specific, non-defaultable */ 328 /* node-specific, non-defaultable */
276 else if (node != &default_node && !strcmp (var, "hostname")) 329 else if (node != &default_node && !strcmp (var, "hostname"))
277 {
278 free (node->hostname);
279 node->hostname = strdup (val); 330 free (node->hostname), node->hostname = strdup (val);
280 }
281 331
282 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
283 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
284 node->udp_port = atoi (val); 334 node->udp_port = atoi (val);
335 else if (!strcmp (var, "tcp-port"))
336 node->tcp_port = atoi (val);
337 else if (!strcmp (var, "dns-port"))
338 node->dns_port = atoi (val);
285 else if (!strcmp (var, "router-priority")) 339 else if (!strcmp (var, "router-priority"))
286 node->routerprio = atoi (val); 340 node->routerprio = atoi (val);
287 else if (!strcmp (var, "connect")) 341 else if (!strcmp (var, "connect"))
288 { 342 {
289 if (!strcmp (val, "ondemand")) 343 if (!strcmp (val, "ondemand"))
… …
306 else if (!strcmp (var, "compress")) 360 else if (!strcmp (var, "compress"))
307 { 361 {
308 parse_bool (node->compress, "compress", true, false); 362 parse_bool (node->compress, "compress", true, false);
309 } 363 }
310 // all these bool options really really cost a lot of executable size! 364 // all these bool options really really cost a lot of executable size!
365 else if (!strcmp (var, "enable-tcp"))
366 {
367#if ENABLE_TCP
368 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
369#endif
370 }
371 else if (!strcmp (var, "enable-icmp"))
372 {
373#if ENABLE_ICMP
374 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
375#endif
376 }
377 else if (!strcmp (var, "enable-dns"))
378 {
379#if ENABLE_DNS
380 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
381#endif
382 }
311 else if (!strcmp (var, "enable-udp")) 383 else if (!strcmp (var, "enable-udp"))
312 { 384 {
313 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 385 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
314 } 386 }
315 else if (!strcmp (var, "enable-rawip")) 387 else if (!strcmp (var, "enable-rawip"))
316 { 388 {;
317 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 389 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
318 } 390 }
319 391
320 // unknown or misplaced 392 // unknown or misplaced
321 else 393 else
322 {
323 slog (L_WARN, 394 slog (L_WARN,
324 _("unknown or misplaced variable `%s', at '%s' line %d"), 395 _("unknown or misplaced variable `%s', at '%s' line %d"),
325 var, fname, lineno); 396 var, fname, lineno);
326 }
327 } 397 }
328 398
329 fclose (f); 399 fclose (f);
330 } 400 }
331 else 401 else
332 { 402 {
333 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 403 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
334 exit (1); 404 exit (EXIT_FAILURE);
335 } 405 }
336 406
337 free (fname); 407 free (fname);
338 408
339 fname = config_filename (prikeyfile, "hostkey"); 409 fname = config_filename (prikeyfile, "hostkey");
… …
345 415
346 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 416 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
347 { 417 {
348 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 418 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)); 419 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
350 exit (1); 420 exit (EXIT_FAILURE);
351 } 421 }
352 422
353 RSA_blinding_on (rsa_key, 0); 423 require (RSA_blinding_on (rsa_key, 0));
354 424
355 fclose (f); 425 fclose (f);
356 } 426 }
357 else 427 else
358 { 428 {
359 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 429 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
360 430
361 if (need_keys) 431 if (need_keys)
362 exit (1); 432 exit (EXIT_FAILURE);
363 } 433 }
434
435 if (need_keys && ::thisnode
436 && rsa_key && thisnode && thisnode->rsa_key)
437 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
438 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
439 {
440 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
441 exit (EXIT_FAILURE);
442 }
364 443
365 free (fname); 444 free (fname);
366} 445}
367 446
368char *configuration::config_filename (const char *name, const char *dflt) 447char *configuration::config_filename (const char *name, const char *dflt)
… …
390 printf (_("MTU: %d\n"), mtu); 469 printf (_("MTU: %d\n"), mtu);
391 printf (_("rekeying interval: %d\n"), rekey); 470 printf (_("rekeying interval: %d\n"), rekey);
392 printf (_("keepalive interval: %d\n"), keepalive); 471 printf (_("keepalive interval: %d\n"), keepalive);
393 printf (_("interface: %s\n"), ifname); 472 printf (_("interface: %s\n"), ifname);
394 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 473 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
395 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 474 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
396 printf ("\n"); 475 printf ("\n");
397 476
398 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 477 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
399 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 478 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
400 479
… …
402 (*i)->print (); 481 (*i)->print ();
403 482
404 printf ("\n"); 483 printf ("\n");
405} 484}
406 485
407void 486configuration::configuration ()
408conf_node::print ()
409{ 487{
410 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 488 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} 489}
423 490
491configuration::~configuration ()
492{
493 cleanup ();
494}
495
496

Diff Legend

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