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.16 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.28 by pcg, Tue Mar 1 04:38:21 2005 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 <arpa/inet.h>
38#ifdef ENABLE_ICMP
39# ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41# endif
42# ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44# endif
45# include <netinet/ip_icmp.h>
46#endif
47 33
48#include <openssl/err.h> 34#include <openssl/err.h>
49#include <openssl/pem.h> 35#include <openssl/pem.h>
50#include <openssl/rsa.h> 36#include <openssl/rsa.h>
51#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
52 39
53#include "gettext.h" 40#include "gettext.h"
54 41
55#include "conf.h" 42#include "conf.h"
56#include "slog.h" 43#include "slog.h"
57#include "util.h" 44#include "util.h"
58 45
59char *confbase; 46char *confbase;
60char *thisnode; 47char *thisnode;
61char *identname; 48char *identname;
62char *pidfilename;
63 49
64struct configuration conf; 50struct configuration conf;
65 51
66u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
67{ 53{
68 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
69 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
70 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
71 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
72 59
73 return 0; 60 return 0;
74} 61}
75 62
76const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
77{ 64{
78 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
80 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
82 70
83 return "<unknown>"; 71 return "<unknown>";
84} 72}
85 73
86void 74void
… …
105 if (rsa_key) 93 if (rsa_key)
106 RSA_free (rsa_key); 94 RSA_free (rsa_key);
107 95
108 free (nodename); 96 free (nodename);
109 free (hostname); 97 free (hostname);
98 free (domain);
110} 99}
111 100
112void configuration::init () 101void configuration::init ()
113{ 102{
114 memset (this, 0, sizeof (*this)); 103 memset (this, 0, sizeof (*this));
115 104
105 mtu = DEFAULT_MTU;
116 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
117 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
118 llevel = L_INFO; 108 llevel = L_INFO;
119 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP 110#if ENABLE_ICMP
121 icmp_type = ICMP_ECHOREPLY; 111 icmp_type = ICMP_ECHOREPLY;
122#endif 112#endif
123 113
124 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
125 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
126 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
127 default_node.compress = true; 117 default_node.compress = true;
128 default_node.protocols = PROT_UDPv4; 118 default_node.protocols = PROT_UDPv4;
119 default_node.max_retry = DEFAULT_MAX_RETRY;
120
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
129} 122}
130 123
131void configuration::cleanup() 124void configuration::cleanup()
132{ 125{
133 if (rsa_key) 126 if (rsa_key)
134 RSA_free (rsa_key); 127 RSA_free (rsa_key);
135 128
136 rsa_key = 0; 129 rsa_key = 0;
137 130
131 free (pidfilename); pidfilename = 0;
138 free (ifname); ifname = 0; 132 free (ifname); ifname = 0;
139#if ENABLE_HTTP_PROXY 133#if ENABLE_HTTP_PROXY
140 free (proxy_host); proxy_host = 0; 134 free (proxy_host); proxy_host = 0;
141 free (proxy_auth); proxy_auth = 0; 135 free (proxy_auth); proxy_auth = 0;
136#endif
137#if ENABLE_DNS
138 free (dns_forw_host); dns_forw_host = 0;
142#endif 139#endif
143} 140}
144 141
145void 142void
146configuration::clear_config () 143configuration::clear_config ()
… …
171 char *fname; 168 char *fname;
172 FILE *f; 169 FILE *f;
173 170
174 clear_config (); 171 clear_config ();
175 172
176 asprintf (&fname, "%s/vped.conf", confbase); 173 asprintf (&fname, "%s/gvpe.conf", confbase);
177 f = fopen (fname, "r"); 174 f = fopen (fname, "r");
178 175
179 if (f) 176 if (f)
180 { 177 {
181 char line[16384]; 178 char line[16384];
… …
238 else 235 else
239 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 236 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
240 } 237 }
241 else if (!strcmp (var, "ip-proto")) 238 else if (!strcmp (var, "ip-proto"))
242 ip_proto = atoi (val); 239 ip_proto = atoi (val);
240 else if (!strcmp (var, "icmp-type"))
241 {
243#if ENABLE_ICMP 242#if ENABLE_ICMP
244 //TODO: error message
245 else if (!strcmp (var, "icmp-type"))
246 icmp_type = atoi (val); 243 icmp_type = atoi (val);
247#endif 244#endif
245 }
248 246
249 // per config 247 // per config
250 else if (!strcmp (var, "node")) 248 else if (!strcmp (var, "node"))
251 { 249 {
252 default_node.id++; 250 default_node.id++;
… …
270 268
271 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 269 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
272 { 270 {
273 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 271 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
274 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 272 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
275 exit (1); 273 exit (EXIT_FAILURE);
276 } 274 }
277 275
278 RSA_blinding_on (node->rsa_key, 0); 276 require (RSA_blinding_on (node->rsa_key, 0));
279 277
280 fclose (f); 278 fclose (f);
281 } 279 }
282 else 280 else
283 { 281 {
284 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 282 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
285 283
286 if (need_keys) 284 if (need_keys)
287 exit (1); 285 exit (EXIT_FAILURE);
288 } 286 }
289 287
290 free (fname); 288 free (fname);
291 } 289 }
292 290
293 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 291 if (::thisnode && !strcmp (node->nodename, ::thisnode))
294 thisnode = node; 292 thisnode = node;
295 } 293 }
296 else if (!strcmp (var, "private-key")) 294 else if (!strcmp (var, "private-key"))
297 prikeyfile = strdup (val); 295 free (prikeyfile), prikeyfile = strdup (val);
298 else if (!strcmp (var, "ifpersist")) 296 else if (!strcmp (var, "ifpersist"))
299 { 297 {
300 parse_bool (ifpersist, "ifpersist", true, false); 298 parse_bool (ifpersist, "ifpersist", true, false);
301 } 299 }
302 else if (!strcmp (var, "ifname")) 300 else if (!strcmp (var, "ifname"))
303 ifname = strdup (val); 301 free (ifname), ifname = strdup (val);
304 else if (!strcmp (var, "rekey")) 302 else if (!strcmp (var, "rekey"))
305 rekey = atoi (val); 303 rekey = atoi (val);
306 else if (!strcmp (var, "keepalive")) 304 else if (!strcmp (var, "keepalive"))
307 keepalive = atoi (val); 305 keepalive = atoi (val);
308 else if (!strcmp (var, "mtu")) 306 else if (!strcmp (var, "mtu"))
309 mtu = atoi (val); 307 mtu = atoi (val);
310 else if (!strcmp (var, "if-up")) 308 else if (!strcmp (var, "if-up"))
311 script_if_up = strdup (val); 309 free (script_if_up), script_if_up = strdup (val);
312 else if (!strcmp (var, "node-up")) 310 else if (!strcmp (var, "node-up"))
313 script_node_up = strdup (val); 311 free (script_node_up), script_node_up = strdup (val);
314 else if (!strcmp (var, "node-down")) 312 else if (!strcmp (var, "node-down"))
315 script_node_down = strdup (val); 313 free (script_node_down), script_node_down = strdup (val);
314 else if (!strcmp (var, "pid-file"))
315 free (pidfilename), pidfilename = strdup (val);
316 else if (!strcmp (var, "dns-forwarder-host"))
317 {
318#if ENABLE_DNS
319 free (dns_forw_host), dns_forw_host = strdup (val);
320#endif
321 }
322 else if (!strcmp (var, "dns-forwarder-port"))
323 {
324#if ENABLE_DNS
325 dns_forw_port = atoi (val);
326#endif
327 }
328 else if (!strcmp (var, "http-proxy-host"))
329 {
316#if ENABLE_HTTP_PROXY 330#if ENABLE_HTTP_PROXY
317 else if (!strcmp (var, "http-proxy-host"))
318 proxy_host = strdup (val); 331 free (proxy_host), proxy_host = strdup (val);
332#endif
333 }
319 else if (!strcmp (var, "http-proxy-port")) 334 else if (!strcmp (var, "http-proxy-port"))
335 {
336#if ENABLE_HTTP_PROXY
320 proxy_port = atoi (val); 337 proxy_port = atoi (val);
338#endif
339 }
321 else if (!strcmp (var, "http-proxy-auth")) 340 else if (!strcmp (var, "http-proxy-auth"))
341 {
342#if ENABLE_HTTP_PROXY
322 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 343 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
323#endif 344#endif
345 }
324 346
325 /* node-specific, non-defaultable */ 347 /* node-specific, non-defaultable */
326 else if (node != &default_node && !strcmp (var, "hostname")) 348 else if (node != &default_node && !strcmp (var, "hostname"))
327 {
328 free (node->hostname);
329 node->hostname = strdup (val); 349 free (node->hostname), node->hostname = strdup (val);
330 }
331 350
332 /* node-specific, defaultable */ 351 /* node-specific, defaultable */
333 else if (!strcmp (var, "udp-port")) 352 else if (!strcmp (var, "udp-port"))
334 node->udp_port = atoi (val); 353 node->udp_port = atoi (val);
335 else if (!strcmp (var, "tcp-port")) 354 else if (!strcmp (var, "tcp-port"))
336 node->tcp_port = atoi (val); 355 node->tcp_port = atoi (val);
356 else if (!strcmp (var, "dns-port"))
357 {
358#if ENABLE_DNS
359 node->dns_port = atoi (val);
360#endif
361 }
362 else if (!strcmp (var, "dns-domain"))
363 {
364#if ENABLE_DNS
365 free (node->domain), node->domain = strdup (val);
366#endif
367 }
337 else if (!strcmp (var, "router-priority")) 368 else if (!strcmp (var, "router-priority"))
338 node->routerprio = atoi (val); 369 node->routerprio = atoi (val);
370 else if (!strcmp (var, "max-retry"))
371 node->max_retry = atoi (val);
339 else if (!strcmp (var, "connect")) 372 else if (!strcmp (var, "connect"))
340 { 373 {
341 if (!strcmp (val, "ondemand")) 374 if (!strcmp (val, "ondemand"))
342 node->connectmode = conf_node::C_ONDEMAND; 375 node->connectmode = conf_node::C_ONDEMAND;
343 else if (!strcmp (val, "never")) 376 else if (!strcmp (val, "never"))
… …
346 node->connectmode = conf_node::C_ALWAYS; 379 node->connectmode = conf_node::C_ALWAYS;
347 else if (!strcmp (val, "disabled")) 380 else if (!strcmp (val, "disabled"))
348 node->connectmode = conf_node::C_DISABLED; 381 node->connectmode = conf_node::C_DISABLED;
349 else 382 else
350 slog (L_WARN, 383 slog (L_WARN,
351 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 384 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
352 var, fname, lineno); 385 var, fname, lineno);
353 } 386 }
354 else if (!strcmp (var, "inherit-tos")) 387 else if (!strcmp (var, "inherit-tos"))
355 { 388 {
356 parse_bool (node->inherit_tos, "inherit-tos", true, false); 389 parse_bool (node->inherit_tos, "inherit-tos", true, false);
357 } 390 }
… …
368 } 401 }
369 else if (!strcmp (var, "enable-icmp")) 402 else if (!strcmp (var, "enable-icmp"))
370 { 403 {
371#if ENABLE_ICMP 404#if ENABLE_ICMP
372 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 405 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
406#endif
407 }
408 else if (!strcmp (var, "enable-dns"))
409 {
410#if ENABLE_DNS
411 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
373#endif 412#endif
374 } 413 }
375 else if (!strcmp (var, "enable-udp")) 414 else if (!strcmp (var, "enable-udp"))
376 { 415 {
377 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 416 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
391 fclose (f); 430 fclose (f);
392 } 431 }
393 else 432 else
394 { 433 {
395 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 434 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
396 exit (1); 435 exit (EXIT_FAILURE);
397 } 436 }
398 437
399 free (fname); 438 free (fname);
400 439
401 fname = config_filename (prikeyfile, "hostkey"); 440 fname = config_filename (prikeyfile, "hostkey");
… …
407 446
408 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 447 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
409 { 448 {
410 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 449 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
411 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 450 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
412 exit (1); 451 exit (EXIT_FAILURE);
413 } 452 }
414 453
415 RSA_blinding_on (rsa_key, 0); 454 require (RSA_blinding_on (rsa_key, 0));
416 455
417 fclose (f); 456 fclose (f);
418 } 457 }
419 else 458 else
420 { 459 {
421 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 460 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
422 461
423 if (need_keys) 462 if (need_keys)
424 exit (1); 463 exit (EXIT_FAILURE);
425 } 464 }
465
466 if (need_keys && ::thisnode
467 && rsa_key && thisnode && thisnode->rsa_key)
468 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
469 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
470 {
471 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
472 exit (EXIT_FAILURE);
473 }
426 474
427 free (fname); 475 free (fname);
428} 476}
429 477
430char *configuration::config_filename (const char *name, const char *dflt) 478char *configuration::config_filename (const char *name, const char *dflt)
… …
466 printf ("\n"); 514 printf ("\n");
467} 515}
468 516
469configuration::configuration () 517configuration::configuration ()
470{ 518{
519 asprintf (&confbase, "%s/gvpe", CONFDIR);
520
471 init (); 521 init ();
472} 522}
473 523
474configuration::~configuration () 524configuration::~configuration ()
475{ 525{

Diff Legend

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