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.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.29 by pcg, Tue Mar 1 06:27:20 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.
… …
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;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
62 59
63 return 0; 60 return 0;
64} 61}
65 62
66const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
67{ 64{
68 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
70 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
72 70
73 return "<unknown>"; 71 return "<unknown>";
74} 72}
75 73
76void 74void
… …
95 if (rsa_key) 93 if (rsa_key)
96 RSA_free (rsa_key); 94 RSA_free (rsa_key);
97 95
98 free (nodename); 96 free (nodename);
99 free (hostname); 97 free (hostname);
98 free (domain);
100} 99}
101 100
102void configuration::init () 101void configuration::init ()
103{ 102{
104 memset (this, 0, sizeof (*this)); 103 memset (this, 0, sizeof (*this));
105 104
105 mtu = DEFAULT_MTU;
106 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
107 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
108 llevel = L_INFO; 108 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP 110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 111 icmp_type = ICMP_ECHOREPLY;
112#endif 112#endif
113 113
114 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 117 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 118 default_node.protocols = 0;
119 default_node.max_retry = DEFAULT_MAX_RETRY;
120
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119} 122}
120 123
121void configuration::cleanup() 124void configuration::cleanup()
122{ 125{
123 if (rsa_key) 126 if (rsa_key)
124 RSA_free (rsa_key); 127 RSA_free (rsa_key);
125 128
126 rsa_key = 0; 129 rsa_key = 0;
127 130
131 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 132 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 133#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 134 free (proxy_host); proxy_host = 0;
131 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;
132#endif 139#endif
133} 140}
134 141
135void 142void
136configuration::clear_config () 143configuration::clear_config ()
… …
161 char *fname; 168 char *fname;
162 FILE *f; 169 FILE *f;
163 170
164 clear_config (); 171 clear_config ();
165 172
166 asprintf (&fname, "%s/vped.conf", confbase); 173 asprintf (&fname, "%s/gvpe.conf", confbase);
167 f = fopen (fname, "r"); 174 f = fopen (fname, "r");
168 175
169 if (f) 176 if (f)
170 { 177 {
171 char line[16384]; 178 char line[16384];
… …
228 else 235 else
229 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);
230 } 237 }
231 else if (!strcmp (var, "ip-proto")) 238 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 239 ip_proto = atoi (val);
240 else if (!strcmp (var, "icmp-type"))
241 {
233#if ENABLE_ICMP 242#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 243 icmp_type = atoi (val);
237#endif 244#endif
245 }
238 246
239 // per config 247 // per config
240 else if (!strcmp (var, "node")) 248 else if (!strcmp (var, "node"))
241 { 249 {
242 default_node.id++; 250 default_node.id++;
… …
260 268
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 269 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 270 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 271 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
264 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));
265 exit (1); 273 exit (EXIT_FAILURE);
266 } 274 }
267 275
268 RSA_blinding_on (node->rsa_key, 0); 276 require (RSA_blinding_on (node->rsa_key, 0));
269 277
270 fclose (f); 278 fclose (f);
271 } 279 }
272 else 280 else
273 { 281 {
274 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));
275 283
276 if (need_keys) 284 if (need_keys)
277 exit (1); 285 exit (EXIT_FAILURE);
278 } 286 }
279 287
280 free (fname); 288 free (fname);
281 } 289 }
282 290
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 291 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 292 thisnode = node;
285 } 293 }
286 else if (!strcmp (var, "private-key")) 294 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 295 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 296 else if (!strcmp (var, "ifpersist"))
289 { 297 {
290 parse_bool (ifpersist, "ifpersist", true, false); 298 parse_bool (ifpersist, "ifpersist", true, false);
291 } 299 }
292 else if (!strcmp (var, "ifname")) 300 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 301 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 302 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 303 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 304 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 305 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 306 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 307 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 308 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 309 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 310 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 311 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 312 else if (!strcmp (var, "node-down"))
305 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-forw-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-forw-port"))
323 {
324#if ENABLE_DNS
325 dns_forw_port = atoi (val);
326#endif
327 }
328 else if (!strcmp (var, "http-proxy-host"))
329 {
306#if ENABLE_HTTP_PROXY 330#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 331 free (proxy_host), proxy_host = strdup (val);
332#endif
333 }
309 else if (!strcmp (var, "http-proxy-port")) 334 else if (!strcmp (var, "http-proxy-port"))
335 {
336#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 337 proxy_port = atoi (val);
338#endif
339 }
311 else if (!strcmp (var, "http-proxy-auth")) 340 else if (!strcmp (var, "http-proxy-auth"))
341 {
342#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 343 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 344#endif
345 }
314 346
315 /* node-specific, non-defaultable */ 347 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 348 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 349 free (node->hostname), node->hostname = strdup (val);
320 }
321 350
322 /* node-specific, defaultable */ 351 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 352 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 353 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 354 else if (!strcmp (var, "tcp-port"))
326 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 }
327 else if (!strcmp (var, "router-priority")) 368 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 369 node->routerprio = atoi (val);
370 else if (!strcmp (var, "max-retry"))
371 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 372 else if (!strcmp (var, "connect"))
330 { 373 {
331 if (!strcmp (val, "ondemand")) 374 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 375 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 376 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 379 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 380 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 381 node->connectmode = conf_node::C_DISABLED;
339 else 382 else
340 slog (L_WARN, 383 slog (L_WARN,
341 _("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"),
342 var, fname, lineno); 385 var, fname, lineno);
343 } 386 }
344 else if (!strcmp (var, "inherit-tos")) 387 else if (!strcmp (var, "inherit-tos"))
345 { 388 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 389 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 } 390 }
… …
358 } 401 }
359 else if (!strcmp (var, "enable-icmp")) 402 else if (!strcmp (var, "enable-icmp"))
360 { 403 {
361#if ENABLE_ICMP 404#if ENABLE_ICMP
362 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;
363#endif 412#endif
364 } 413 }
365 else if (!strcmp (var, "enable-udp")) 414 else if (!strcmp (var, "enable-udp"))
366 { 415 {
367 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;
… …
381 fclose (f); 430 fclose (f);
382 } 431 }
383 else 432 else
384 { 433 {
385 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));
386 exit (1); 435 exit (EXIT_FAILURE);
387 } 436 }
388 437
389 free (fname); 438 free (fname);
390 439
391 fname = config_filename (prikeyfile, "hostkey"); 440 fname = config_filename (prikeyfile, "hostkey");
… …
397 446
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 447 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 448 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 449 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
401 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));
402 exit (1); 451 exit (EXIT_FAILURE);
403 } 452 }
404 453
405 RSA_blinding_on (rsa_key, 0); 454 require (RSA_blinding_on (rsa_key, 0));
406 455
407 fclose (f); 456 fclose (f);
408 } 457 }
409 else 458 else
410 { 459 {
411 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));
412 461
413 if (need_keys) 462 if (need_keys)
414 exit (1); 463 exit (EXIT_FAILURE);
415 } 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 }
416 474
417 free (fname); 475 free (fname);
418} 476}
419 477
420char *configuration::config_filename (const char *name, const char *dflt) 478char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 514 printf ("\n");
457} 515}
458 516
459configuration::configuration () 517configuration::configuration ()
460{ 518{
519 asprintf (&confbase, "%s/gvpe", CONFDIR);
520
461 init (); 521 init ();
462} 522}
463 523
464configuration::~configuration () 524configuration::~configuration ()
465{ 525{

Diff Legend

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