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.35 by pcg, Fri Mar 18 01:53:05 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>
42 40#include <openssl/bn.h>
43#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#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
100} 102}
101 103
102void configuration::init () 104void configuration::init ()
103{ 105{
104 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
105 107
108 mtu = DEFAULT_MTU;
106 rekey = DEFAULT_REKEY; 109 rekey = DEFAULT_REKEY;
107 keepalive = DEFAULT_KEEPALIVE; 110 keepalive = DEFAULT_KEEPALIVE;
108 llevel = L_INFO; 111 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE; 112 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP 113#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 114 icmp_type = ICMP_ECHOREPLY;
112#endif 115#endif
113 116
114 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 120 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY;
123
124#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client
126 dns_forw_host = strdup ("127.0.0.1");
127 dns_forw_port = 53;
128#endif
129
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119} 131}
120 132
121void configuration::cleanup() 133void configuration::cleanup()
122{ 134{
123 if (rsa_key) 135 if (rsa_key)
124 RSA_free (rsa_key); 136 RSA_free (rsa_key);
125 137
126 rsa_key = 0; 138 rsa_key = 0;
127 139
140 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0; 144 free (proxy_auth); proxy_auth = 0;
145#endif
146#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0;
132#endif 148#endif
133} 149}
134 150
135void 151void
136configuration::clear_config () 152configuration::clear_config ()
… …
161 char *fname; 177 char *fname;
162 FILE *f; 178 FILE *f;
163 179
164 clear_config (); 180 clear_config ();
165 181
166 asprintf (&fname, "%s/vped.conf", confbase); 182 asprintf (&fname, "%s/gvpe.conf", confbase);
167 f = fopen (fname, "r"); 183 f = fopen (fname, "r");
168 184
169 if (f) 185 if (f)
170 { 186 {
171 char line[16384]; 187 char line[16384];
… …
228 else 244 else
229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 245 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230 } 246 }
231 else if (!strcmp (var, "ip-proto")) 247 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 248 ip_proto = atoi (val);
249 else if (!strcmp (var, "icmp-type"))
250 {
233#if ENABLE_ICMP 251#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 252 icmp_type = atoi (val);
237#endif 253#endif
254 }
238 255
239 // per config 256 // per config
240 else if (!strcmp (var, "node")) 257 else if (!strcmp (var, "node"))
241 { 258 {
242 default_node.id++; 259 default_node.id++;
… …
260 277
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 278 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 279 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 280 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)); 281 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265 exit (1); 282 exit (EXIT_FAILURE);
266 } 283 }
267 284
268 RSA_blinding_on (node->rsa_key, 0); 285 require (RSA_blinding_on (node->rsa_key, 0));
269 286
270 fclose (f); 287 fclose (f);
271 } 288 }
272 else 289 else
273 { 290 {
274 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 291 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275 292
276 if (need_keys) 293 if (need_keys)
277 exit (1); 294 exit (EXIT_FAILURE);
278 } 295 }
279 296
280 free (fname); 297 free (fname);
281 } 298 }
282 299
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 301 thisnode = node;
285 } 302 }
286 else if (!strcmp (var, "private-key")) 303 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 304 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 305 else if (!strcmp (var, "ifpersist"))
289 { 306 {
290 parse_bool (ifpersist, "ifpersist", true, false); 307 parse_bool (ifpersist, "ifpersist", true, false);
291 } 308 }
292 else if (!strcmp (var, "ifname")) 309 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 310 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 311 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 312 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 313 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 314 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 315 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 316 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 317 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 318 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 319 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 320 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 321 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 322 free (script_node_down), script_node_down = strdup (val);
323 else if (!strcmp (var, "pid-file"))
324 free (pidfilename), pidfilename = strdup (val);
325 else if (!strcmp (var, "dns-forw-host"))
326 {
327#if ENABLE_DNS
328 free (dns_forw_host), dns_forw_host = strdup (val);
329#endif
330 }
331 else if (!strcmp (var, "dns-forw-port"))
332 {
333#if ENABLE_DNS
334 dns_forw_port = atoi (val);
335#endif
336 }
337 else if (!strcmp (var, "http-proxy-host"))
338 {
306#if ENABLE_HTTP_PROXY 339#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 340 free (proxy_host), proxy_host = strdup (val);
341#endif
342 }
309 else if (!strcmp (var, "http-proxy-port")) 343 else if (!strcmp (var, "http-proxy-port"))
344 {
345#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 346 proxy_port = atoi (val);
347#endif
348 }
311 else if (!strcmp (var, "http-proxy-auth")) 349 else if (!strcmp (var, "http-proxy-auth"))
350 {
351#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 352 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 353#endif
354 }
314 355
315 /* node-specific, non-defaultable */ 356 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 357 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 358 free (node->hostname), node->hostname = strdup (val);
320 }
321 359
322 /* node-specific, defaultable */ 360 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 361 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 362 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 363 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 364 node->tcp_port = atoi (val);
365 else if (!strcmp (var, "dns-hostname"))
366 {
367#if ENABLE_DNS
368 free (node->dns_hostname), node->dns_hostname = strdup (val);
369#endif
370 }
371 else if (!strcmp (var, "dns-port"))
372 {
373#if ENABLE_DNS
374 node->dns_port = atoi (val);
375#endif
376 }
377 else if (!strcmp (var, "dns-domain"))
378 {
379#if ENABLE_DNS
380 free (node->domain), node->domain = strdup (val);
381#endif
382 }
327 else if (!strcmp (var, "router-priority")) 383 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 384 node->routerprio = atoi (val);
385 else if (!strcmp (var, "max-retry"))
386 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 387 else if (!strcmp (var, "connect"))
330 { 388 {
331 if (!strcmp (val, "ondemand")) 389 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 390 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 391 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 394 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 395 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 396 node->connectmode = conf_node::C_DISABLED;
339 else 397 else
340 slog (L_WARN, 398 slog (L_WARN,
341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 399 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
342 var, fname, lineno); 400 var, fname, lineno);
343 } 401 }
344 else if (!strcmp (var, "inherit-tos")) 402 else if (!strcmp (var, "inherit-tos"))
345 { 403 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 404 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 } 405 }
… …
358 } 416 }
359 else if (!strcmp (var, "enable-icmp")) 417 else if (!strcmp (var, "enable-icmp"))
360 { 418 {
361#if ENABLE_ICMP 419#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 420 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
421#endif
422 }
423 else if (!strcmp (var, "enable-dns"))
424 {
425#if ENABLE_DNS
426 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
363#endif 427#endif
364 } 428 }
365 else if (!strcmp (var, "enable-udp")) 429 else if (!strcmp (var, "enable-udp"))
366 { 430 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 431 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 fclose (f); 445 fclose (f);
382 } 446 }
383 else 447 else
384 { 448 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 449 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 450 exit (EXIT_FAILURE);
387 } 451 }
388 452
389 free (fname); 453 free (fname);
390 454
391 fname = config_filename (prikeyfile, "hostkey"); 455 fname = config_filename (prikeyfile, "hostkey");
… …
397 461
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 462 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 463 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 464 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)); 465 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 466 exit (EXIT_FAILURE);
403 } 467 }
404 468
405 RSA_blinding_on (rsa_key, 0); 469 require (RSA_blinding_on (rsa_key, 0));
406 470
407 fclose (f); 471 fclose (f);
408 } 472 }
409 else 473 else
410 { 474 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 475 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 476
413 if (need_keys) 477 if (need_keys)
414 exit (1); 478 exit (EXIT_FAILURE);
415 } 479 }
480
481 if (need_keys && ::thisnode
482 && rsa_key && thisnode && thisnode->rsa_key)
483 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
484 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
485 {
486 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
487 exit (EXIT_FAILURE);
488 }
416 489
417 free (fname); 490 free (fname);
418} 491}
419 492
420char *configuration::config_filename (const char *name, const char *dflt) 493char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 529 printf ("\n");
457} 530}
458 531
459configuration::configuration () 532configuration::configuration ()
460{ 533{
534 asprintf (&confbase, "%s/gvpe", CONFDIR);
535
461 init (); 536 init ();
462} 537}
463 538
464configuration::~configuration () 539configuration::~configuration ()
465{ 540{

Diff Legend

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