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.31 by pcg, Thu Mar 3 16:54:34 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 = 53;
128 dns_forw_port = 53;
129#endif
130
131 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119} 132}
120 133
121void configuration::cleanup() 134void configuration::cleanup()
122{ 135{
123 if (rsa_key) 136 if (rsa_key)
124 RSA_free (rsa_key); 137 RSA_free (rsa_key);
125 138
126 rsa_key = 0; 139 rsa_key = 0;
127 140
141 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 142 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 143#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 144 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0; 145 free (proxy_auth); proxy_auth = 0;
146#endif
147#if ENABLE_DNS
148 free (dns_forw_host); dns_forw_host = 0;
132#endif 149#endif
133} 150}
134 151
135void 152void
136configuration::clear_config () 153configuration::clear_config ()
… …
161 char *fname; 178 char *fname;
162 FILE *f; 179 FILE *f;
163 180
164 clear_config (); 181 clear_config ();
165 182
166 asprintf (&fname, "%s/vped.conf", confbase); 183 asprintf (&fname, "%s/gvpe.conf", confbase);
167 f = fopen (fname, "r"); 184 f = fopen (fname, "r");
168 185
169 if (f) 186 if (f)
170 { 187 {
171 char line[16384]; 188 char line[16384];
… …
228 else 245 else
229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 246 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230 } 247 }
231 else if (!strcmp (var, "ip-proto")) 248 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 249 ip_proto = atoi (val);
250 else if (!strcmp (var, "icmp-type"))
251 {
233#if ENABLE_ICMP 252#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 253 icmp_type = atoi (val);
237#endif 254#endif
255 }
238 256
239 // per config 257 // per config
240 else if (!strcmp (var, "node")) 258 else if (!strcmp (var, "node"))
241 { 259 {
242 default_node.id++; 260 default_node.id++;
… …
260 278
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 279 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 280 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 281 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)); 282 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265 exit (1); 283 exit (EXIT_FAILURE);
266 } 284 }
267 285
268 RSA_blinding_on (node->rsa_key, 0); 286 require (RSA_blinding_on (node->rsa_key, 0));
269 287
270 fclose (f); 288 fclose (f);
271 } 289 }
272 else 290 else
273 { 291 {
274 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 292 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275 293
276 if (need_keys) 294 if (need_keys)
277 exit (1); 295 exit (EXIT_FAILURE);
278 } 296 }
279 297
280 free (fname); 298 free (fname);
281 } 299 }
282 300
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 301 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 302 thisnode = node;
285 } 303 }
286 else if (!strcmp (var, "private-key")) 304 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 305 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 306 else if (!strcmp (var, "ifpersist"))
289 { 307 {
290 parse_bool (ifpersist, "ifpersist", true, false); 308 parse_bool (ifpersist, "ifpersist", true, false);
291 } 309 }
292 else if (!strcmp (var, "ifname")) 310 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 311 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 312 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 313 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 314 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 315 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 316 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 317 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 318 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 319 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 320 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 321 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 322 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 323 free (script_node_down), script_node_down = strdup (val);
324 else if (!strcmp (var, "pid-file"))
325 free (pidfilename), pidfilename = strdup (val);
326#if ENABLE_DNS
327 else if (!strcmp (var, "dns-forw-host"))
328 free (dns_forw_host), dns_forw_host = strdup (val);
329 else if (!strcmp (var, "dns-forw-port"))
330 dns_forw_port = atoi (val);
331#endif
332 else if (!strcmp (var, "http-proxy-host"))
333 {
306#if ENABLE_HTTP_PROXY 334#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 335 free (proxy_host), proxy_host = strdup (val);
336#endif
337 }
309 else if (!strcmp (var, "http-proxy-port")) 338 else if (!strcmp (var, "http-proxy-port"))
339 {
340#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 341 proxy_port = atoi (val);
342#endif
343 }
311 else if (!strcmp (var, "http-proxy-auth")) 344 else if (!strcmp (var, "http-proxy-auth"))
345 {
346#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 347 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 348#endif
349 }
314 350
315 /* node-specific, non-defaultable */ 351 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 352 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 353 free (node->hostname), node->hostname = strdup (val);
320 }
321 354
322 /* node-specific, defaultable */ 355 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 356 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 357 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 358 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 359 node->tcp_port = atoi (val);
360#if ENABLE_DNS
361 else if (!strcmp (var, "dns-hostname"))
362 free (node->dns_hostname), node->dns_hostname = strdup (val);
363 else if (!strcmp (var, "dns-port"))
364 node->dns_port = atoi (val);
365#endif
366 else if (!strcmp (var, "dns-domain"))
367 {
368#if ENABLE_DNS
369 free (node->domain), node->domain = strdup (val);
370#endif
371 }
327 else if (!strcmp (var, "router-priority")) 372 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 373 node->routerprio = atoi (val);
374 else if (!strcmp (var, "max-retry"))
375 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 376 else if (!strcmp (var, "connect"))
330 { 377 {
331 if (!strcmp (val, "ondemand")) 378 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 379 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 380 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 383 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 384 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 385 node->connectmode = conf_node::C_DISABLED;
339 else 386 else
340 slog (L_WARN, 387 slog (L_WARN,
341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 388 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
342 var, fname, lineno); 389 var, fname, lineno);
343 } 390 }
344 else if (!strcmp (var, "inherit-tos")) 391 else if (!strcmp (var, "inherit-tos"))
345 { 392 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 393 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 } 394 }
… …
358 } 405 }
359 else if (!strcmp (var, "enable-icmp")) 406 else if (!strcmp (var, "enable-icmp"))
360 { 407 {
361#if ENABLE_ICMP 408#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 409 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
410#endif
411 }
412 else if (!strcmp (var, "enable-dns"))
413 {
414#if ENABLE_DNS
415 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
363#endif 416#endif
364 } 417 }
365 else if (!strcmp (var, "enable-udp")) 418 else if (!strcmp (var, "enable-udp"))
366 { 419 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 420 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 fclose (f); 434 fclose (f);
382 } 435 }
383 else 436 else
384 { 437 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 438 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 439 exit (EXIT_FAILURE);
387 } 440 }
388 441
389 free (fname); 442 free (fname);
390 443
391 fname = config_filename (prikeyfile, "hostkey"); 444 fname = config_filename (prikeyfile, "hostkey");
… …
397 450
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 451 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 452 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 453 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)); 454 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 455 exit (EXIT_FAILURE);
403 } 456 }
404 457
405 RSA_blinding_on (rsa_key, 0); 458 require (RSA_blinding_on (rsa_key, 0));
406 459
407 fclose (f); 460 fclose (f);
408 } 461 }
409 else 462 else
410 { 463 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 464 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 465
413 if (need_keys) 466 if (need_keys)
414 exit (1); 467 exit (EXIT_FAILURE);
415 } 468 }
469
470 if (need_keys && ::thisnode
471 && rsa_key && thisnode && thisnode->rsa_key)
472 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
473 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
474 {
475 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
476 exit (EXIT_FAILURE);
477 }
416 478
417 free (fname); 479 free (fname);
418} 480}
419 481
420char *configuration::config_filename (const char *name, const char *dflt) 482char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 518 printf ("\n");
457} 519}
458 520
459configuration::configuration () 521configuration::configuration ()
460{ 522{
523 asprintf (&confbase, "%s/gvpe", CONFDIR);
524
461 init (); 525 init ();
462} 526}
463 527
464configuration::~configuration () 528configuration::~configuration ()
465{ 529{

Diff Legend

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