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.14 by pcg, Tue Apr 8 03:25:35 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#include <netinet/ip_icmp.h>
38 33
39#include <openssl/err.h> 34#include <openssl/err.h>
40#include <openssl/pem.h> 35#include <openssl/pem.h>
41#include <openssl/rsa.h> 36#include <openssl/rsa.h>
42#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
43 39
44#include "gettext.h" 40#include "gettext.h"
45 41
46#include "conf.h" 42#include "conf.h"
47#include "slog.h" 43#include "slog.h"
48#include "util.h" 44#include "util.h"
49 45
50char *confbase; 46char *confbase;
51char *thisnode; 47char *thisnode;
52char *identname; 48char *identname;
53char *pidfilename;
54 49
55struct configuration conf; 50struct configuration conf;
56 51
57u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
58{ 53{
59 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
60 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
61 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
62 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
63 59
64 return 0; 60 return 0;
65} 61}
66 62
67const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
68{ 64{
69 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
70 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
71 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
72 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
73 70
74 return "<unknown>"; 71 return "<unknown>";
75} 72}
76 73
77void 74void
… …
102 99
103void configuration::init () 100void configuration::init ()
104{ 101{
105 memset (this, 0, sizeof (*this)); 102 memset (this, 0, sizeof (*this));
106 103
104 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 105 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 106 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 107 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 108 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 110 icmp_type = ICMP_ECHOREPLY;
111#endif
112 112
113 default_node.udp_port = DEFAULT_UDPPORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 116 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 117 default_node.protocols = PROT_UDPv4;
118} 118}
119 119
… …
122 if (rsa_key) 122 if (rsa_key)
123 RSA_free (rsa_key); 123 RSA_free (rsa_key);
124 124
125 rsa_key = 0; 125 rsa_key = 0;
126 126
127 free (pidfilename); pidfilename = 0;
127 free (ifname); ifname = 0; 128 free (ifname); ifname = 0;
128#if ENABLE_HTTP_PROXY 129#if ENABLE_HTTP_PROXY
129 free (proxy_host); proxy_host = 0; 130 free (proxy_host); proxy_host = 0;
130 free (proxy_auth); proxy_auth = 0; 131 free (proxy_auth); proxy_auth = 0;
131#endif 132#endif
132} 133}
133 134
134void 135void
135configuration::clear_config () 136configuration::clear_config ()
… …
228 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);
229 } 230 }
230 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val); 232 ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 233 else if (!strcmp (var, "icmp-type"))
234 {
235#if ENABLE_ICMP
233 icmp_type = atoi (val); 236 icmp_type = atoi (val);
237#endif
238 }
234 239
235 // per config 240 // per config
236 else if (!strcmp (var, "node")) 241 else if (!strcmp (var, "node"))
237 { 242 {
238 default_node.id++; 243 default_node.id++;
… …
256 261
257 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 262 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
258 { 263 {
259 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 264 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
260 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));
261 exit (1); 266 exit (EXIT_FAILURE);
262 } 267 }
263 268
264 RSA_blinding_on (node->rsa_key, 0); 269 require (RSA_blinding_on (node->rsa_key, 0));
265 270
266 fclose (f); 271 fclose (f);
267 } 272 }
268 else 273 else
269 { 274 {
270 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));
271 276
272 if (need_keys) 277 if (need_keys)
273 exit (1); 278 exit (EXIT_FAILURE);
274 } 279 }
275 280
276 free (fname); 281 free (fname);
277 } 282 }
278 283
279 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 284 if (::thisnode && !strcmp (node->nodename, ::thisnode))
280 thisnode = node; 285 thisnode = node;
281 } 286 }
282 else if (!strcmp (var, "private-key")) 287 else if (!strcmp (var, "private-key"))
283 prikeyfile = strdup (val); 288 free (prikeyfile), prikeyfile = strdup (val);
284 else if (!strcmp (var, "ifpersist")) 289 else if (!strcmp (var, "ifpersist"))
285 { 290 {
286 parse_bool (ifpersist, "ifpersist", true, false); 291 parse_bool (ifpersist, "ifpersist", true, false);
287 } 292 }
288 else if (!strcmp (var, "ifname")) 293 else if (!strcmp (var, "ifname"))
289 ifname = strdup (val); 294 free (ifname), ifname = strdup (val);
290 else if (!strcmp (var, "rekey")) 295 else if (!strcmp (var, "rekey"))
291 rekey = atoi (val); 296 rekey = atoi (val);
292 else if (!strcmp (var, "keepalive")) 297 else if (!strcmp (var, "keepalive"))
293 keepalive = atoi (val); 298 keepalive = atoi (val);
294 else if (!strcmp (var, "mtu")) 299 else if (!strcmp (var, "mtu"))
295 mtu = atoi (val); 300 mtu = atoi (val);
296 else if (!strcmp (var, "if-up")) 301 else if (!strcmp (var, "if-up"))
297 script_if_up = strdup (val); 302 free (script_if_up), script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up")) 303 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val); 304 free (script_node_up), script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down")) 305 else if (!strcmp (var, "node-down"))
301 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 {
302#if ENABLE_HTTP_PROXY 311#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 312 free (proxy_host), proxy_host = strdup (val);
313#endif
314 }
305 else if (!strcmp (var, "http-proxy-port")) 315 else if (!strcmp (var, "http-proxy-port"))
316 {
317#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 318 proxy_port = atoi (val);
319#endif
320 }
307 else if (!strcmp (var, "http-proxy-auth")) 321 else if (!strcmp (var, "http-proxy-auth"))
322 {
323#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 324 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 325#endif
326 }
310 327
311 /* node-specific, non-defaultable */ 328 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 329 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val); 330 free (node->hostname), node->hostname = strdup (val);
316 }
317 331
318 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val); 334 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port")) 335 else if (!strcmp (var, "tcp-port"))
322 node->tcp_port = atoi (val); 336 node->tcp_port = atoi (val);
337 else if (!strcmp (var, "dns-port"))
338 node->dns_port = atoi (val);
323 else if (!strcmp (var, "router-priority")) 339 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val); 340 node->routerprio = atoi (val);
325 else if (!strcmp (var, "connect")) 341 else if (!strcmp (var, "connect"))
326 { 342 {
327 if (!strcmp (val, "ondemand")) 343 if (!strcmp (val, "ondemand"))
… …
356 { 372 {
357#if ENABLE_ICMP 373#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 374 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
359#endif 375#endif
360 } 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 }
361 else if (!strcmp (var, "enable-udp")) 383 else if (!strcmp (var, "enable-udp"))
362 { 384 {
363 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;
364 } 386 }
365 else if (!strcmp (var, "enable-rawip")) 387 else if (!strcmp (var, "enable-rawip"))
366 { 388 {;
367 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;
368 } 390 }
369 391
370 // unknown or misplaced 392 // unknown or misplaced
371 else 393 else
… …
377 fclose (f); 399 fclose (f);
378 } 400 }
379 else 401 else
380 { 402 {
381 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));
382 exit (1); 404 exit (EXIT_FAILURE);
383 } 405 }
384 406
385 free (fname); 407 free (fname);
386 408
387 fname = config_filename (prikeyfile, "hostkey"); 409 fname = config_filename (prikeyfile, "hostkey");
… …
393 415
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 416 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
395 { 417 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 418 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
397 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));
398 exit (1); 420 exit (EXIT_FAILURE);
399 } 421 }
400 422
401 RSA_blinding_on (rsa_key, 0); 423 require (RSA_blinding_on (rsa_key, 0));
402 424
403 fclose (f); 425 fclose (f);
404 } 426 }
405 else 427 else
406 { 428 {
407 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));
408 430
409 if (need_keys) 431 if (need_keys)
410 exit (1); 432 exit (EXIT_FAILURE);
411 } 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 }
412 443
413 free (fname); 444 free (fname);
414} 445}
415 446
416char *configuration::config_filename (const char *name, const char *dflt) 447char *configuration::config_filename (const char *name, const char *dflt)
… …
438 printf (_("MTU: %d\n"), mtu); 469 printf (_("MTU: %d\n"), mtu);
439 printf (_("rekeying interval: %d\n"), rekey); 470 printf (_("rekeying interval: %d\n"), rekey);
440 printf (_("keepalive interval: %d\n"), keepalive); 471 printf (_("keepalive interval: %d\n"), keepalive);
441 printf (_("interface: %s\n"), ifname); 472 printf (_("interface: %s\n"), ifname);
442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 473 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
443 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);
444 printf ("\n"); 475 printf ("\n");
445 476
446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 477 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 478 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
448 479

Diff Legend

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