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

Diff Legend

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