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.36 by pcg, Sun Mar 20 02:34:16 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];
… …
201 val = strtok (NULL, "\t\n\r ="); 217 val = strtok (NULL, "\t\n\r =");
202 218
203 if (!val || val[0] == '#') 219 if (!val || val[0] == '#')
204 { 220 {
205 slog (L_WARN, 221 slog (L_WARN,
206 _("no value for variable `%s', at '%s' line %d"), 222 _("no value for variable `%s', at '%s' line %d, skipping."),
207 var, fname, lineno); 223 var, fname, lineno);
208 break; 224 continue;
209 } 225 }
210 226
211 if (!strcmp (var, "on")) 227 if (!strcmp (var, "on"))
212 { 228 {
213 if (!::thisnode 229 if (!::thisnode
… …
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 {
290 parse_bool (ifpersist, "ifpersist", true, false); 306 parse_bool (ifpersist, "ifpersist", true, false);
291 }
292 else if (!strcmp (var, "ifname")) 307 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 308 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 309 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 310 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 311 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 312 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 313 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 314 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 315 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 316 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 317 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 318 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 319 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 320 free (script_node_down), script_node_down = strdup (val);
321 else if (!strcmp (var, "pid-file"))
322 free (pidfilename), pidfilename = strdup (val);
323 else if (!strcmp (var, "dns-forw-host"))
324 {
325#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-forw-port"))
330 {
331#if ENABLE_DNS
332 dns_forw_port = atoi (val);
333#endif
334 }
335 else if (!strcmp (var, "http-proxy-host"))
336 {
306#if ENABLE_HTTP_PROXY 337#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 338 free (proxy_host), proxy_host = strdup (val);
339#endif
340 }
309 else if (!strcmp (var, "http-proxy-port")) 341 else if (!strcmp (var, "http-proxy-port"))
342 {
343#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 344 proxy_port = atoi (val);
345#endif
346 }
311 else if (!strcmp (var, "http-proxy-auth")) 347 else if (!strcmp (var, "http-proxy-auth"))
348 {
349#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 350 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 351#endif
352 }
314 353
315 /* node-specific, non-defaultable */ 354 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 355 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 356 free (node->hostname), node->hostname = strdup (val);
320 }
321 357
322 /* node-specific, defaultable */ 358 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 359 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 360 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 361 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 362 node->tcp_port = atoi (val);
363 else if (!strcmp (var, "dns-hostname"))
364 {
365#if ENABLE_DNS
366 free (node->dns_hostname), node->dns_hostname = strdup (val);
367#endif
368 }
369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
372 node->dns_port = atoi (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-domain"))
376 {
377#if ENABLE_DNS
378 free (node->domain), node->domain = strdup (val);
379#endif
380 }
327 else if (!strcmp (var, "router-priority")) 381 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 385 else if (!strcmp (var, "connect"))
330 { 386 {
331 if (!strcmp (val, "ondemand")) 387 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 388 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 389 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 392 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 393 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 394 node->connectmode = conf_node::C_DISABLED;
339 else 395 else
340 slog (L_WARN, 396 slog (L_WARN,
341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 397 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
342 var, fname, lineno); 398 var, fname, lineno);
343 } 399 }
344 else if (!strcmp (var, "inherit-tos")) 400 else if (!strcmp (var, "inherit-tos"))
345 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 }
348 else if (!strcmp (var, "compress")) 402 else if (!strcmp (var, "compress"))
349 {
350 parse_bool (node->compress, "compress", true, false); 403 parse_bool (node->compress, "compress", true, false);
351 }
352 // all these bool options really really cost a lot of executable size! 404 // all these bool options really really cost a lot of executable size!
353 else if (!strcmp (var, "enable-tcp")) 405 else if (!strcmp (var, "enable-tcp"))
354 { 406 {
355#if ENABLE_TCP 407#if ENABLE_TCP
356 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 408 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
358 } 410 }
359 else if (!strcmp (var, "enable-icmp")) 411 else if (!strcmp (var, "enable-icmp"))
360 { 412 {
361#if ENABLE_ICMP 413#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 414 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-dns"))
418 {
419#if ENABLE_DNS
420 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
363#endif 421#endif
364 } 422 }
365 else if (!strcmp (var, "enable-udp")) 423 else if (!strcmp (var, "enable-udp"))
366 { 424 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 425 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
372 } 430 }
373 431
374 // unknown or misplaced 432 // unknown or misplaced
375 else 433 else
376 slog (L_WARN, 434 slog (L_WARN,
377 _("unknown or misplaced variable `%s', at '%s' line %d"), 435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
378 var, fname, lineno); 436 var, fname, lineno);
379 } 437 }
380 438
381 fclose (f); 439 fclose (f);
382 } 440 }
383 else 441 else
384 { 442 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 443 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 444 exit (EXIT_FAILURE);
387 } 445 }
388 446
389 free (fname); 447 free (fname);
390 448
391 fname = config_filename (prikeyfile, "hostkey"); 449 fname = config_filename (prikeyfile, "hostkey");
… …
397 455
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 456 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 457 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 458 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)); 459 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 460 exit (EXIT_FAILURE);
403 } 461 }
404 462
405 RSA_blinding_on (rsa_key, 0); 463 require (RSA_blinding_on (rsa_key, 0));
406 464
407 fclose (f); 465 fclose (f);
408 } 466 }
409 else 467 else
410 { 468 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 469 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 470
413 if (need_keys) 471 if (need_keys)
414 exit (1); 472 exit (EXIT_FAILURE);
415 } 473 }
474
475 if (need_keys && ::thisnode
476 && rsa_key && thisnode && thisnode->rsa_key)
477 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
478 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
479 {
480 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
481 exit (EXIT_FAILURE);
482 }
416 483
417 free (fname); 484 free (fname);
418} 485}
419 486
420char *configuration::config_filename (const char *name, const char *dflt) 487char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 523 printf ("\n");
457} 524}
458 525
459configuration::configuration () 526configuration::configuration ()
460{ 527{
528 asprintf (&confbase, "%s/gvpe", CONFDIR);
529
461 init (); 530 init ();
462} 531}
463 532
464configuration::~configuration () 533configuration::~configuration ()
465{ 534{

Diff Legend

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