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.15 by pcg, Sun Apr 13 00:35:46 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
… …
31#include <netdb.h> 29#include <netdb.h>
32#include <sys/stat.h> 30#include <sys/stat.h>
33#include <sys/types.h> 31#include <sys/types.h>
34#include <unistd.h> 32#include <unistd.h>
35 33
36#include <netinet/in.h> 34#include "netcompat.h"
37#include <netinet/ip_icmp.h>
38 35
39#include <openssl/err.h> 36#include <openssl/err.h>
40#include <openssl/pem.h> 37#include <openssl/pem.h>
41#include <openssl/rsa.h> 38#include <openssl/rsa.h>
42#include <openssl/rand.h> 39#include <openssl/rand.h>
40#include <openssl/bn.h>
43 41
44#include "gettext.h" 42#include "gettext.h"
45 43
46#include "conf.h" 44#include "conf.h"
47#include "slog.h" 45#include "slog.h"
48#include "util.h" 46#include "util.h"
49 47
50char *confbase; 48char *confbase;
51char *thisnode; 49char *thisnode;
52char *identname; 50char *identname;
53char *pidfilename;
54 51
55struct configuration conf; 52struct configuration conf;
56 53
57u8 best_protocol (u8 protset) 54u8 best_protocol (u8 protset)
58{ 55{
59 if (protset & PROT_IPv4 ) return PROT_IPv4; 56 if (protset & PROT_IPv4 ) return PROT_IPv4;
60 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 57 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
61 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 58 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
62 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 59 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
63 61
64 return 0; 62 return 0;
65} 63}
66 64
67const char *strprotocol (u8 protocol) 65const char *strprotocol (u8 protocol)
68{ 66{
69 if (protocol & PROT_IPv4 ) return "rawip"; 67 if (protocol & PROT_IPv4 ) return "rawip";
70 if (protocol & PROT_ICMPv4) return "icmp"; 68 if (protocol & PROT_ICMPv4) return "icmp";
71 if (protocol & PROT_UDPv4 ) return "udp"; 69 if (protocol & PROT_UDPv4 ) return "udp";
72 if (protocol & PROT_TCPv4 ) return "tcp"; 70 if (protocol & PROT_TCPv4 ) return "tcp";
71 if (protocol & PROT_DNSv4 ) return "dns";
73 72
74 return "<unknown>"; 73 return "<unknown>";
75} 74}
76 75
77void 76void
… …
96 if (rsa_key) 95 if (rsa_key)
97 RSA_free (rsa_key); 96 RSA_free (rsa_key);
98 97
99 free (nodename); 98 free (nodename);
100 free (hostname); 99 free (hostname);
100#if ENABLE_DNS
101 free (domain);
102 free (dns_hostname);
103#endif
101} 104}
102 105
103void configuration::init () 106void configuration::init ()
104{ 107{
105 memset (this, 0, sizeof (*this)); 108 memset (this, 0, sizeof (*this));
106 109
110 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 111 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 112 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 113 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 114 ip_proto = IPPROTO_GRE;
115#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 116 icmp_type = ICMP_ECHOREPLY;
117#endif
112 118
113 default_node.udp_port = DEFAULT_UDPPORT; 119 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 120 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 121 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 122 default_node.compress = true;
117 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");
118} 133}
119 134
120void configuration::cleanup() 135void configuration::cleanup()
121{ 136{
122 if (rsa_key) 137 if (rsa_key)
123 RSA_free (rsa_key); 138 RSA_free (rsa_key);
124 139
125 rsa_key = 0; 140 rsa_key = 0;
126 141
142 free (pidfilename); pidfilename = 0;
127 free (ifname); ifname = 0; 143 free (ifname); ifname = 0;
128#if ENABLE_HTTP_PROXY 144#if ENABLE_HTTP_PROXY
129 free (proxy_host); proxy_host = 0; 145 free (proxy_host); proxy_host = 0;
130 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;
131#endif 150#endif
132} 151}
133 152
134void 153void
135configuration::clear_config () 154configuration::clear_config ()
… …
160 char *fname; 179 char *fname;
161 FILE *f; 180 FILE *f;
162 181
163 clear_config (); 182 clear_config ();
164 183
165 asprintf (&fname, "%s/vped.conf", confbase); 184 asprintf (&fname, "%s/gvpe.conf", confbase);
166 f = fopen (fname, "r"); 185 f = fopen (fname, "r");
167 186
168 if (f) 187 if (f)
169 { 188 {
170 char line[16384]; 189 char line[16384];
… …
228 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);
229 } 248 }
230 else if (!strcmp (var, "ip-proto")) 249 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val); 250 ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 251 else if (!strcmp (var, "icmp-type"))
252 {
253#if ENABLE_ICMP
233 icmp_type = atoi (val); 254 icmp_type = atoi (val);
255#endif
256 }
234 257
235 // per config 258 // per config
236 else if (!strcmp (var, "node")) 259 else if (!strcmp (var, "node"))
237 { 260 {
238 default_node.id++; 261 default_node.id++;
… …
256 279
257 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 280 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
258 { 281 {
259 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 282 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
260 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));
261 exit (1); 284 exit (EXIT_FAILURE);
262 } 285 }
263 286
264 RSA_blinding_on (node->rsa_key, 0); 287 require (RSA_blinding_on (node->rsa_key, 0));
265 288
266 fclose (f); 289 fclose (f);
267 } 290 }
268 else 291 else
269 { 292 {
270 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));
271 294
272 if (need_keys) 295 if (need_keys)
273 exit (1); 296 exit (EXIT_FAILURE);
274 } 297 }
275 298
276 free (fname); 299 free (fname);
277 } 300 }
278 301
279 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 302 if (::thisnode && !strcmp (node->nodename, ::thisnode))
280 thisnode = node; 303 thisnode = node;
281 } 304 }
282 else if (!strcmp (var, "private-key")) 305 else if (!strcmp (var, "private-key"))
283 prikeyfile = strdup (val); 306 free (prikeyfile), prikeyfile = strdup (val);
284 else if (!strcmp (var, "ifpersist")) 307 else if (!strcmp (var, "ifpersist"))
285 { 308 {
286 parse_bool (ifpersist, "ifpersist", true, false); 309 parse_bool (ifpersist, "ifpersist", true, false);
287 } 310 }
288 else if (!strcmp (var, "ifname")) 311 else if (!strcmp (var, "ifname"))
289 ifname = strdup (val); 312 free (ifname), ifname = strdup (val);
290 else if (!strcmp (var, "rekey")) 313 else if (!strcmp (var, "rekey"))
291 rekey = atoi (val); 314 rekey = atoi (val);
292 else if (!strcmp (var, "keepalive")) 315 else if (!strcmp (var, "keepalive"))
293 keepalive = atoi (val); 316 keepalive = atoi (val);
294 else if (!strcmp (var, "mtu")) 317 else if (!strcmp (var, "mtu"))
295 mtu = atoi (val); 318 mtu = atoi (val);
296 else if (!strcmp (var, "if-up")) 319 else if (!strcmp (var, "if-up"))
297 script_if_up = strdup (val); 320 free (script_if_up), script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up")) 321 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val); 322 free (script_node_up), script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down")) 323 else if (!strcmp (var, "node-down"))
301 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 {
302#if ENABLE_HTTP_PROXY 341#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 342 free (proxy_host), proxy_host = strdup (val);
343#endif
344 }
305 else if (!strcmp (var, "http-proxy-port")) 345 else if (!strcmp (var, "http-proxy-port"))
346 {
347#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 348 proxy_port = atoi (val);
349#endif
350 }
307 else if (!strcmp (var, "http-proxy-auth")) 351 else if (!strcmp (var, "http-proxy-auth"))
352 {
353#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 354 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 355#endif
356 }
310 357
311 /* node-specific, non-defaultable */ 358 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 359 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val); 360 free (node->hostname), node->hostname = strdup (val);
316 }
317 361
318 /* node-specific, defaultable */ 362 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port")) 363 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val); 364 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port")) 365 else if (!strcmp (var, "tcp-port"))
322 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 }
323 else if (!strcmp (var, "router-priority")) 385 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val); 386 node->routerprio = atoi (val);
387 else if (!strcmp (var, "max-retry"))
388 node->max_retry = atoi (val);
325 else if (!strcmp (var, "connect")) 389 else if (!strcmp (var, "connect"))
326 { 390 {
327 if (!strcmp (val, "ondemand")) 391 if (!strcmp (val, "ondemand"))
328 node->connectmode = conf_node::C_ONDEMAND; 392 node->connectmode = conf_node::C_ONDEMAND;
329 else if (!strcmp (val, "never")) 393 else if (!strcmp (val, "never"))
… …
332 node->connectmode = conf_node::C_ALWAYS; 396 node->connectmode = conf_node::C_ALWAYS;
333 else if (!strcmp (val, "disabled")) 397 else if (!strcmp (val, "disabled"))
334 node->connectmode = conf_node::C_DISABLED; 398 node->connectmode = conf_node::C_DISABLED;
335 else 399 else
336 slog (L_WARN, 400 slog (L_WARN,
337 _("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"),
338 var, fname, lineno); 402 var, fname, lineno);
339 } 403 }
340 else if (!strcmp (var, "inherit-tos")) 404 else if (!strcmp (var, "inherit-tos"))
341 { 405 {
342 parse_bool (node->inherit_tos, "inherit-tos", true, false); 406 parse_bool (node->inherit_tos, "inherit-tos", true, false);
343 } 407 }
… …
354 } 418 }
355 else if (!strcmp (var, "enable-icmp")) 419 else if (!strcmp (var, "enable-icmp"))
356 { 420 {
357#if ENABLE_ICMP 421#if ENABLE_ICMP
358 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;
359#endif 429#endif
360 } 430 }
361 else if (!strcmp (var, "enable-udp")) 431 else if (!strcmp (var, "enable-udp"))
362 { 432 {
363 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;
… …
377 fclose (f); 447 fclose (f);
378 } 448 }
379 else 449 else
380 { 450 {
381 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));
382 exit (1); 452 exit (EXIT_FAILURE);
383 } 453 }
384 454
385 free (fname); 455 free (fname);
386 456
387 fname = config_filename (prikeyfile, "hostkey"); 457 fname = config_filename (prikeyfile, "hostkey");
… …
393 463
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 464 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
395 { 465 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 466 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
397 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));
398 exit (1); 468 exit (EXIT_FAILURE);
399 } 469 }
400 470
401 RSA_blinding_on (rsa_key, 0); 471 require (RSA_blinding_on (rsa_key, 0));
402 472
403 fclose (f); 473 fclose (f);
404 } 474 }
405 else 475 else
406 { 476 {
407 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));
408 478
409 if (need_keys) 479 if (need_keys)
410 exit (1); 480 exit (EXIT_FAILURE);
411 } 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 }
412 491
413 free (fname); 492 free (fname);
414} 493}
415 494
416char *configuration::config_filename (const char *name, const char *dflt) 495char *configuration::config_filename (const char *name, const char *dflt)
… …
452 printf ("\n"); 531 printf ("\n");
453} 532}
454 533
455configuration::configuration () 534configuration::configuration ()
456{ 535{
536 asprintf (&confbase, "%s/gvpe", CONFDIR);
537
457 init (); 538 init ();
458} 539}
459 540
460configuration::~configuration () 541configuration::~configuration ()
461{ 542{

Diff Legend

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