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.34 by pcg, Thu Mar 17 23:59:37 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-2005 Marc Lehmann <gvpe@schmorp.de>
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
5 This file is part of GVPE.
6
9 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 10 (at your option) any later version.
13 11
14 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details. 15 GNU General Public License for more details.
18 16
19 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
21 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22*/ 20*/
23 21
24#include "config.h" 22#include "config.h"
25 23
… …
37 35
38#include <openssl/err.h> 36#include <openssl/err.h>
39#include <openssl/pem.h> 37#include <openssl/pem.h>
40#include <openssl/rsa.h> 38#include <openssl/rsa.h>
41#include <openssl/rand.h> 39#include <openssl/rand.h>
40#include <openssl/bn.h>
42 41
43#include "gettext.h" 42#include "gettext.h"
44 43
45#include "conf.h" 44#include "conf.h"
46#include "slog.h" 45#include "slog.h"
47#include "util.h" 46#include "util.h"
48 47
49char *confbase; 48char *confbase;
50char *thisnode; 49char *thisnode;
51char *identname; 50char *identname;
52char *pidfilename;
53 51
54struct configuration conf; 52struct configuration conf;
55 53
56u8 best_protocol (u8 protset) 54u8 best_protocol (u8 protset)
57{ 55{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 56 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 57 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 58 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 59 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
62 61
63 return 0; 62 return 0;
64} 63}
65 64
66const char *strprotocol (u8 protocol) 65const char *strprotocol (u8 protocol)
67{ 66{
68 if (protocol & PROT_IPv4 ) return "rawip"; 67 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp"; 68 if (protocol & PROT_ICMPv4) return "icmp";
70 if (protocol & PROT_UDPv4 ) return "udp"; 69 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp"; 70 if (protocol & PROT_TCPv4 ) return "tcp";
71 if (protocol & PROT_DNSv4 ) return "dns";
72 72
73 return "<unknown>"; 73 return "<unknown>";
74} 74}
75 75
76void 76void
… …
95 if (rsa_key) 95 if (rsa_key)
96 RSA_free (rsa_key); 96 RSA_free (rsa_key);
97 97
98 free (nodename); 98 free (nodename);
99 free (hostname); 99 free (hostname);
100#if ENABLE_DNS
101 free (domain);
102 free (dns_hostname);
103#endif
100} 104}
101 105
102void configuration::init () 106void configuration::init ()
103{ 107{
104 memset (this, 0, sizeof (*this)); 108 memset (this, 0, sizeof (*this));
105 109
110 mtu = DEFAULT_MTU;
106 rekey = DEFAULT_REKEY; 111 rekey = DEFAULT_REKEY;
107 keepalive = DEFAULT_KEEPALIVE; 112 keepalive = DEFAULT_KEEPALIVE;
108 llevel = L_INFO; 113 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE; 114 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP 115#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 116 icmp_type = ICMP_ECHOREPLY;
112#endif 117#endif
113 118
114 default_node.udp_port = DEFAULT_UDPPORT; 119 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; 120 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 121 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 122 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 123 default_node.protocols = 0;
124 default_node.max_retry = DEFAULT_MAX_RETRY;
125
126#if ENABLE_DNS
127 default_node.dns_port = 0; // default is 0 == client
128 dns_forw_host = strdup ("127.0.0.1");
129 dns_forw_port = 53;
130#endif
131
132 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119} 133}
120 134
121void configuration::cleanup() 135void configuration::cleanup()
122{ 136{
123 if (rsa_key) 137 if (rsa_key)
124 RSA_free (rsa_key); 138 RSA_free (rsa_key);
125 139
126 rsa_key = 0; 140 rsa_key = 0;
127 141
142 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 143 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 144#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 145 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0; 146 free (proxy_auth); proxy_auth = 0;
147#endif
148#if ENABLE_DNS
149 free (dns_forw_host); dns_forw_host = 0;
132#endif 150#endif
133} 151}
134 152
135void 153void
136configuration::clear_config () 154configuration::clear_config ()
… …
161 char *fname; 179 char *fname;
162 FILE *f; 180 FILE *f;
163 181
164 clear_config (); 182 clear_config ();
165 183
166 asprintf (&fname, "%s/vped.conf", confbase); 184 asprintf (&fname, "%s/gvpe.conf", confbase);
167 f = fopen (fname, "r"); 185 f = fopen (fname, "r");
168 186
169 if (f) 187 if (f)
170 { 188 {
171 char line[16384]; 189 char line[16384];
… …
228 else 246 else
229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 247 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230 } 248 }
231 else if (!strcmp (var, "ip-proto")) 249 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 250 ip_proto = atoi (val);
251 else if (!strcmp (var, "icmp-type"))
252 {
233#if ENABLE_ICMP 253#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 254 icmp_type = atoi (val);
237#endif 255#endif
256 }
238 257
239 // per config 258 // per config
240 else if (!strcmp (var, "node")) 259 else if (!strcmp (var, "node"))
241 { 260 {
242 default_node.id++; 261 default_node.id++;
… …
260 279
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 280 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 281 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 282 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)); 283 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265 exit (1); 284 exit (EXIT_FAILURE);
266 } 285 }
267 286
268 RSA_blinding_on (node->rsa_key, 0); 287 require (RSA_blinding_on (node->rsa_key, 0));
269 288
270 fclose (f); 289 fclose (f);
271 } 290 }
272 else 291 else
273 { 292 {
274 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 293 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275 294
276 if (need_keys) 295 if (need_keys)
277 exit (1); 296 exit (EXIT_FAILURE);
278 } 297 }
279 298
280 free (fname); 299 free (fname);
281 } 300 }
282 301
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 302 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 303 thisnode = node;
285 } 304 }
286 else if (!strcmp (var, "private-key")) 305 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 306 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 307 else if (!strcmp (var, "ifpersist"))
289 { 308 {
290 parse_bool (ifpersist, "ifpersist", true, false); 309 parse_bool (ifpersist, "ifpersist", true, false);
291 } 310 }
292 else if (!strcmp (var, "ifname")) 311 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 312 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 313 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 314 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 315 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 316 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 317 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 318 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 319 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 320 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 321 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 322 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 323 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 324 free (script_node_down), script_node_down = strdup (val);
325 else if (!strcmp (var, "pid-file"))
326 free (pidfilename), pidfilename = strdup (val);
327 else if (!strcmp (var, "dns-forw-host"))
328 {
329#if ENABLE_DNS
330 free (dns_forw_host), dns_forw_host = strdup (val);
331#endif
332 }
333 else if (!strcmp (var, "dns-forw-port"))
334 {
335#if ENABLE_DNS
336 dns_forw_port = atoi (val);
337#endif
338 }
339 else if (!strcmp (var, "http-proxy-host"))
340 {
306#if ENABLE_HTTP_PROXY 341#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 342 free (proxy_host), proxy_host = strdup (val);
343#endif
344 }
309 else if (!strcmp (var, "http-proxy-port")) 345 else if (!strcmp (var, "http-proxy-port"))
346 {
347#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 348 proxy_port = atoi (val);
349#endif
350 }
311 else if (!strcmp (var, "http-proxy-auth")) 351 else if (!strcmp (var, "http-proxy-auth"))
352 {
353#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 354 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 355#endif
356 }
314 357
315 /* node-specific, non-defaultable */ 358 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 359 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 360 free (node->hostname), node->hostname = strdup (val);
320 }
321 361
322 /* node-specific, defaultable */ 362 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 363 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 364 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 365 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 366 node->tcp_port = atoi (val);
367 else if (!strcmp (var, "dns-hostname"))
368 {
369#if ENABLE_DNS
370 free (node->dns_hostname), node->dns_hostname = strdup (val);
371#endif
372 }
373 else if (!strcmp (var, "dns-port"))
374 {
375#if ENABLE_DNS
376 node->dns_port = atoi (val);
377#endif
378 }
379 else if (!strcmp (var, "dns-domain"))
380 {
381#if ENABLE_DNS
382 free (node->domain), node->domain = strdup (val);
383#endif
384 }
327 else if (!strcmp (var, "router-priority")) 385 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 386 node->routerprio = atoi (val);
387 else if (!strcmp (var, "max-retry"))
388 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 389 else if (!strcmp (var, "connect"))
330 { 390 {
331 if (!strcmp (val, "ondemand")) 391 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 392 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 393 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 396 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 397 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 398 node->connectmode = conf_node::C_DISABLED;
339 else 399 else
340 slog (L_WARN, 400 slog (L_WARN,
341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 401 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
342 var, fname, lineno); 402 var, fname, lineno);
343 } 403 }
344 else if (!strcmp (var, "inherit-tos")) 404 else if (!strcmp (var, "inherit-tos"))
345 { 405 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 406 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 } 407 }
… …
358 } 418 }
359 else if (!strcmp (var, "enable-icmp")) 419 else if (!strcmp (var, "enable-icmp"))
360 { 420 {
361#if ENABLE_ICMP 421#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 422 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
423#endif
424 }
425 else if (!strcmp (var, "enable-dns"))
426 {
427#if ENABLE_DNS
428 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
363#endif 429#endif
364 } 430 }
365 else if (!strcmp (var, "enable-udp")) 431 else if (!strcmp (var, "enable-udp"))
366 { 432 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 433 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 fclose (f); 447 fclose (f);
382 } 448 }
383 else 449 else
384 { 450 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 451 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 452 exit (EXIT_FAILURE);
387 } 453 }
388 454
389 free (fname); 455 free (fname);
390 456
391 fname = config_filename (prikeyfile, "hostkey"); 457 fname = config_filename (prikeyfile, "hostkey");
… …
397 463
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 464 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 465 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 466 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)); 467 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 468 exit (EXIT_FAILURE);
403 } 469 }
404 470
405 RSA_blinding_on (rsa_key, 0); 471 require (RSA_blinding_on (rsa_key, 0));
406 472
407 fclose (f); 473 fclose (f);
408 } 474 }
409 else 475 else
410 { 476 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 477 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 478
413 if (need_keys) 479 if (need_keys)
414 exit (1); 480 exit (EXIT_FAILURE);
415 } 481 }
482
483 if (need_keys && ::thisnode
484 && rsa_key && thisnode && thisnode->rsa_key)
485 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
486 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
487 {
488 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
489 exit (EXIT_FAILURE);
490 }
416 491
417 free (fname); 492 free (fname);
418} 493}
419 494
420char *configuration::config_filename (const char *name, const char *dflt) 495char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 531 printf ("\n");
457} 532}
458 533
459configuration::configuration () 534configuration::configuration ()
460{ 535{
536 asprintf (&confbase, "%s/gvpe", CONFDIR);
537
461 init (); 538 init ();
462} 539}
463 540
464configuration::~configuration () 541configuration::~configuration ()
465{ 542{

Diff Legend

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