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

Diff Legend

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