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.34 by pcg, Thu Mar 17 23:59:37 2005 UTC vs.
Revision 1.51 by pcg, Sat Jul 18 05:59:16 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines