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.36 by pcg, Sun Mar 20 02:34:16 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>
… …
69 if (protocol & PROT_DNSv4 ) return "dns"; 79 if (protocol & PROT_DNSv4 ) return "dns";
70 80
71 return "<unknown>"; 81 return "<unknown>";
72} 82}
73 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
74void 108void
75conf_node::print () 109conf_node::print ()
76{ 110{
77 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",
78 id, 112 id,
79 id >> 8, id & 0xff, 113 id >> 8, id & 0xff,
80 compress ? 'Y' : 'N', 114 compress ? 'Y' : 'N',
81 connectmode == C_ONDEMAND ? "ondemand" : 115 connectmode == C_ONDEMAND ? "ondemand"
82 connectmode == C_NEVER ? "never" : 116 : connectmode == C_NEVER ? "never"
83 connectmode == C_ALWAYS ? "always" : "", 117 : connectmode == C_ALWAYS ? "always"
118 : connectmode == C_DISABLED ? "disabled"
119 : "",
84 nodename, 120 nodename,
85 hostname ? hostname : "", 121 hostname ? hostname : "",
86 hostname ? ":" : "", 122 hostname ? ":" : "",
87 hostname ? udp_port : 0 123 hostname ? udp_port : 0
88 ); 124 );
89} 125}
90 126
91conf_node::~conf_node () 127conf_node::~conf_node ()
92{ 128{
129#if 0
130 // does not work, because string pointers etc. are shared
131 // is not called, however
93 if (rsa_key) 132 if (rsa_key)
94 RSA_free (rsa_key); 133 RSA_free (rsa_key);
95 134
96 free (nodename); 135 free (nodename);
97 free (hostname); 136 free (hostname);
137 free (if_up_data);
98#if ENABLE_DNS 138#if ENABLE_DNS
99 free (domain); 139 free (domain);
100 free (dns_hostname); 140 free (dns_hostname);
101#endif 141#endif
142#endif
102} 143}
103 144
104void configuration::init () 145void configuration::init ()
105{ 146{
106 memset (this, 0, sizeof (*this)); 147 memset (this, 0, sizeof (*this));
107 148
108 mtu = DEFAULT_MTU; 149 mtu = DEFAULT_MTU;
150 nfmark = 0;
109 rekey = DEFAULT_REKEY; 151 rekey = DEFAULT_REKEY;
110 keepalive = DEFAULT_KEEPALIVE; 152 keepalive = DEFAULT_KEEPALIVE;
111 llevel = L_INFO; 153 llevel = L_INFO;
112 ip_proto = IPPROTO_GRE; 154 ip_proto = IPPROTO_GRE;
113#if ENABLE_ICMP 155#if ENABLE_ICMP
… …
118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 160 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119 default_node.connectmode = conf_node::C_ALWAYS; 161 default_node.connectmode = conf_node::C_ALWAYS;
120 default_node.compress = true; 162 default_node.compress = true;
121 default_node.protocols = 0; 163 default_node.protocols = 0;
122 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 ("");
123 168
124#if ENABLE_DNS 169#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client 170 default_node.dns_port = 0; // default is 0 == client
171
126 dns_forw_host = strdup ("127.0.0.1"); 172 dns_forw_host = strdup ("127.0.0.1");
127 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;
128#endif 178#endif
129 179
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
131} 181}
132 182
… …
135 if (rsa_key) 185 if (rsa_key)
136 RSA_free (rsa_key); 186 RSA_free (rsa_key);
137 187
138 rsa_key = 0; 188 rsa_key = 0;
139 189
140 free (pidfilename); pidfilename = 0; 190 free (pidfilename); pidfilename = 0;
141 free (ifname); ifname = 0; 191 free (ifname); ifname = 0;
142#if ENABLE_HTTP_PROXY 192#if ENABLE_HTTP_PROXY
143 free (proxy_host); proxy_host = 0; 193 free (proxy_host); proxy_host = 0;
144 free (proxy_auth); proxy_auth = 0; 194 free (proxy_auth); proxy_auth = 0;
145#endif 195#endif
146#if ENABLE_DNS 196#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0; 197 free (dns_forw_host); dns_forw_host = 0;
148#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;
149} 203}
150 204
151void 205void
152configuration::clear_config () 206configuration::clear ()
153{ 207{
154 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)
155 delete *i; 209 delete *i;
156 210
157 nodes.clear (); 211 nodes.clear ();
158 212
159 cleanup (); 213 cleanup ();
160 init (); 214 init ();
161} 215}
162 216
163#define parse_bool(target,name,trueval,falseval) \ 217#define parse_bool(target,name,trueval,falseval) do { \
164 if (!strcmp (val, "yes")) target = trueval; \ 218 if (!strcmp (val, "yes")) target = trueval; \
165 else if (!strcmp (val, "no")) target = falseval; \ 219 else if (!strcmp (val, "no")) target = falseval; \
166 else if (!strcmp (val, "true")) target = trueval; \ 220 else if (!strcmp (val, "true")) target = trueval; \
167 else if (!strcmp (val, "false")) target = falseval; \ 221 else if (!strcmp (val, "false")) target = falseval; \
168 else if (!strcmp (val, "on")) target = trueval; \ 222 else if (!strcmp (val, "on")) target = trueval; \
169 else if (!strcmp (val, "off")) target = falseval; \ 223 else if (!strcmp (val, "off")) target = falseval; \
170 else \ 224 else \
171 slog (L_WARN, \ 225 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
172 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 226} while (0)
173 name, var, fname, lineno);
174 227
175void 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)
176{ 554{
177 char *fname; 555 char *fname;
178 FILE *f; 556 FILE *f;
179 557
180 clear_config (); 558 conf.clear ();
181 559
182 asprintf (&fname, "%s/gvpe.conf", confbase); 560 asprintf (&fname, "%s/gvpe.conf", confbase);
183 f = fopen (fname, "r"); 561 f = fopen (fname, "r");
184 562
185 if (f) 563 if (f)
186 { 564 {
187 char line[16384]; 565 char line[16384];
188 int lineno = 0; 566 int lineno = 0;
189 char *var, *val; 567 node = &conf.default_node;
190 conf_node *node = &default_node;
191 568
192 while (fgets (line, sizeof (line), f)) 569 while (fgets (line, sizeof (line), f))
193 { 570 {
194 lineno++; 571 lineno++;
195 572
196 { 573 const char *warn = parse_line (line);
197 char *end = line + strlen (line);
198 574
199 while (*end < ' ' && end >= line) 575 if (warn)
200 end--; 576 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
201
202 *++end = 0;
203 }
204
205 char *tok = line;
206
207retry:
208 var = strtok (tok, "\t =");
209 tok = 0;
210
211 if (!var || !var[0])
212 continue; /* no tokens on this line */
213
214 if (var[0] == '#')
215 continue; /* comment: ignore */
216
217 val = strtok (NULL, "\t\n\r =");
218
219 if (!val || val[0] == '#')
220 {
221 slog (L_WARN,
222 _("no value for variable `%s', at '%s' line %d, skipping."),
223 var, fname, lineno);
224 continue;
225 }
226
227 if (!strcmp (var, "on"))
228 {
229 if (!::thisnode
230 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
231 || !strcmp (val, ::thisnode))
232 goto retry;
233
234 continue;
235 }
236
237 // truly global
238 if (!strcmp (var, "loglevel"))
239 {
240 loglevel l = string_to_loglevel (val);
241
242 if (l != L_NONE)
243 llevel = l;
244 else
245 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
246 }
247 else if (!strcmp (var, "ip-proto"))
248 ip_proto = atoi (val);
249 else if (!strcmp (var, "icmp-type"))
250 {
251#if ENABLE_ICMP
252 icmp_type = atoi (val);
253#endif
254 }
255
256 // per config
257 else if (!strcmp (var, "node"))
258 {
259 default_node.id++;
260
261 node = new conf_node (default_node);
262
263 nodes.push_back (node);
264
265 node->nodename = strdup (val);
266
267 {
268 char *fname;
269 FILE *f;
270
271 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
272
273 f = fopen (fname, "r");
274 if (f)
275 {
276 node->rsa_key = RSA_new ();
277
278 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
279 {
280 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
281 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
282 exit (EXIT_FAILURE);
283 }
284
285 require (RSA_blinding_on (node->rsa_key, 0));
286
287 fclose (f);
288 }
289 else
290 {
291 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
292
293 if (need_keys)
294 exit (EXIT_FAILURE);
295 }
296
297 free (fname);
298 }
299
300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
301 thisnode = node;
302 }
303 else if (!strcmp (var, "private-key"))
304 free (prikeyfile), prikeyfile = strdup (val);
305 else if (!strcmp (var, "ifpersist"))
306 parse_bool (ifpersist, "ifpersist", true, false);
307 else if (!strcmp (var, "ifname"))
308 free (ifname), ifname = strdup (val);
309 else if (!strcmp (var, "rekey"))
310 rekey = atoi (val);
311 else if (!strcmp (var, "keepalive"))
312 keepalive = atoi (val);
313 else if (!strcmp (var, "mtu"))
314 mtu = atoi (val);
315 else if (!strcmp (var, "if-up"))
316 free (script_if_up), script_if_up = strdup (val);
317 else if (!strcmp (var, "node-up"))
318 free (script_node_up), script_node_up = strdup (val);
319 else if (!strcmp (var, "node-down"))
320 free (script_node_down), script_node_down = strdup (val);
321 else if (!strcmp (var, "pid-file"))
322 free (pidfilename), pidfilename = strdup (val);
323 else if (!strcmp (var, "dns-forw-host"))
324 {
325#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-forw-port"))
330 {
331#if ENABLE_DNS
332 dns_forw_port = atoi (val);
333#endif
334 }
335 else if (!strcmp (var, "http-proxy-host"))
336 {
337#if ENABLE_HTTP_PROXY
338 free (proxy_host), proxy_host = strdup (val);
339#endif
340 }
341 else if (!strcmp (var, "http-proxy-port"))
342 {
343#if ENABLE_HTTP_PROXY
344 proxy_port = atoi (val);
345#endif
346 }
347 else if (!strcmp (var, "http-proxy-auth"))
348 {
349#if ENABLE_HTTP_PROXY
350 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
351#endif
352 }
353
354 /* node-specific, non-defaultable */
355 else if (node != &default_node && !strcmp (var, "hostname"))
356 free (node->hostname), node->hostname = strdup (val);
357
358 /* node-specific, defaultable */
359 else if (!strcmp (var, "udp-port"))
360 node->udp_port = atoi (val);
361 else if (!strcmp (var, "tcp-port"))
362 node->tcp_port = atoi (val);
363 else if (!strcmp (var, "dns-hostname"))
364 {
365#if ENABLE_DNS
366 free (node->dns_hostname), node->dns_hostname = strdup (val);
367#endif
368 }
369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
372 node->dns_port = atoi (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-domain"))
376 {
377#if ENABLE_DNS
378 free (node->domain), node->domain = strdup (val);
379#endif
380 }
381 else if (!strcmp (var, "router-priority"))
382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
385 else if (!strcmp (var, "connect"))
386 {
387 if (!strcmp (val, "ondemand"))
388 node->connectmode = conf_node::C_ONDEMAND;
389 else if (!strcmp (val, "never"))
390 node->connectmode = conf_node::C_NEVER;
391 else if (!strcmp (val, "always"))
392 node->connectmode = conf_node::C_ALWAYS;
393 else if (!strcmp (val, "disabled"))
394 node->connectmode = conf_node::C_DISABLED;
395 else
396 slog (L_WARN,
397 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
398 var, fname, lineno);
399 }
400 else if (!strcmp (var, "inherit-tos"))
401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
402 else if (!strcmp (var, "compress"))
403 parse_bool (node->compress, "compress", true, false);
404 // all these bool options really really cost a lot of executable size!
405 else if (!strcmp (var, "enable-tcp"))
406 {
407#if ENABLE_TCP
408 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
409#endif
410 }
411 else if (!strcmp (var, "enable-icmp"))
412 {
413#if ENABLE_ICMP
414 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-dns"))
418 {
419#if ENABLE_DNS
420 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
421#endif
422 }
423 else if (!strcmp (var, "enable-udp"))
424 {
425 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
426 }
427 else if (!strcmp (var, "enable-rawip"))
428 {
429 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
430 }
431
432 // unknown or misplaced
433 else
434 slog (L_WARN,
435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
436 var, fname, lineno);
437 } 577 }
438 578
439 fclose (f); 579 fclose (f);
580
581 parse_argv ();
440 } 582 }
441 else 583 else
442 { 584 {
443 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));
444 exit (EXIT_FAILURE); 586 exit (EXIT_FAILURE);
445 } 587 }
446 588
447 free (fname); 589 free (fname);
448 590
449 fname = config_filename (prikeyfile, "hostkey"); 591 fname = conf.config_filename (conf.prikeyfile, "hostkey");
450 592
451 f = fopen (fname, "r"); 593 f = fopen (fname, "r");
452 if (f) 594 if (f)
453 { 595 {
454 rsa_key = RSA_new (); 596 conf.rsa_key = RSA_new ();
455 597
456 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 598 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
457 { 599 {
458 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 600 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
459 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));
460 exit (EXIT_FAILURE); 602 exit (EXIT_FAILURE);
461 } 603 }
462 604
463 require (RSA_blinding_on (rsa_key, 0)); 605 require (RSA_blinding_on (conf.rsa_key, 0));
464 606
465 fclose (f); 607 fclose (f);
466 } 608 }
467 else 609 else
468 { 610 {
… …
471 if (need_keys) 613 if (need_keys)
472 exit (EXIT_FAILURE); 614 exit (EXIT_FAILURE);
473 } 615 }
474 616
475 if (need_keys && ::thisnode 617 if (need_keys && ::thisnode
476 && rsa_key && thisnode && thisnode->rsa_key) 618 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
477 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
478 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 620 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
479 { 621 {
480 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);
481 exit (EXIT_FAILURE); 623 exit (EXIT_FAILURE);
482 } 624 }
483 625
484 free (fname); 626 free (fname);
627
628 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
629 (*i)->finalise ();
485} 630}
486 631
487char *configuration::config_filename (const char *name, const char *dflt) 632char *configuration::config_filename (const char *name, const char *dflt)
488{ 633{
489 char *fname; 634 char *fname;

Diff Legend

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