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.31 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.50 by pcg, Mon Mar 23 15:22:00 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 = 53; 170 default_node.dns_port = 0; // default is 0 == client
171
172 dns_forw_host = strdup ("127.0.0.1");
128 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;
129#endif 178#endif
130 179
131 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
132} 181}
133 182
… …
148 free (dns_forw_host); dns_forw_host = 0; 197 free (dns_forw_host); dns_forw_host = 0;
149#endif 198#endif
150} 199}
151 200
152void 201void
153configuration::clear_config () 202configuration::clear ()
154{ 203{
155 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 204 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
156 delete *i; 205 delete *i;
157 206
158 nodes.clear (); 207 nodes.clear ();
159 208
160 cleanup (); 209 cleanup ();
161 init (); 210 init ();
162} 211}
163 212
164#define parse_bool(target,name,trueval,falseval) \ 213#define parse_bool(target,name,trueval,falseval) do { \
165 if (!strcmp (val, "yes")) target = trueval; \ 214 if (!strcmp (val, "yes")) target = trueval; \
166 else if (!strcmp (val, "no")) target = falseval; \ 215 else if (!strcmp (val, "no")) target = falseval; \
167 else if (!strcmp (val, "true")) target = trueval; \ 216 else if (!strcmp (val, "true")) target = trueval; \
168 else if (!strcmp (val, "false")) target = falseval; \ 217 else if (!strcmp (val, "false")) target = falseval; \
169 else if (!strcmp (val, "on")) target = trueval; \ 218 else if (!strcmp (val, "on")) target = trueval; \
170 else if (!strcmp (val, "off")) target = falseval; \ 219 else if (!strcmp (val, "off")) target = falseval; \
171 else \ 220 else \
172 slog (L_WARN, \ 221 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
173 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 222} while (0)
174 name, var, fname, lineno);
175 223
176void configuration::read_config (bool need_keys) 224const char *
225configuration_parser::parse_line (char *line)
226{
227 {
228 char *end = line + strlen (line);
229
230 while (*end < ' ' && end >= line)
231 end--;
232
233 *++end = 0;
234 }
235
236 char *tok = line;
237 const char *var = strtok (tok, "\t =");
238 tok = 0;
239
240 if (!var || !var[0])
241 return 0; /* no tokens on this line */
242
243 if (var[0] == '#')
244 return 0; /* comment: ignore */
245
246 char *val = strtok (NULL, "\t\n\r =");
247
248 if (!val || val[0] == '#')
249 return _("no value given for variable. (ignored)");
250
251 if (!strcmp (var, "on"))
252 {
253 if (!::thisnode
254 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
255 || !strcmp (val, ::thisnode))
256 return parse_line (strtok (NULL, "\n\r"));
257 else
258 return 0;
259 }
260
261 // truly global
262 if (!strcmp (var, "loglevel"))
263 {
264 loglevel l = string_to_loglevel (val);
265
266 if (l == L_NONE)
267 return _("unknown loglevel. (skipping)");
268 }
269 else if (!strcmp (var, "ip-proto"))
270 conf.ip_proto = atoi (val);
271 else if (!strcmp (var, "icmp-type"))
272 {
273#if ENABLE_ICMP
274 conf.icmp_type = atoi (val);
275#endif
276 }
277
278 // per config
279 else if (!strcmp (var, "node"))
280 {
281 parse_argv ();
282
283 conf.default_node.id++;
284 node = new conf_node (conf.default_node);
285 conf.nodes.push_back (node);
286 node->nodename = strdup (val);
287
288 {
289 char *fname;
290 FILE *f;
291
292 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
293
294 f = fopen (fname, "r");
295 if (f)
296 {
297 node->rsa_key = RSA_new ();
298
299 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
300 {
301 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
302 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
303 exit (EXIT_FAILURE);
304 }
305
306 require (RSA_blinding_on (node->rsa_key, 0));
307
308 fclose (f);
309 }
310 else
311 {
312 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
313
314 if (need_keys)
315 exit (EXIT_FAILURE);
316 }
317
318 free (fname);
319 }
320
321 if (::thisnode && !strcmp (node->nodename, ::thisnode))
322 conf.thisnode = node;
323 }
324 else if (!strcmp (var, "private-key"))
325 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
326 else if (!strcmp (var, "ifpersist"))
327 parse_bool (conf.ifpersist, "ifpersist", true, false);
328 else if (!strcmp (var, "ifname"))
329 free (conf.ifname), conf.ifname = strdup (val);
330 else if (!strcmp (var, "rekey"))
331 conf.rekey = atoi (val);
332 else if (!strcmp (var, "keepalive"))
333 conf.keepalive = atoi (val);
334 else if (!strcmp (var, "mtu"))
335 conf.mtu = atoi (val);
336 else if (!strcmp (var, "nfmark"))
337 conf.nfmark = atoi (val);
338 else if (!strcmp (var, "if-up"))
339 free (conf.script_if_up), conf.script_if_up = strdup (val);
340 else if (!strcmp (var, "node-up"))
341 free (conf.script_node_up), conf.script_node_up = strdup (val);
342 else if (!strcmp (var, "node-down"))
343 free (conf.script_node_down), conf.script_node_down = strdup (val);
344 else if (!strcmp (var, "pid-file"))
345 free (conf.pidfilename), conf.pidfilename = strdup (val);
346 else if (!strcmp (var, "dns-forw-host"))
347 {
348#if ENABLE_DNS
349 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
350#endif
351 }
352 else if (!strcmp (var, "dns-forw-port"))
353 {
354#if ENABLE_DNS
355 conf.dns_forw_port = atoi (val);
356#endif
357 }
358 else if (!strcmp (var, "dns-timeout-factor"))
359 {
360#if ENABLE_DNS
361 conf.dns_timeout_factor = atof (val);
362#endif
363 }
364 else if (!strcmp (var, "dns-send-interval"))
365 {
366#if ENABLE_DNS
367 conf.dns_send_interval = atoi (val);
368#endif
369 }
370 else if (!strcmp (var, "dns-overlap-factor"))
371 {
372#if ENABLE_DNS
373 conf.dns_overlap_factor = atof (val);
374#endif
375 }
376 else if (!strcmp (var, "dns-max-outstanding"))
377 {
378#if ENABLE_DNS
379 conf.dns_max_outstanding = atoi (val);
380#endif
381 }
382 else if (!strcmp (var, "http-proxy-host"))
383 {
384#if ENABLE_HTTP_PROXY
385 free (conf.proxy_host), conf.proxy_host = strdup (val);
386#endif
387 }
388 else if (!strcmp (var, "http-proxy-port"))
389 {
390#if ENABLE_HTTP_PROXY
391 conf.proxy_port = atoi (val);
392#endif
393 }
394 else if (!strcmp (var, "http-proxy-auth"))
395 {
396#if ENABLE_HTTP_PROXY
397 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
398#endif
399 }
400
401 /* node-specific, non-defaultable */
402 else if (node != &conf.default_node && !strcmp (var, "hostname"))
403 free (node->hostname), node->hostname = strdup (val);
404
405 /* node-specific, defaultable */
406 else if (!strcmp (var, "udp-port"))
407 node->udp_port = atoi (val);
408 else if (!strcmp (var, "tcp-port"))
409 node->tcp_port = atoi (val);
410 else if (!strcmp (var, "dns-hostname"))
411 {
412#if ENABLE_DNS
413 free (node->dns_hostname), node->dns_hostname = strdup (val);
414#endif
415 }
416 else if (!strcmp (var, "dns-port"))
417 {
418#if ENABLE_DNS
419 node->dns_port = atoi (val);
420#endif
421 }
422 else if (!strcmp (var, "dns-domain"))
423 {
424#if ENABLE_DNS
425 free (node->domain), node->domain = strdup (val);
426#endif
427 }
428 else if (!strcmp (var, "if-up-data"))
429 free (node->if_up_data), node->if_up_data = strdup (val);
430 else if (!strcmp (var, "router-priority"))
431 node->routerprio = atoi (val);
432 else if (!strcmp (var, "max-retry"))
433 node->max_retry = atoi (val);
434 else if (!strcmp (var, "connect"))
435 {
436 if (!strcmp (val, "ondemand"))
437 node->connectmode = conf_node::C_ONDEMAND;
438 else if (!strcmp (val, "never"))
439 node->connectmode = conf_node::C_NEVER;
440 else if (!strcmp (val, "always"))
441 node->connectmode = conf_node::C_ALWAYS;
442 else if (!strcmp (val, "disabled"))
443 node->connectmode = conf_node::C_DISABLED;
444 else
445 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
446 }
447 else if (!strcmp (var, "inherit-tos"))
448 parse_bool (node->inherit_tos, "inherit-tos", true, false);
449 else if (!strcmp (var, "compress"))
450 parse_bool (node->compress, "compress", true, false);
451 // all these bool options really really cost a lot of executable size!
452 else if (!strcmp (var, "enable-tcp"))
453 {
454#if ENABLE_TCP
455 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
456#endif
457 }
458 else if (!strcmp (var, "enable-icmp"))
459 {
460#if ENABLE_ICMP
461 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
462#endif
463 }
464 else if (!strcmp (var, "enable-dns"))
465 {
466#if ENABLE_DNS
467 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
468#endif
469 }
470 else if (!strcmp (var, "enable-udp"))
471 {
472 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
473 }
474 else if (!strcmp (var, "enable-rawip"))
475 {
476 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
477 }
478 else if (!strcmp (var, "allow-direct"))
479 node->allow_direct.push_back (strdup (val));
480 else if (!strcmp (var, "deny-direct"))
481 node->deny_direct.push_back (strdup (val));
482 else if (!strcmp (var, "max-ttl"))
483 node->max_ttl = atof (val);
484 else if (!strcmp (var, "max-queue"))
485 node->max_queue = atoi (val);
486
487 // unknown or misplaced
488 else
489 return _("unknown configuration directive. (ignored)");
490
491 return 0;
492}
493
494void conf_node::finalise ()
495{
496 if (max_queue < 1)
497 {
498 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
499 max_queue = 1;
500 }
501
502 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
503 {
504 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
505 connectmode = C_ALWAYS;
506 }
507}
508
509void configuration_parser::parse_argv ()
510{
511 for (int i = 0; i < argc; ++i)
512 {
513 char *v = argv [i];
514
515 if (!*v)
516 continue;
517
518 char *enode = v;
519
520 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
521 enode++;
522
523 if (*enode != '.')
524 enode = 0;
525
526 char *wnode = node == &conf.default_node
527 ? 0
528 : node->nodename;
529
530 if ((!wnode && !enode)
531 || (wnode && enode && !strncmp (wnode, v, enode - v)))
532 {
533 const char *warn = parse_line (enode ? enode + 1 : v);
534
535 if (warn)
536 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
537
538 *v = 0;
539 }
540 }
541}
542
543configuration_parser::configuration_parser (configuration &conf,
544 bool need_keys,
545 int argc,
546 char **argv)
547: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
177{ 548{
178 char *fname; 549 char *fname;
179 FILE *f; 550 FILE *f;
180 551
181 clear_config (); 552 conf.clear ();
182 553
183 asprintf (&fname, "%s/gvpe.conf", confbase); 554 asprintf (&fname, "%s/gvpe.conf", confbase);
184 f = fopen (fname, "r"); 555 f = fopen (fname, "r");
185 556
186 if (f) 557 if (f)
187 { 558 {
188 char line[16384]; 559 char line[16384];
189 int lineno = 0; 560 int lineno = 0;
190 char *var, *val; 561 node = &conf.default_node;
191 conf_node *node = &default_node;
192 562
193 while (fgets (line, sizeof (line), f)) 563 while (fgets (line, sizeof (line), f))
194 { 564 {
195 lineno++; 565 lineno++;
196 566
197 { 567 const char *warn = parse_line (line);
198 char *end = line + strlen (line);
199 568
200 while (*end < ' ' && end >= line) 569 if (warn)
201 end--; 570 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
202
203 *++end = 0;
204 }
205
206 char *tok = line;
207
208retry:
209 var = strtok (tok, "\t =");
210 tok = 0;
211
212 if (!var || !var[0])
213 continue; /* no tokens on this line */
214
215 if (var[0] == '#')
216 continue; /* comment: ignore */
217
218 val = strtok (NULL, "\t\n\r =");
219
220 if (!val || val[0] == '#')
221 {
222 slog (L_WARN,
223 _("no value for variable `%s', at '%s' line %d"),
224 var, fname, lineno);
225 break;
226 }
227
228 if (!strcmp (var, "on"))
229 {
230 if (!::thisnode
231 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
232 || !strcmp (val, ::thisnode))
233 goto retry;
234
235 continue;
236 }
237
238 // truly global
239 if (!strcmp (var, "loglevel"))
240 {
241 loglevel l = string_to_loglevel (val);
242
243 if (l != L_NONE)
244 llevel = l;
245 else
246 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
247 }
248 else if (!strcmp (var, "ip-proto"))
249 ip_proto = atoi (val);
250 else if (!strcmp (var, "icmp-type"))
251 {
252#if ENABLE_ICMP
253 icmp_type = atoi (val);
254#endif
255 }
256
257 // per config
258 else if (!strcmp (var, "node"))
259 {
260 default_node.id++;
261
262 node = new conf_node (default_node);
263
264 nodes.push_back (node);
265
266 node->nodename = strdup (val);
267
268 {
269 char *fname;
270 FILE *f;
271
272 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
273
274 f = fopen (fname, "r");
275 if (f)
276 {
277 node->rsa_key = RSA_new ();
278
279 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
280 {
281 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
282 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
283 exit (EXIT_FAILURE);
284 }
285
286 require (RSA_blinding_on (node->rsa_key, 0));
287
288 fclose (f);
289 }
290 else
291 {
292 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
293
294 if (need_keys)
295 exit (EXIT_FAILURE);
296 }
297
298 free (fname);
299 }
300
301 if (::thisnode && !strcmp (node->nodename, ::thisnode))
302 thisnode = node;
303 }
304 else if (!strcmp (var, "private-key"))
305 free (prikeyfile), prikeyfile = strdup (val);
306 else if (!strcmp (var, "ifpersist"))
307 {
308 parse_bool (ifpersist, "ifpersist", true, false);
309 }
310 else if (!strcmp (var, "ifname"))
311 free (ifname), ifname = strdup (val);
312 else if (!strcmp (var, "rekey"))
313 rekey = atoi (val);
314 else if (!strcmp (var, "keepalive"))
315 keepalive = atoi (val);
316 else if (!strcmp (var, "mtu"))
317 mtu = atoi (val);
318 else if (!strcmp (var, "if-up"))
319 free (script_if_up), script_if_up = strdup (val);
320 else if (!strcmp (var, "node-up"))
321 free (script_node_up), script_node_up = strdup (val);
322 else if (!strcmp (var, "node-down"))
323 free (script_node_down), script_node_down = strdup (val);
324 else if (!strcmp (var, "pid-file"))
325 free (pidfilename), pidfilename = strdup (val);
326#if ENABLE_DNS
327 else if (!strcmp (var, "dns-forw-host"))
328 free (dns_forw_host), dns_forw_host = strdup (val);
329 else if (!strcmp (var, "dns-forw-port"))
330 dns_forw_port = atoi (val);
331#endif
332 else if (!strcmp (var, "http-proxy-host"))
333 {
334#if ENABLE_HTTP_PROXY
335 free (proxy_host), proxy_host = strdup (val);
336#endif
337 }
338 else if (!strcmp (var, "http-proxy-port"))
339 {
340#if ENABLE_HTTP_PROXY
341 proxy_port = atoi (val);
342#endif
343 }
344 else if (!strcmp (var, "http-proxy-auth"))
345 {
346#if ENABLE_HTTP_PROXY
347 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
348#endif
349 }
350
351 /* node-specific, non-defaultable */
352 else if (node != &default_node && !strcmp (var, "hostname"))
353 free (node->hostname), node->hostname = strdup (val);
354
355 /* node-specific, defaultable */
356 else if (!strcmp (var, "udp-port"))
357 node->udp_port = atoi (val);
358 else if (!strcmp (var, "tcp-port"))
359 node->tcp_port = atoi (val);
360#if ENABLE_DNS
361 else if (!strcmp (var, "dns-hostname"))
362 free (node->dns_hostname), node->dns_hostname = strdup (val);
363 else if (!strcmp (var, "dns-port"))
364 node->dns_port = atoi (val);
365#endif
366 else if (!strcmp (var, "dns-domain"))
367 {
368#if ENABLE_DNS
369 free (node->domain), node->domain = strdup (val);
370#endif
371 }
372 else if (!strcmp (var, "router-priority"))
373 node->routerprio = atoi (val);
374 else if (!strcmp (var, "max-retry"))
375 node->max_retry = atoi (val);
376 else if (!strcmp (var, "connect"))
377 {
378 if (!strcmp (val, "ondemand"))
379 node->connectmode = conf_node::C_ONDEMAND;
380 else if (!strcmp (val, "never"))
381 node->connectmode = conf_node::C_NEVER;
382 else if (!strcmp (val, "always"))
383 node->connectmode = conf_node::C_ALWAYS;
384 else if (!strcmp (val, "disabled"))
385 node->connectmode = conf_node::C_DISABLED;
386 else
387 slog (L_WARN,
388 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
389 var, fname, lineno);
390 }
391 else if (!strcmp (var, "inherit-tos"))
392 {
393 parse_bool (node->inherit_tos, "inherit-tos", true, false);
394 }
395 else if (!strcmp (var, "compress"))
396 {
397 parse_bool (node->compress, "compress", true, false);
398 }
399 // all these bool options really really cost a lot of executable size!
400 else if (!strcmp (var, "enable-tcp"))
401 {
402#if ENABLE_TCP
403 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
404#endif
405 }
406 else if (!strcmp (var, "enable-icmp"))
407 {
408#if ENABLE_ICMP
409 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
410#endif
411 }
412 else if (!strcmp (var, "enable-dns"))
413 {
414#if ENABLE_DNS
415 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
416#endif
417 }
418 else if (!strcmp (var, "enable-udp"))
419 {
420 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
421 }
422 else if (!strcmp (var, "enable-rawip"))
423 {
424 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
425 }
426
427 // unknown or misplaced
428 else
429 slog (L_WARN,
430 _("unknown or misplaced variable `%s', at '%s' line %d"),
431 var, fname, lineno);
432 } 571 }
433 572
434 fclose (f); 573 fclose (f);
574
575 parse_argv ();
435 } 576 }
436 else 577 else
437 { 578 {
438 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 579 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
439 exit (EXIT_FAILURE); 580 exit (EXIT_FAILURE);
440 } 581 }
441 582
442 free (fname); 583 free (fname);
443 584
444 fname = config_filename (prikeyfile, "hostkey"); 585 fname = conf.config_filename (conf.prikeyfile, "hostkey");
445 586
446 f = fopen (fname, "r"); 587 f = fopen (fname, "r");
447 if (f) 588 if (f)
448 { 589 {
449 rsa_key = RSA_new (); 590 conf.rsa_key = RSA_new ();
450 591
451 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 592 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
452 { 593 {
453 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 594 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
454 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 595 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
455 exit (EXIT_FAILURE); 596 exit (EXIT_FAILURE);
456 } 597 }
457 598
458 require (RSA_blinding_on (rsa_key, 0)); 599 require (RSA_blinding_on (conf.rsa_key, 0));
459 600
460 fclose (f); 601 fclose (f);
461 } 602 }
462 else 603 else
463 { 604 {
… …
466 if (need_keys) 607 if (need_keys)
467 exit (EXIT_FAILURE); 608 exit (EXIT_FAILURE);
468 } 609 }
469 610
470 if (need_keys && ::thisnode 611 if (need_keys && ::thisnode
471 && rsa_key && thisnode && thisnode->rsa_key) 612 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
472 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 613 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
473 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 614 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
474 { 615 {
475 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 616 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
476 exit (EXIT_FAILURE); 617 exit (EXIT_FAILURE);
477 } 618 }
478 619
479 free (fname); 620 free (fname);
621
622 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
623 (*i)->finalise ();
480} 624}
481 625
482char *configuration::config_filename (const char *name, const char *dflt) 626char *configuration::config_filename (const char *name, const char *dflt)
483{ 627{
484 char *fname; 628 char *fname;

Diff Legend

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