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.26 by pcg, Wed May 12 13:32:13 2004 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008,2011 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>
26#include <errno.h> 38#include <errno.h>
27#include <netdb.h> 39#include <netdb.h>
28#include <sys/stat.h> 40#include <sys/stat.h>
29#include <sys/types.h> 41#include <sys/types.h>
30#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
31 44
32#include "netcompat.h" 45#include "netcompat.h"
33 46
34#include <openssl/err.h> 47#include <openssl/err.h>
35#include <openssl/pem.h> 48#include <openssl/pem.h>
36#include <openssl/rsa.h> 49#include <openssl/rsa.h>
37#include <openssl/rand.h> 50#include <openssl/rand.h>
38#include <openssl/bn.h> 51#include <openssl/bn.h>
39 52
40#include "gettext.h"
41
42#include "conf.h" 53#include "conf.h"
43#include "slog.h" 54#include "slog.h"
44#include "util.h" 55#include "util.h"
45 56
46char *confbase; 57char *confbase;
47char *thisnode; 58char *thisnode;
48char *identname; 59char *identname;
49 60
50struct configuration conf; 61struct configuration conf;
51 62
63u8
52u8 best_protocol (u8 protset) 64best_protocol (u8 protset)
53{ 65{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 71
60 return 0; 72 return 0;
61} 73}
62 74
75const char *
63const char *strprotocol (u8 protocol) 76strprotocol (u8 protocol)
64{ 77{
65 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 79 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 81 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns"; 82 if (protocol & PROT_DNSv4 ) return "dns";
70 83
71 return "<unknown>"; 84 return "<unknown>";
72} 85}
73 86
74void 87static bool
75conf_node::print () 88match_list (const vector<const char *> &list, const char *str)
76{ 89{
77 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 (); )
78 id, 91 if ((*i)[0] == '*' && !(*i)[1])
79 id >> 8, id & 0xff, 92 return true;
80 compress ? 'Y' : 'N', 93 else if (!strcmp (*i, str))
81 connectmode == C_ONDEMAND ? "ondemand" : 94 return true;
82 connectmode == C_NEVER ? "never" : 95
83 connectmode == C_ALWAYS ? "always" : "", 96 return false;
84 nodename, 97}
85 hostname ? hostname : "", 98
86 hostname ? ":" : "", 99bool
87 hostname ? udp_port : 0 100conf_node::may_direct (struct conf_node *other)
88 ); 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;
89} 109}
90 110
91conf_node::~conf_node () 111conf_node::~conf_node ()
92{ 112{
113#if 0
114 // does not work, because string pointers etc. are shared
115 // is not called, however
93 if (rsa_key) 116 if (rsa_key)
94 RSA_free (rsa_key); 117 RSA_free (rsa_key);
95 118
96 free (nodename); 119 free (nodename);
97 free (hostname); 120 free (hostname);
121 free (if_up_data);
122#if ENABLE_DNS
123 free (domain);
124 free (dns_hostname);
125#endif
126#endif
98} 127}
99 128
129void
100void configuration::init () 130configuration::init ()
101{ 131{
102 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
103 133
104 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
135 nfmark = 0;
105 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
106 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
107 llevel = L_INFO; 138 llevel = L_INFO;
108 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP 140#if ENABLE_ICMP
112 143
113 default_node.udp_port = DEFAULT_UDPPORT; 144 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 147 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 148 default_node.protocols = 0;
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 ("");
118 153
154#if ENABLE_DNS
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");
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;
164#endif
165
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
120} 169}
121 170
171void
122void configuration::cleanup() 172configuration::cleanup ()
123{ 173{
124 if (rsa_key) 174 if (rsa_key)
125 RSA_free (rsa_key); 175 RSA_free (rsa_key);
126 176
127 rsa_key = 0; 177 rsa_key = 0;
128 178
179 free (seed_dev); seed_dev = 0;
129 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
134#endif 185#endif
186#if ENABLE_DNS
187 free (dns_forw_host); dns_forw_host = 0;
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;
135} 194}
136 195
137void 196void
138configuration::clear_config () 197configuration::clear ()
139{ 198{
140 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)
141 delete *i; 200 delete *i;
142 201
143 nodes.clear (); 202 nodes.clear ();
144 203
145 cleanup (); 204 cleanup ();
146 init (); 205 init ();
147} 206}
148 207
208//static bool
209//is_true (const char *name)
210//{
211 //re
212//}
213
149#define parse_bool(target,name,trueval,falseval) \ 214#define parse_bool(target,name,trueval,falseval) do { \
150 if (!strcmp (val, "yes")) target = trueval; \ 215 if (!strcmp (val, "yes")) target = trueval; \
151 else if (!strcmp (val, "no")) target = falseval; \ 216 else if (!strcmp (val, "no")) target = falseval; \
152 else if (!strcmp (val, "true")) target = trueval; \ 217 else if (!strcmp (val, "true")) target = trueval; \
153 else if (!strcmp (val, "false")) target = falseval; \ 218 else if (!strcmp (val, "false")) target = falseval; \
154 else if (!strcmp (val, "on")) target = trueval; \ 219 else if (!strcmp (val, "on")) target = trueval; \
155 else if (!strcmp (val, "off")) target = falseval; \ 220 else if (!strcmp (val, "off")) target = falseval; \
156 else \ 221 else \
157 slog (L_WARN, \
158 _("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"); \
159 name, var, fname, lineno); 223} while (0)
160 224
161void configuration::read_config (bool need_keys) 225const char *
226configuration_parser::parse_line (char *line)
162{ 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 {
163 char *fname; 310 char *fname;
164 FILE *f; 311 FILE *f;
165 312
166 clear_config (); 313 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
167 314
168 asprintf (&fname, "%s/vped.conf", confbase);
169 f = fopen (fname, "r"); 315 f = fopen (fname, "r");
316 if (f)
317 {
318 node->rsa_key = RSA_new ();
170 319
171 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;
172 { 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 {
173 char line[16384]; 583 char line [2048];
174 int lineno = 0; 584 int lineno = 0;
175 char *var, *val;
176 conf_node *node = &default_node;
177 585
178 while (fgets (line, sizeof (line), f)) 586 while (fgets (line, sizeof (line), f))
179 { 587 {
180 lineno++; 588 lineno++;
181 589
182 { 590 const char *warn = parse_line (line);
183 char *end = line + strlen (line);
184 591
185 while (*end < ' ' && end >= line) 592 if (warn)
186 end--; 593 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
187
188 *++end = 0;
189 }
190
191 char *tok = line;
192
193retry:
194 var = strtok (tok, "\t =");
195 tok = 0;
196
197 if (!var || !var[0])
198 continue; /* no tokens on this line */
199
200 if (var[0] == '#')
201 continue; /* comment: ignore */
202
203 val = strtok (NULL, "\t\n\r =");
204
205 if (!val || val[0] == '#')
206 {
207 slog (L_WARN,
208 _("no value for variable `%s', at '%s' line %d"),
209 var, fname, lineno);
210 break;
211 }
212
213 if (!strcmp (var, "on"))
214 {
215 if (!::thisnode
216 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
217 || !strcmp (val, ::thisnode))
218 goto retry;
219
220 continue;
221 }
222
223 // truly global
224 if (!strcmp (var, "loglevel"))
225 {
226 loglevel l = string_to_loglevel (val);
227
228 if (l != L_NONE)
229 llevel = l;
230 else
231 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
232 }
233 else if (!strcmp (var, "ip-proto"))
234 ip_proto = atoi (val);
235 else if (!strcmp (var, "icmp-type"))
236 {
237#if ENABLE_ICMP
238 icmp_type = atoi (val);
239#endif
240 }
241
242 // per config
243 else if (!strcmp (var, "node"))
244 {
245 default_node.id++;
246
247 node = new conf_node (default_node);
248
249 nodes.push_back (node);
250
251 node->nodename = strdup (val);
252
253 {
254 char *fname;
255 FILE *f;
256
257 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
258
259 f = fopen (fname, "r");
260 if (f)
261 {
262 node->rsa_key = RSA_new ();
263
264 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
265 {
266 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
267 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
268 exit (EXIT_FAILURE);
269 }
270
271 require (RSA_blinding_on (node->rsa_key, 0));
272
273 fclose (f);
274 }
275 else
276 {
277 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
278
279 if (need_keys)
280 exit (EXIT_FAILURE);
281 }
282
283 free (fname);
284 }
285
286 if (::thisnode && !strcmp (node->nodename, ::thisnode))
287 thisnode = node;
288 }
289 else if (!strcmp (var, "private-key"))
290 free (prikeyfile), prikeyfile = strdup (val);
291 else if (!strcmp (var, "ifpersist"))
292 {
293 parse_bool (ifpersist, "ifpersist", true, false);
294 }
295 else if (!strcmp (var, "ifname"))
296 free (ifname), ifname = strdup (val);
297 else if (!strcmp (var, "rekey"))
298 rekey = atoi (val);
299 else if (!strcmp (var, "keepalive"))
300 keepalive = atoi (val);
301 else if (!strcmp (var, "mtu"))
302 mtu = atoi (val);
303 else if (!strcmp (var, "if-up"))
304 free (script_if_up), script_if_up = strdup (val);
305 else if (!strcmp (var, "node-up"))
306 free (script_node_up), script_node_up = strdup (val);
307 else if (!strcmp (var, "node-down"))
308 free (script_node_down), script_node_down = strdup (val);
309 else if (!strcmp (var, "pid-file"))
310 free (pidfilename), pidfilename = strdup (val);
311 else if (!strcmp (var, "http-proxy-host"))
312 {
313#if ENABLE_HTTP_PROXY
314 free (proxy_host), proxy_host = strdup (val);
315#endif
316 }
317 else if (!strcmp (var, "http-proxy-port"))
318 {
319#if ENABLE_HTTP_PROXY
320 proxy_port = atoi (val);
321#endif
322 }
323 else if (!strcmp (var, "http-proxy-auth"))
324 {
325#if ENABLE_HTTP_PROXY
326 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
327#endif
328 }
329
330 /* node-specific, non-defaultable */
331 else if (node != &default_node && !strcmp (var, "hostname"))
332 free (node->hostname), node->hostname = strdup (val);
333
334 /* node-specific, defaultable */
335 else if (!strcmp (var, "udp-port"))
336 node->udp_port = atoi (val);
337 else if (!strcmp (var, "tcp-port"))
338 node->tcp_port = atoi (val);
339 else if (!strcmp (var, "dns-port"))
340 node->dns_port = atoi (val);
341 else if (!strcmp (var, "router-priority"))
342 node->routerprio = atoi (val);
343 else if (!strcmp (var, "connect"))
344 {
345 if (!strcmp (val, "ondemand"))
346 node->connectmode = conf_node::C_ONDEMAND;
347 else if (!strcmp (val, "never"))
348 node->connectmode = conf_node::C_NEVER;
349 else if (!strcmp (val, "always"))
350 node->connectmode = conf_node::C_ALWAYS;
351 else if (!strcmp (val, "disabled"))
352 node->connectmode = conf_node::C_DISABLED;
353 else
354 slog (L_WARN,
355 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
356 var, fname, lineno);
357 }
358 else if (!strcmp (var, "inherit-tos"))
359 {
360 parse_bool (node->inherit_tos, "inherit-tos", true, false);
361 }
362 else if (!strcmp (var, "compress"))
363 {
364 parse_bool (node->compress, "compress", true, false);
365 }
366 // all these bool options really really cost a lot of executable size!
367 else if (!strcmp (var, "enable-tcp"))
368 {
369#if ENABLE_TCP
370 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
371#endif
372 }
373 else if (!strcmp (var, "enable-icmp"))
374 {
375#if ENABLE_ICMP
376 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
377#endif
378 }
379 else if (!strcmp (var, "enable-dns"))
380 {
381#if ENABLE_DNS
382 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
383#endif
384 }
385 else if (!strcmp (var, "enable-udp"))
386 {
387 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
388 }
389 else if (!strcmp (var, "enable-rawip"))
390 {;
391 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
392 }
393
394 // unknown or misplaced
395 else
396 slog (L_WARN,
397 _("unknown or misplaced variable `%s', at '%s' line %d"),
398 var, fname, lineno);
399 } 594 }
400 595
401 fclose (f); 596 fclose (f);
597
598 parse_argv ();
402 } 599 }
403 else 600 else
404 { 601 {
405 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));
406 exit (EXIT_FAILURE); 603 exit (EXIT_FAILURE);
407 } 604 }
605}
408 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);
409 free (fname); 620 free (fname);
410 621
411 fname = config_filename (prikeyfile, "hostkey"); 622 fname = conf.config_filename (conf.prikeyfile, "hostkey");
412 623
413 f = fopen (fname, "r"); 624 if (FILE *f = fopen (fname, "r"))
414 if (f)
415 { 625 {
416 rsa_key = RSA_new (); 626 conf.rsa_key = RSA_new ();
417 627
418 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 628 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
419 { 629 {
420 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 630 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
421 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));
422 exit (EXIT_FAILURE); 632 exit (EXIT_FAILURE);
423 } 633 }
424 634
425 require (RSA_blinding_on (rsa_key, 0)); 635 require (RSA_blinding_on (conf.rsa_key, 0));
426 636
427 fclose (f); 637 fclose (f);
428 } 638 }
429 else 639 else
430 { 640 {
432 642
433 if (need_keys) 643 if (need_keys)
434 exit (EXIT_FAILURE); 644 exit (EXIT_FAILURE);
435 } 645 }
436 646
647 free (fname);
648
437 if (need_keys && ::thisnode 649 if (need_keys && ::thisnode
438 && rsa_key && thisnode && thisnode->rsa_key) 650 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
439 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
440 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 652 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
441 { 653 {
442 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);
443 exit (EXIT_FAILURE); 655 exit (EXIT_FAILURE);
444 } 656 }
445 657
446 free (fname); 658 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
659 (*i)->finalise ();
447} 660}
448 661
662char *
449char *configuration::config_filename (const char *name, const char *dflt) 663configuration::config_filename (const char *name, const char *dflt)
450{ 664{
451 char *fname; 665 char *fname;
452 666
453 asprintf (&fname, name ? name : dflt, ::thisnode); 667 asprintf (&fname, name ? name : dflt, ::thisnode);
454 668
458 asprintf (&fname, "%s/%s", confbase, rname); 672 asprintf (&fname, "%s/%s", confbase, rname);
459 free (rname); 673 free (rname);
460 } 674 }
461 675
462 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 );
463} 697}
464 698
465void 699void
466configuration::print () 700configuration::print ()
467{ 701{
474 printf (_("interface: %s\n"), ifname); 708 printf (_("interface: %s\n"), ifname);
475 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 709 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
476 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);
477 printf ("\n"); 711 printf ("\n");
478 712
479 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 713 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
480 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 714 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
481 715
482 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 716 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
483 (*i)->print (); 717 (*i)->print ();
484 718
485 printf ("\n"); 719 printf ("\n");
486} 720}
487 721
488configuration::configuration () 722configuration::configuration ()
489{ 723{
490 asprintf (&confbase, "%s/vpe", CONFDIR); 724 asprintf (&confbase, "%s/gvpe", CONFDIR);
491 725
492 init (); 726 init ();
493} 727}
494 728
495configuration::~configuration () 729configuration::~configuration ()
496{ 730{
497 cleanup (); 731 cleanup ();
498} 732}
499 733
500

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines