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.22 by pcg, Thu Jan 29 18:55:10 2004 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cstdio> 34#include <cstdio>
… …
35#include <openssl/pem.h> 47#include <openssl/pem.h>
36#include <openssl/rsa.h> 48#include <openssl/rsa.h>
37#include <openssl/rand.h> 49#include <openssl/rand.h>
38#include <openssl/bn.h> 50#include <openssl/bn.h>
39 51
40#include "gettext.h"
41
42#include "conf.h" 52#include "conf.h"
43#include "slog.h" 53#include "slog.h"
44#include "util.h" 54#include "util.h"
45 55
46char *confbase; 56char *confbase;
47char *thisnode; 57char *thisnode;
48char *identname; 58char *identname;
49char *pidfilename;
50 59
51struct configuration conf; 60struct configuration conf;
52 61
53u8 best_protocol (u8 protset) 62u8 best_protocol (u8 protset)
54{ 63{
55 if (protset & PROT_IPv4 ) return PROT_IPv4; 64 if (protset & PROT_IPv4 ) return PROT_IPv4;
56 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 65 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
57 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 66 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
58 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 67 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 69
60 return 0; 70 return 0;
61} 71}
62 72
63const char *strprotocol (u8 protocol) 73const char *strprotocol (u8 protocol)
64{ 74{
65 if (protocol & PROT_IPv4 ) return "rawip"; 75 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 76 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 77 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 78 if (protocol & PROT_TCPv4 ) return "tcp";
79 if (protocol & PROT_DNSv4 ) return "dns";
69 80
70 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::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;
71} 106}
72 107
73void 108void
74conf_node::print () 109conf_node::print ()
75{ 110{
76 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",
77 id, 112 id,
78 id >> 8, id & 0xff, 113 id >> 8, id & 0xff,
79 compress ? 'Y' : 'N', 114 compress ? 'Y' : 'N',
80 connectmode == C_ONDEMAND ? "ondemand" : 115 connectmode == C_ONDEMAND ? "ondemand"
81 connectmode == C_NEVER ? "never" : 116 : connectmode == C_NEVER ? "never"
82 connectmode == C_ALWAYS ? "always" : "", 117 : connectmode == C_ALWAYS ? "always"
118 : connectmode == C_DISABLED ? "disabled"
119 : "",
83 nodename, 120 nodename,
84 hostname ? hostname : "", 121 hostname ? hostname : "",
85 hostname ? ":" : "", 122 hostname ? ":" : "",
86 hostname ? udp_port : 0 123 hostname ? udp_port : 0
87 ); 124 );
88} 125}
89 126
90conf_node::~conf_node () 127conf_node::~conf_node ()
91{ 128{
129#if 0
130 // does not work, because string pointers etc. are shared
131 // is not called, however
92 if (rsa_key) 132 if (rsa_key)
93 RSA_free (rsa_key); 133 RSA_free (rsa_key);
94 134
95 free (nodename); 135 free (nodename);
96 free (hostname); 136 free (hostname);
137 free (if_up_data);
138#if ENABLE_DNS
139 free (domain);
140 free (dns_hostname);
141#endif
142#endif
97} 143}
98 144
99void configuration::init () 145void configuration::init ()
100{ 146{
101 memset (this, 0, sizeof (*this)); 147 memset (this, 0, sizeof (*this));
102 148
103 mtu = DEFAULT_MTU; 149 mtu = DEFAULT_MTU;
150 nfmark = 0;
104 rekey = DEFAULT_REKEY; 151 rekey = DEFAULT_REKEY;
105 keepalive = DEFAULT_KEEPALIVE; 152 keepalive = DEFAULT_KEEPALIVE;
106 llevel = L_INFO; 153 llevel = L_INFO;
107 ip_proto = IPPROTO_GRE; 154 ip_proto = IPPROTO_GRE;
108#if ENABLE_ICMP 155#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY; 156 icmp_type = ICMP_ECHOREPLY;
110#endif 157#endif
111 158
112 default_node.udp_port = DEFAULT_UDPPORT; 159 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT; 160 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114 default_node.connectmode = conf_node::C_ALWAYS; 161 default_node.connectmode = conf_node::C_ALWAYS;
115 default_node.compress = true; 162 default_node.compress = true;
116 default_node.protocols = PROT_UDPv4; 163 default_node.protocols = 0;
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 ("");
168
169#if ENABLE_DNS
170 default_node.dns_port = 0; // default is 0 == client
171
172 dns_forw_host = strdup ("127.0.0.1");
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;
178#endif
179
180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
117} 181}
118 182
119void configuration::cleanup() 183void configuration::cleanup()
120{ 184{
121 if (rsa_key) 185 if (rsa_key)
122 RSA_free (rsa_key); 186 RSA_free (rsa_key);
123 187
124 rsa_key = 0; 188 rsa_key = 0;
125 189
126 free (ifname); ifname = 0; 190 free (pidfilename); pidfilename = 0;
127#if ENABLE_HTTP_PROXY 191 free (ifname); ifname = 0;
192#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 193 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0; 194 free (proxy_auth); proxy_auth = 0;
195#endif
196#if ENABLE_DNS
197 free (dns_forw_host); dns_forw_host = 0;
130#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;
131} 203}
132 204
133void 205void
134configuration::clear_config () 206configuration::clear ()
135{ 207{
136 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)
137 delete *i; 209 delete *i;
138 210
139 nodes.clear (); 211 nodes.clear ();
140 212
141 cleanup (); 213 cleanup ();
142 init (); 214 init ();
143} 215}
144 216
145#define parse_bool(target,name,trueval,falseval) \ 217#define parse_bool(target,name,trueval,falseval) do { \
146 if (!strcmp (val, "yes")) target = trueval; \ 218 if (!strcmp (val, "yes")) target = trueval; \
147 else if (!strcmp (val, "no")) target = falseval; \ 219 else if (!strcmp (val, "no")) target = falseval; \
148 else if (!strcmp (val, "true")) target = trueval; \ 220 else if (!strcmp (val, "true")) target = trueval; \
149 else if (!strcmp (val, "false")) target = falseval; \ 221 else if (!strcmp (val, "false")) target = falseval; \
150 else if (!strcmp (val, "on")) target = trueval; \ 222 else if (!strcmp (val, "on")) target = trueval; \
151 else if (!strcmp (val, "off")) target = falseval; \ 223 else if (!strcmp (val, "off")) target = falseval; \
152 else \ 224 else \
153 slog (L_WARN, \ 225 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
154 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 226} while (0)
155 name, var, fname, lineno);
156 227
157void 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)
158{ 554{
159 char *fname; 555 char *fname;
160 FILE *f; 556 FILE *f;
161 557
162 clear_config (); 558 conf.clear ();
163 559
164 asprintf (&fname, "%s/vped.conf", confbase); 560 asprintf (&fname, "%s/gvpe.conf", confbase);
165 f = fopen (fname, "r"); 561 f = fopen (fname, "r");
166 562
167 if (f) 563 if (f)
168 { 564 {
169 char line[16384]; 565 char line[16384];
170 int lineno = 0; 566 int lineno = 0;
171 char *var, *val; 567 node = &conf.default_node;
172 conf_node *node = &default_node;
173 568
174 while (fgets (line, sizeof (line), f)) 569 while (fgets (line, sizeof (line), f))
175 { 570 {
176 lineno++; 571 lineno++;
177 572
178 { 573 const char *warn = parse_line (line);
179 char *end = line + strlen (line);
180 574
181 while (*end < ' ' && end >= line) 575 if (warn)
182 end--; 576 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
183
184 *++end = 0;
185 }
186
187 char *tok = line;
188
189retry:
190 var = strtok (tok, "\t =");
191 tok = 0;
192
193 if (!var || !var[0])
194 continue; /* no tokens on this line */
195
196 if (var[0] == '#')
197 continue; /* comment: ignore */
198
199 val = strtok (NULL, "\t\n\r =");
200
201 if (!val || val[0] == '#')
202 {
203 slog (L_WARN,
204 _("no value for variable `%s', at '%s' line %d"),
205 var, fname, lineno);
206 break;
207 }
208
209 if (!strcmp (var, "on"))
210 {
211 if (!::thisnode
212 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
213 || !strcmp (val, ::thisnode))
214 goto retry;
215
216 continue;
217 }
218
219 // truly global
220 if (!strcmp (var, "loglevel"))
221 {
222 loglevel l = string_to_loglevel (val);
223
224 if (l != L_NONE)
225 llevel = l;
226 else
227 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
228 }
229 else if (!strcmp (var, "ip-proto"))
230 ip_proto = atoi (val);
231 else if (!strcmp (var, "icmp-type"))
232 {
233#if ENABLE_ICMP
234 icmp_type = atoi (val);
235#endif
236 }
237
238 // per config
239 else if (!strcmp (var, "node"))
240 {
241 default_node.id++;
242
243 node = new conf_node (default_node);
244
245 nodes.push_back (node);
246
247 node->nodename = strdup (val);
248
249 {
250 char *fname;
251 FILE *f;
252
253 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254
255 f = fopen (fname, "r");
256 if (f)
257 {
258 node->rsa_key = RSA_new ();
259
260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261 {
262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264 exit (EXIT_FAILURE);
265 }
266
267 require (RSA_blinding_on (node->rsa_key, 0));
268
269 fclose (f);
270 }
271 else
272 {
273 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274
275 if (need_keys)
276 exit (EXIT_FAILURE);
277 }
278
279 free (fname);
280 }
281
282 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
283 thisnode = node;
284 }
285 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist"))
288 {
289 parse_bool (ifpersist, "ifpersist", true, false);
290 }
291 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val);
293 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val);
299 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val);
305 else if (!strcmp (var, "http-proxy-host"))
306 {
307#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val);
309#endif
310 }
311 else if (!strcmp (var, "http-proxy-port"))
312 {
313#if ENABLE_HTTP_PROXY
314 proxy_port = atoi (val);
315#endif
316 }
317 else if (!strcmp (var, "http-proxy-auth"))
318 {
319#if ENABLE_HTTP_PROXY
320 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
321#endif
322 }
323
324 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val);
329 }
330
331 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val);
336 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val);
338 else if (!strcmp (var, "connect"))
339 {
340 if (!strcmp (val, "ondemand"))
341 node->connectmode = conf_node::C_ONDEMAND;
342 else if (!strcmp (val, "never"))
343 node->connectmode = conf_node::C_NEVER;
344 else if (!strcmp (val, "always"))
345 node->connectmode = conf_node::C_ALWAYS;
346 else if (!strcmp (val, "disabled"))
347 node->connectmode = conf_node::C_DISABLED;
348 else
349 slog (L_WARN,
350 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
351 var, fname, lineno);
352 }
353 else if (!strcmp (var, "inherit-tos"))
354 {
355 parse_bool (node->inherit_tos, "inherit-tos", true, false);
356 }
357 else if (!strcmp (var, "compress"))
358 {
359 parse_bool (node->compress, "compress", true, false);
360 }
361 // all these bool options really really cost a lot of executable size!
362 else if (!strcmp (var, "enable-tcp"))
363 {
364#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
366#endif
367 }
368 else if (!strcmp (var, "enable-icmp"))
369 {
370#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
372#endif
373 }
374 else if (!strcmp (var, "enable-udp"))
375 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
377 }
378 else if (!strcmp (var, "enable-rawip"))
379 {
380 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
381 }
382
383 // unknown or misplaced
384 else
385 slog (L_WARN,
386 _("unknown or misplaced variable `%s', at '%s' line %d"),
387 var, fname, lineno);
388 } 577 }
389 578
390 fclose (f); 579 fclose (f);
580
581 parse_argv ();
391 } 582 }
392 else 583 else
393 { 584 {
394 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));
395 exit (EXIT_FAILURE); 586 exit (EXIT_FAILURE);
396 } 587 }
397 588
398 free (fname); 589 free (fname);
399 590
400 fname = config_filename (prikeyfile, "hostkey"); 591 fname = conf.config_filename (conf.prikeyfile, "hostkey");
401 592
402 f = fopen (fname, "r"); 593 f = fopen (fname, "r");
403 if (f) 594 if (f)
404 { 595 {
405 rsa_key = RSA_new (); 596 conf.rsa_key = RSA_new ();
406 597
407 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 598 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
408 { 599 {
409 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 600 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
410 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));
411 exit (EXIT_FAILURE); 602 exit (EXIT_FAILURE);
412 } 603 }
413 604
414 require (RSA_blinding_on (rsa_key, 0)); 605 require (RSA_blinding_on (conf.rsa_key, 0));
415 606
416 fclose (f); 607 fclose (f);
417 } 608 }
418 else 609 else
419 { 610 {
… …
421 612
422 if (need_keys) 613 if (need_keys)
423 exit (EXIT_FAILURE); 614 exit (EXIT_FAILURE);
424 } 615 }
425 616
617 if (need_keys && ::thisnode
426 if (need_keys && rsa_key && thisnode && thisnode->rsa_key) 618 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
427 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
428 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 620 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
429 { 621 {
430 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);
431 exit (EXIT_FAILURE); 623 exit (EXIT_FAILURE);
432 } 624 }
433 625
434 free (fname); 626 free (fname);
627
628 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
629 (*i)->finalise ();
435} 630}
436 631
437char *configuration::config_filename (const char *name, const char *dflt) 632char *configuration::config_filename (const char *name, const char *dflt)
438{ 633{
439 char *fname; 634 char *fname;
… …
473 printf ("\n"); 668 printf ("\n");
474} 669}
475 670
476configuration::configuration () 671configuration::configuration ()
477{ 672{
673 asprintf (&confbase, "%s/gvpe", CONFDIR);
674
478 init (); 675 init ();
479} 676}
480 677
481configuration::~configuration () 678configuration::~configuration ()
482{ 679{

Diff Legend

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