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.16 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.43 by pcg, Thu Aug 7 16:34:21 2008 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22*/ 20*/
23 21
24#include "config.h" 22#include "config.h"
25 23
26#include <cstdio> 24#include <cstdio>
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 <arpa/inet.h>
38#ifdef ENABLE_ICMP
39# ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41# endif
42# ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44# endif
45# include <netinet/ip_icmp.h>
46#endif
47 35
48#include <openssl/err.h> 36#include <openssl/err.h>
49#include <openssl/pem.h> 37#include <openssl/pem.h>
50#include <openssl/rsa.h> 38#include <openssl/rsa.h>
51#include <openssl/rand.h> 39#include <openssl/rand.h>
52 40#include <openssl/bn.h>
53#include "gettext.h"
54 41
55#include "conf.h" 42#include "conf.h"
56#include "slog.h" 43#include "slog.h"
57#include "util.h" 44#include "util.h"
58 45
59char *confbase; 46char *confbase;
60char *thisnode; 47char *thisnode;
61char *identname; 48char *identname;
62char *pidfilename;
63 49
64struct configuration conf; 50struct configuration conf;
65 51
66u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
67{ 53{
68 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
69 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
70 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
71 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
72 59
73 return 0; 60 return 0;
74} 61}
75 62
76const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
77{ 64{
78 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
80 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
82 70
83 return "<unknown>"; 71 return "<unknown>";
72}
73
74static bool
75match_list (const vector<const char *> &list, const char *str)
76{
77 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
78 if ((*i)[0] == '*' && !(*i)[1])
79 return true;
80 else if (!strcmp (*i, str))
81 return true;
82
83 return false;
84}
85
86bool
87conf_node::can_direct (struct conf_node *other)
88{
89 if (match_list (allow_direct, other->nodename))
90 return true;
91
92 if (match_list (deny_direct, other->nodename))
93 return false;
94
95 return true;
84} 96}
85 97
86void 98void
87conf_node::print () 99conf_node::print ()
88{ 100{
100 ); 112 );
101} 113}
102 114
103conf_node::~conf_node () 115conf_node::~conf_node ()
104{ 116{
117#if 0
118 // does not work, because string pointers etc. are shared
119 // is not called, however
105 if (rsa_key) 120 if (rsa_key)
106 RSA_free (rsa_key); 121 RSA_free (rsa_key);
107 122
108 free (nodename); 123 free (nodename);
109 free (hostname); 124 free (hostname);
125 free (if_up_data);
126#if ENABLE_DNS
127 free (domain);
128 free (dns_hostname);
129#endif
130#endif
110} 131}
111 132
112void configuration::init () 133void configuration::init ()
113{ 134{
114 memset (this, 0, sizeof (*this)); 135 memset (this, 0, sizeof (*this));
115 136
137 mtu = DEFAULT_MTU;
116 rekey = DEFAULT_REKEY; 138 rekey = DEFAULT_REKEY;
117 keepalive = DEFAULT_KEEPALIVE; 139 keepalive = DEFAULT_KEEPALIVE;
118 llevel = L_INFO; 140 llevel = L_INFO;
119 ip_proto = IPPROTO_GRE; 141 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP 142#if ENABLE_ICMP
121 icmp_type = ICMP_ECHOREPLY; 143 icmp_type = ICMP_ECHOREPLY;
122#endif 144#endif
123 145
124 default_node.udp_port = DEFAULT_UDPPORT; 146 default_node.udp_port = DEFAULT_UDPPORT;
125 default_node.tcp_port = DEFAULT_UDPPORT; 147 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
126 default_node.connectmode = conf_node::C_ALWAYS; 148 default_node.connectmode = conf_node::C_ALWAYS;
127 default_node.compress = true; 149 default_node.compress = true;
128 default_node.protocols = PROT_UDPv4; 150 default_node.protocols = 0;
151 default_node.max_retry = DEFAULT_MAX_RETRY;
152 default_node.max_ttl = DEFAULT_MAX_TTL;
153 default_node.max_queue = DEFAULT_MAX_QUEUE;
154 default_node.if_up_data = strdup ("");
155
156#if ENABLE_DNS
157 default_node.dns_port = 0; // default is 0 == client
158
159 dns_forw_host = strdup ("127.0.0.1");
160 dns_forw_port = 53;
161 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
162 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
163 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
164 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
165#endif
166
167 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
129} 168}
130 169
131void configuration::cleanup() 170void configuration::cleanup()
132{ 171{
133 if (rsa_key) 172 if (rsa_key)
134 RSA_free (rsa_key); 173 RSA_free (rsa_key);
135 174
136 rsa_key = 0; 175 rsa_key = 0;
137 176
177 free (pidfilename); pidfilename = 0;
138 free (ifname); ifname = 0; 178 free (ifname); ifname = 0;
139#if ENABLE_HTTP_PROXY 179#if ENABLE_HTTP_PROXY
140 free (proxy_host); proxy_host = 0; 180 free (proxy_host); proxy_host = 0;
141 free (proxy_auth); proxy_auth = 0; 181 free (proxy_auth); proxy_auth = 0;
182#endif
183#if ENABLE_DNS
184 free (dns_forw_host); dns_forw_host = 0;
142#endif 185#endif
143} 186}
144 187
145void 188void
146configuration::clear_config () 189configuration::clear ()
147{ 190{
148 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 191 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
149 delete *i; 192 delete *i;
150 193
151 nodes.clear (); 194 nodes.clear ();
152 195
153 cleanup (); 196 cleanup ();
154 init (); 197 init ();
155} 198}
156 199
157#define parse_bool(target,name,trueval,falseval) \ 200#define parse_bool(target,name,trueval,falseval) do { \
158 if (!strcmp (val, "yes")) target = trueval; \ 201 if (!strcmp (val, "yes")) target = trueval; \
159 else if (!strcmp (val, "no")) target = falseval; \ 202 else if (!strcmp (val, "no")) target = falseval; \
160 else if (!strcmp (val, "true")) target = trueval; \ 203 else if (!strcmp (val, "true")) target = trueval; \
161 else if (!strcmp (val, "false")) target = falseval; \ 204 else if (!strcmp (val, "false")) target = falseval; \
162 else if (!strcmp (val, "on")) target = trueval; \ 205 else if (!strcmp (val, "on")) target = trueval; \
163 else if (!strcmp (val, "off")) target = falseval; \ 206 else if (!strcmp (val, "off")) target = falseval; \
164 else \ 207 else \
165 slog (L_WARN, \ 208 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
166 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 209} while (0)
167 name, var, fname, lineno);
168 210
169void configuration::read_config (bool need_keys) 211const char *
212configuration_parser::parse_line (char *line)
213{
214 {
215 char *end = line + strlen (line);
216
217 while (*end < ' ' && end >= line)
218 end--;
219
220 *++end = 0;
221 }
222
223 char *tok = line;
224 const char *var = strtok (tok, "\t =");
225 tok = 0;
226
227 if (!var || !var[0])
228 return 0; /* no tokens on this line */
229
230 if (var[0] == '#')
231 return 0; /* comment: ignore */
232
233 char *val = strtok (NULL, "\t\n\r =");
234
235 if (!val || val[0] == '#')
236 return _("no value given for variable. (ignored)");
237
238 if (!strcmp (var, "on"))
239 {
240 if (!::thisnode
241 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
242 || !strcmp (val, ::thisnode))
243 return parse_line (strtok (NULL, "\n\r"));
244 else
245 return 0;
246 }
247
248 // truly global
249 if (!strcmp (var, "loglevel"))
250 {
251 loglevel l = string_to_loglevel (val);
252
253 if (l == L_NONE)
254 return _("unknown loglevel. (skipping)");
255 }
256 else if (!strcmp (var, "ip-proto"))
257 conf.ip_proto = atoi (val);
258 else if (!strcmp (var, "icmp-type"))
259 {
260#if ENABLE_ICMP
261 conf.icmp_type = atoi (val);
262#endif
263 }
264
265 // per config
266 else if (!strcmp (var, "node"))
267 {
268 parse_argv ();
269
270 conf.default_node.id++;
271 node = new conf_node (conf.default_node);
272 conf.nodes.push_back (node);
273 node->nodename = strdup (val);
274
275 {
276 char *fname;
277 FILE *f;
278
279 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
280
281 f = fopen (fname, "r");
282 if (f)
283 {
284 node->rsa_key = RSA_new ();
285
286 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
287 {
288 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
289 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
290 exit (EXIT_FAILURE);
291 }
292
293 require (RSA_blinding_on (node->rsa_key, 0));
294
295 fclose (f);
296 }
297 else
298 {
299 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
300
301 if (need_keys)
302 exit (EXIT_FAILURE);
303 }
304
305 free (fname);
306 }
307
308 if (::thisnode && !strcmp (node->nodename, ::thisnode))
309 conf.thisnode = node;
310 }
311 else if (!strcmp (var, "private-key"))
312 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
313 else if (!strcmp (var, "ifpersist"))
314 parse_bool (conf.ifpersist, "ifpersist", true, false);
315 else if (!strcmp (var, "ifname"))
316 free (conf.ifname), conf.ifname = strdup (val);
317 else if (!strcmp (var, "rekey"))
318 conf.rekey = atoi (val);
319 else if (!strcmp (var, "keepalive"))
320 conf.keepalive = atoi (val);
321 else if (!strcmp (var, "mtu"))
322 conf.mtu = atoi (val);
323 else if (!strcmp (var, "if-up"))
324 free (conf.script_if_up), conf.script_if_up = strdup (val);
325 else if (!strcmp (var, "node-up"))
326 free (conf.script_node_up), conf.script_node_up = strdup (val);
327 else if (!strcmp (var, "node-down"))
328 free (conf.script_node_down), conf.script_node_down = strdup (val);
329 else if (!strcmp (var, "pid-file"))
330 free (conf.pidfilename), conf.pidfilename = strdup (val);
331 else if (!strcmp (var, "dns-forw-host"))
332 {
333#if ENABLE_DNS
334 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
335#endif
336 }
337 else if (!strcmp (var, "dns-forw-port"))
338 {
339#if ENABLE_DNS
340 conf.dns_forw_port = atoi (val);
341#endif
342 }
343 else if (!strcmp (var, "dns-timeout-factor"))
344 {
345#if ENABLE_DNS
346 conf.dns_timeout_factor = atof (val);
347#endif
348 }
349 else if (!strcmp (var, "dns-send-interval"))
350 {
351#if ENABLE_DNS
352 conf.dns_send_interval = atoi (val);
353#endif
354 }
355 else if (!strcmp (var, "dns-overlap-factor"))
356 {
357#if ENABLE_DNS
358 conf.dns_overlap_factor = atof (val);
359#endif
360 }
361 else if (!strcmp (var, "dns-max-outstanding"))
362 {
363#if ENABLE_DNS
364 conf.dns_max_outstanding = atoi (val);
365#endif
366 }
367 else if (!strcmp (var, "http-proxy-host"))
368 {
369#if ENABLE_HTTP_PROXY
370 free (conf.proxy_host), conf.proxy_host = strdup (val);
371#endif
372 }
373 else if (!strcmp (var, "http-proxy-port"))
374 {
375#if ENABLE_HTTP_PROXY
376 conf.proxy_port = atoi (val);
377#endif
378 }
379 else if (!strcmp (var, "http-proxy-auth"))
380 {
381#if ENABLE_HTTP_PROXY
382 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
383#endif
384 }
385
386 /* node-specific, non-defaultable */
387 else if (node != &conf.default_node && !strcmp (var, "hostname"))
388 free (node->hostname), node->hostname = strdup (val);
389
390 /* node-specific, defaultable */
391 else if (!strcmp (var, "udp-port"))
392 node->udp_port = atoi (val);
393 else if (!strcmp (var, "tcp-port"))
394 node->tcp_port = atoi (val);
395 else if (!strcmp (var, "dns-hostname"))
396 {
397#if ENABLE_DNS
398 free (node->dns_hostname), node->dns_hostname = strdup (val);
399#endif
400 }
401 else if (!strcmp (var, "dns-port"))
402 {
403#if ENABLE_DNS
404 node->dns_port = atoi (val);
405#endif
406 }
407 else if (!strcmp (var, "dns-domain"))
408 {
409#if ENABLE_DNS
410 free (node->domain), node->domain = strdup (val);
411#endif
412 }
413 else if (!strcmp (var, "if-up-data"))
414 free (node->if_up_data), node->if_up_data = strdup (val);
415 else if (!strcmp (var, "router-priority"))
416 node->routerprio = atoi (val);
417 else if (!strcmp (var, "max-retry"))
418 node->max_retry = atoi (val);
419 else if (!strcmp (var, "connect"))
420 {
421 if (!strcmp (val, "ondemand"))
422 node->connectmode = conf_node::C_ONDEMAND;
423 else if (!strcmp (val, "never"))
424 node->connectmode = conf_node::C_NEVER;
425 else if (!strcmp (val, "always"))
426 node->connectmode = conf_node::C_ALWAYS;
427 else if (!strcmp (val, "disabled"))
428 node->connectmode = conf_node::C_DISABLED;
429 else
430 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
431 }
432 else if (!strcmp (var, "inherit-tos"))
433 parse_bool (node->inherit_tos, "inherit-tos", true, false);
434 else if (!strcmp (var, "compress"))
435 parse_bool (node->compress, "compress", true, false);
436 // all these bool options really really cost a lot of executable size!
437 else if (!strcmp (var, "enable-tcp"))
438 {
439#if ENABLE_TCP
440 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
441#endif
442 }
443 else if (!strcmp (var, "enable-icmp"))
444 {
445#if ENABLE_ICMP
446 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
447#endif
448 }
449 else if (!strcmp (var, "enable-dns"))
450 {
451#if ENABLE_DNS
452 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
453#endif
454 }
455 else if (!strcmp (var, "enable-udp"))
456 {
457 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
458 }
459 else if (!strcmp (var, "enable-rawip"))
460 {
461 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
462 }
463 else if (!strcmp (var, "allow-direct"))
464 node->allow_direct.push_back (strdup (val));
465 else if (!strcmp (var, "deny-direct"))
466 node->deny_direct.push_back (strdup (val));
467 else if (!strcmp (var, "max-ttl"))
468 node->max_ttl = atof (val);
469 else if (!strcmp (var, "max-queue"))
470 node->max_queue = atoi (val);
471
472 // unknown or misplaced
473 else
474 return _("unknown configuration directive. (ignored)");
475
476 return 0;
477}
478
479void configuration_parser::parse_argv ()
480{
481 for (int i = 0; i < argc; ++i)
482 {
483 char *v = argv [i];
484
485 if (!*v)
486 continue;
487
488 char *enode = v;
489
490 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
491 enode++;
492
493 if (*enode != '.')
494 enode = 0;
495
496 char *wnode = node == &conf.default_node
497 ? 0
498 : node->nodename;
499
500 if ((!wnode && !enode)
501 || (wnode && enode && !strncmp (wnode, v, enode - v)))
502 {
503 const char *warn = parse_line (enode ? enode + 1 : v);
504
505 if (warn)
506 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
507
508 *v = 0;
509 }
510 }
511}
512
513configuration_parser::configuration_parser (configuration &conf,
514 bool need_keys,
515 int argc,
516 char **argv)
517: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
170{ 518{
171 char *fname; 519 char *fname;
172 FILE *f; 520 FILE *f;
173 521
174 clear_config (); 522 conf.clear ();
175 523
176 asprintf (&fname, "%s/vped.conf", confbase); 524 asprintf (&fname, "%s/gvpe.conf", confbase);
177 f = fopen (fname, "r"); 525 f = fopen (fname, "r");
178 526
179 if (f) 527 if (f)
180 { 528 {
181 char line[16384]; 529 char line[16384];
182 int lineno = 0; 530 int lineno = 0;
183 char *var, *val; 531 node = &conf.default_node;
184 conf_node *node = &default_node;
185 532
186 while (fgets (line, sizeof (line), f)) 533 while (fgets (line, sizeof (line), f))
187 { 534 {
188 lineno++; 535 lineno++;
189 536
190 { 537 const char *warn = parse_line (line);
191 char *end = line + strlen (line);
192 538
193 while (*end < ' ' && end >= line) 539 if (warn)
194 end--; 540 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
195
196 *++end = 0;
197 }
198
199 char *tok = line;
200
201retry:
202 var = strtok (tok, "\t =");
203 tok = 0;
204
205 if (!var || !var[0])
206 continue; /* no tokens on this line */
207
208 if (var[0] == '#')
209 continue; /* comment: ignore */
210
211 val = strtok (NULL, "\t\n\r =");
212
213 if (!val || val[0] == '#')
214 {
215 slog (L_WARN,
216 _("no value for variable `%s', at '%s' line %d"),
217 var, fname, lineno);
218 break;
219 }
220
221 if (!strcmp (var, "on"))
222 {
223 if (!::thisnode
224 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
225 || !strcmp (val, ::thisnode))
226 goto retry;
227
228 continue;
229 }
230
231 // truly global
232 if (!strcmp (var, "loglevel"))
233 {
234 loglevel l = string_to_loglevel (val);
235
236 if (l != L_NONE)
237 llevel = l;
238 else
239 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
240 }
241 else if (!strcmp (var, "ip-proto"))
242 ip_proto = atoi (val);
243#if ENABLE_ICMP
244 //TODO: error message
245 else if (!strcmp (var, "icmp-type"))
246 icmp_type = atoi (val);
247#endif
248
249 // per config
250 else if (!strcmp (var, "node"))
251 {
252 default_node.id++;
253
254 node = new conf_node (default_node);
255
256 nodes.push_back (node);
257
258 node->nodename = strdup (val);
259
260 {
261 char *fname;
262 FILE *f;
263
264 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
265
266 f = fopen (fname, "r");
267 if (f)
268 {
269 node->rsa_key = RSA_new ();
270
271 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
272 {
273 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
274 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
275 exit (1);
276 }
277
278 RSA_blinding_on (node->rsa_key, 0);
279
280 fclose (f);
281 }
282 else
283 {
284 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
285
286 if (need_keys)
287 exit (1);
288 }
289
290 free (fname);
291 }
292
293 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
294 thisnode = node;
295 }
296 else if (!strcmp (var, "private-key"))
297 prikeyfile = strdup (val);
298 else if (!strcmp (var, "ifpersist"))
299 {
300 parse_bool (ifpersist, "ifpersist", true, false);
301 }
302 else if (!strcmp (var, "ifname"))
303 ifname = strdup (val);
304 else if (!strcmp (var, "rekey"))
305 rekey = atoi (val);
306 else if (!strcmp (var, "keepalive"))
307 keepalive = atoi (val);
308 else if (!strcmp (var, "mtu"))
309 mtu = atoi (val);
310 else if (!strcmp (var, "if-up"))
311 script_if_up = strdup (val);
312 else if (!strcmp (var, "node-up"))
313 script_node_up = strdup (val);
314 else if (!strcmp (var, "node-down"))
315 script_node_down = strdup (val);
316#if ENABLE_HTTP_PROXY
317 else if (!strcmp (var, "http-proxy-host"))
318 proxy_host = strdup (val);
319 else if (!strcmp (var, "http-proxy-port"))
320 proxy_port = atoi (val);
321 else if (!strcmp (var, "http-proxy-auth"))
322 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
323#endif
324
325 /* node-specific, non-defaultable */
326 else if (node != &default_node && !strcmp (var, "hostname"))
327 {
328 free (node->hostname);
329 node->hostname = strdup (val);
330 }
331
332 /* node-specific, defaultable */
333 else if (!strcmp (var, "udp-port"))
334 node->udp_port = atoi (val);
335 else if (!strcmp (var, "tcp-port"))
336 node->tcp_port = atoi (val);
337 else if (!strcmp (var, "router-priority"))
338 node->routerprio = atoi (val);
339 else if (!strcmp (var, "connect"))
340 {
341 if (!strcmp (val, "ondemand"))
342 node->connectmode = conf_node::C_ONDEMAND;
343 else if (!strcmp (val, "never"))
344 node->connectmode = conf_node::C_NEVER;
345 else if (!strcmp (val, "always"))
346 node->connectmode = conf_node::C_ALWAYS;
347 else if (!strcmp (val, "disabled"))
348 node->connectmode = conf_node::C_DISABLED;
349 else
350 slog (L_WARN,
351 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
352 var, fname, lineno);
353 }
354 else if (!strcmp (var, "inherit-tos"))
355 {
356 parse_bool (node->inherit_tos, "inherit-tos", true, false);
357 }
358 else if (!strcmp (var, "compress"))
359 {
360 parse_bool (node->compress, "compress", true, false);
361 }
362 // all these bool options really really cost a lot of executable size!
363 else if (!strcmp (var, "enable-tcp"))
364 {
365#if ENABLE_TCP
366 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
367#endif
368 }
369 else if (!strcmp (var, "enable-icmp"))
370 {
371#if ENABLE_ICMP
372 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
373#endif
374 }
375 else if (!strcmp (var, "enable-udp"))
376 {
377 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
378 }
379 else if (!strcmp (var, "enable-rawip"))
380 {
381 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
382 }
383
384 // unknown or misplaced
385 else
386 slog (L_WARN,
387 _("unknown or misplaced variable `%s', at '%s' line %d"),
388 var, fname, lineno);
389 } 541 }
390 542
391 fclose (f); 543 fclose (f);
544
545 parse_argv ();
392 } 546 }
393 else 547 else
394 { 548 {
395 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 549 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
396 exit (1); 550 exit (EXIT_FAILURE);
397 } 551 }
398 552
399 free (fname); 553 free (fname);
400 554
401 fname = config_filename (prikeyfile, "hostkey"); 555 fname = conf.config_filename (conf.prikeyfile, "hostkey");
402 556
403 f = fopen (fname, "r"); 557 f = fopen (fname, "r");
404 if (f) 558 if (f)
405 { 559 {
406 rsa_key = RSA_new (); 560 conf.rsa_key = RSA_new ();
407 561
408 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 562 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
409 { 563 {
410 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 564 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
411 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 565 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
412 exit (1); 566 exit (EXIT_FAILURE);
413 } 567 }
414 568
415 RSA_blinding_on (rsa_key, 0); 569 require (RSA_blinding_on (conf.rsa_key, 0));
416 570
417 fclose (f); 571 fclose (f);
418 } 572 }
419 else 573 else
420 { 574 {
421 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 575 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
422 576
423 if (need_keys) 577 if (need_keys)
424 exit (1); 578 exit (EXIT_FAILURE);
579 }
580
581 if (need_keys && ::thisnode
582 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
583 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
584 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
585 {
586 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
587 exit (EXIT_FAILURE);
425 } 588 }
426 589
427 free (fname); 590 free (fname);
428} 591}
429 592
430char *configuration::config_filename (const char *name, const char *dflt) 593char *configuration::config_filename (const char *name, const char *dflt)
466 printf ("\n"); 629 printf ("\n");
467} 630}
468 631
469configuration::configuration () 632configuration::configuration ()
470{ 633{
634 asprintf (&confbase, "%s/gvpe", CONFDIR);
635
471 init (); 636 init ();
472} 637}
473 638
474configuration::~configuration () 639configuration::~configuration ()
475{ 640{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines