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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines