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.12 by pcg, Mon Apr 7 01:12:56 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 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
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";
69 if (protocol & PROT_DNSv4 ) return "dns";
70 70
71 return "<unknown>"; 71 return "<unknown>";
72} 72}
73 73
74void 74void
… …
99 99
100void configuration::init () 100void configuration::init ()
101{ 101{
102 memset (this, 0, sizeof (*this)); 102 memset (this, 0, sizeof (*this));
103 103
104 mtu = DEFAULT_MTU;
104 rekey = DEFAULT_REKEY; 105 rekey = DEFAULT_REKEY;
105 keepalive = DEFAULT_KEEPALIVE; 106 keepalive = DEFAULT_KEEPALIVE;
106 llevel = L_INFO; 107 llevel = L_INFO;
107 ip_proto = IPPROTO_GRE; 108 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP
110 icmp_type = ICMP_ECHOREPLY;
111#endif
108 112
109 default_node.udp_port = DEFAULT_UDPPORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
110 default_node.tcp_port = DEFAULT_UDPPORT; 114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
111 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
112 default_node.compress = true; 116 default_node.compress = true;
113 default_node.protocols = PROT_UDPv4; 117 default_node.protocols = PROT_UDPv4;
114} 118}
115 119
… …
118 if (rsa_key) 122 if (rsa_key)
119 RSA_free (rsa_key); 123 RSA_free (rsa_key);
120 124
121 rsa_key = 0; 125 rsa_key = 0;
122 126
127 free (pidfilename); pidfilename = 0;
123 free (ifname); ifname = 0; 128 free (ifname); ifname = 0;
124#if ENABLE_HTTP_PROXY 129#if ENABLE_HTTP_PROXY
125 free (proxy_host); proxy_host = 0; 130 free (proxy_host); proxy_host = 0;
126 free (proxy_auth); proxy_auth = 0; 131 free (proxy_auth); proxy_auth = 0;
127#endif 132#endif
128} 133}
129 134
130void 135void
131configuration::clear_config () 136configuration::clear_config ()
… …
223 else 228 else
224 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);
225 } 230 }
226 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
227 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 }
228 239
229 // per config 240 // per config
230 else if (!strcmp (var, "node")) 241 else if (!strcmp (var, "node"))
231 { 242 {
232 default_node.id++; 243 default_node.id++;
… …
250 261
251 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 262 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
252 { 263 {
253 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 264 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
254 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));
255 exit (1); 266 exit (EXIT_FAILURE);
256 } 267 }
257 268
258 RSA_blinding_on (node->rsa_key, 0); 269 require (RSA_blinding_on (node->rsa_key, 0));
259 270
260 fclose (f); 271 fclose (f);
261 } 272 }
262 else 273 else
263 { 274 {
264 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));
265 276
266 if (need_keys) 277 if (need_keys)
267 exit (1); 278 exit (EXIT_FAILURE);
268 } 279 }
269 280
270 free (fname); 281 free (fname);
271 } 282 }
272 283
273 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 284 if (::thisnode && !strcmp (node->nodename, ::thisnode))
274 thisnode = node; 285 thisnode = node;
275 } 286 }
276 else if (!strcmp (var, "private-key")) 287 else if (!strcmp (var, "private-key"))
277 prikeyfile = strdup (val); 288 free (prikeyfile), prikeyfile = strdup (val);
278 else if (!strcmp (var, "ifpersist")) 289 else if (!strcmp (var, "ifpersist"))
279 { 290 {
280 parse_bool (ifpersist, "ifpersist", true, false); 291 parse_bool (ifpersist, "ifpersist", true, false);
281 } 292 }
282 else if (!strcmp (var, "ifname")) 293 else if (!strcmp (var, "ifname"))
283 ifname = strdup (val); 294 free (ifname), ifname = strdup (val);
284 else if (!strcmp (var, "rekey")) 295 else if (!strcmp (var, "rekey"))
285 rekey = atoi (val); 296 rekey = atoi (val);
286 else if (!strcmp (var, "keepalive")) 297 else if (!strcmp (var, "keepalive"))
287 keepalive = atoi (val); 298 keepalive = atoi (val);
288 else if (!strcmp (var, "mtu")) 299 else if (!strcmp (var, "mtu"))
289 mtu = atoi (val); 300 mtu = atoi (val);
290 else if (!strcmp (var, "if-up")) 301 else if (!strcmp (var, "if-up"))
291 script_if_up = strdup (val); 302 free (script_if_up), script_if_up = strdup (val);
292 else if (!strcmp (var, "node-up")) 303 else if (!strcmp (var, "node-up"))
293 script_node_up = strdup (val); 304 free (script_node_up), script_node_up = strdup (val);
294 else if (!strcmp (var, "node-down")) 305 else if (!strcmp (var, "node-down"))
295 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 {
296#if ENABLE_HTTP_PROXY 311#if ENABLE_HTTP_PROXY
297 else if (!strcmp (var, "http-proxy-host"))
298 proxy_host = strdup (val); 312 free (proxy_host), proxy_host = strdup (val);
313#endif
314 }
299 else if (!strcmp (var, "http-proxy-port")) 315 else if (!strcmp (var, "http-proxy-port"))
316 {
317#if ENABLE_HTTP_PROXY
300 proxy_port = atoi (val); 318 proxy_port = atoi (val);
319#endif
320 }
301 else if (!strcmp (var, "http-proxy-auth")) 321 else if (!strcmp (var, "http-proxy-auth"))
322 {
323#if ENABLE_HTTP_PROXY
302 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 324 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
303#endif 325#endif
326 }
304 327
305 /* node-specific, non-defaultable */ 328 /* node-specific, non-defaultable */
306 else if (node != &default_node && !strcmp (var, "hostname")) 329 else if (node != &default_node && !strcmp (var, "hostname"))
307 {
308 free (node->hostname);
309 node->hostname = strdup (val); 330 free (node->hostname), node->hostname = strdup (val);
310 }
311 331
312 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
313 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
314 node->udp_port = atoi (val); 334 node->udp_port = atoi (val);
315 else if (!strcmp (var, "tcp-port")) 335 else if (!strcmp (var, "tcp-port"))
316 node->tcp_port = atoi (val); 336 node->tcp_port = atoi (val);
337 else if (!strcmp (var, "dns-port"))
338 node->dns_port = atoi (val);
317 else if (!strcmp (var, "router-priority")) 339 else if (!strcmp (var, "router-priority"))
318 node->routerprio = atoi (val); 340 node->routerprio = atoi (val);
319 else if (!strcmp (var, "connect")) 341 else if (!strcmp (var, "connect"))
320 { 342 {
321 if (!strcmp (val, "ondemand")) 343 if (!strcmp (val, "ondemand"))
… …
344 { 366 {
345#if ENABLE_TCP 367#if ENABLE_TCP
346 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 368 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
347#endif 369#endif
348 } 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 }
349 else if (!strcmp (var, "enable-udp")) 383 else if (!strcmp (var, "enable-udp"))
350 { 384 {
351 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;
352 } 386 }
353 else if (!strcmp (var, "enable-rawip")) 387 else if (!strcmp (var, "enable-rawip"))
354 { 388 {;
355 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;
356 } 390 }
357 391
358 // unknown or misplaced 392 // unknown or misplaced
359 else 393 else
… …
365 fclose (f); 399 fclose (f);
366 } 400 }
367 else 401 else
368 { 402 {
369 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));
370 exit (1); 404 exit (EXIT_FAILURE);
371 } 405 }
372 406
373 free (fname); 407 free (fname);
374 408
375 fname = config_filename (prikeyfile, "hostkey"); 409 fname = config_filename (prikeyfile, "hostkey");
… …
381 415
382 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 416 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
383 { 417 {
384 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 418 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
385 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));
386 exit (1); 420 exit (EXIT_FAILURE);
387 } 421 }
388 422
389 RSA_blinding_on (rsa_key, 0); 423 require (RSA_blinding_on (rsa_key, 0));
390 424
391 fclose (f); 425 fclose (f);
392 } 426 }
393 else 427 else
394 { 428 {
395 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));
396 430
397 if (need_keys) 431 if (need_keys)
398 exit (1); 432 exit (EXIT_FAILURE);
399 } 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 }
400 443
401 free (fname); 444 free (fname);
402} 445}
403 446
404char *configuration::config_filename (const char *name, const char *dflt) 447char *configuration::config_filename (const char *name, const char *dflt)
… …
426 printf (_("MTU: %d\n"), mtu); 469 printf (_("MTU: %d\n"), mtu);
427 printf (_("rekeying interval: %d\n"), rekey); 470 printf (_("rekeying interval: %d\n"), rekey);
428 printf (_("keepalive interval: %d\n"), keepalive); 471 printf (_("keepalive interval: %d\n"), keepalive);
429 printf (_("interface: %s\n"), ifname); 472 printf (_("interface: %s\n"), ifname);
430 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 473 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
431 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);
432 printf ("\n"); 475 printf ("\n");
433 476
434 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 477 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
435 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 478 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
436 479

Diff Legend

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