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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines