ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.C
(Generate patch)

Comparing gvpe/src/conf.C (file contents):
Revision 1.36 by pcg, Sun Mar 20 02:34:16 2005 UTC vs.
Revision 1.61 by root, Tue Jul 16 16:44:36 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>
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);
98#if ENABLE_DNS 122#if ENABLE_DNS
99 free (domain); 123 free (domain);
100 free (dns_hostname); 124 free (dns_hostname);
101#endif 125#endif
126#endif
102} 127}
103 128
129void
104void configuration::init () 130configuration::init ()
105{ 131{
106 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
107 133
108 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
135 nfmark = 0;
109 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
110 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
111 llevel = L_INFO; 138 llevel = L_INFO;
112 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
113#if ENABLE_ICMP 140#if ENABLE_ICMP
118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
120 default_node.compress = true; 147 default_node.compress = true;
121 default_node.protocols = 0; 148 default_node.protocols = 0;
122 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 ("");
123 153
124#if ENABLE_DNS 154#if ENABLE_DNS
125 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;
126 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
127 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;
128#endif 164#endif
129 165
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
131} 169}
132 170
171void
133void configuration::cleanup() 172configuration::cleanup ()
134{ 173{
135 if (rsa_key) 174 if (rsa_key)
136 RSA_free (rsa_key); 175 RSA_free (rsa_key);
137 176
138 rsa_key = 0; 177 rsa_key = 0;
139 178
179 free (seed_dev); seed_dev = 0;
140 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
141 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
142#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
143 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
144 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
145#endif 185#endif
146#if ENABLE_DNS 186#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
148#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;
149} 194}
150 195
151void 196void
152configuration::clear_config () 197configuration::clear ()
153{ 198{
154 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)
155 delete *i; 200 delete *i;
156 201
157 nodes.clear (); 202 nodes.clear ();
158 203
159 cleanup (); 204 cleanup ();
160 init (); 205 init ();
161} 206}
162 207
208//static bool
209//is_true (const char *name)
210//{
211 //re
212//}
213
163#define parse_bool(target,name,trueval,falseval) \ 214#define parse_bool(target,name,trueval,falseval) do { \
164 if (!strcmp (val, "yes")) target = trueval; \ 215 if (!strcmp (val, "yes")) target = trueval; \
165 else if (!strcmp (val, "no")) target = falseval; \ 216 else if (!strcmp (val, "no")) target = falseval; \
166 else if (!strcmp (val, "true")) target = trueval; \ 217 else if (!strcmp (val, "true")) target = trueval; \
167 else if (!strcmp (val, "false")) target = falseval; \ 218 else if (!strcmp (val, "false")) target = falseval; \
168 else if (!strcmp (val, "on")) target = trueval; \ 219 else if (!strcmp (val, "on")) target = trueval; \
169 else if (!strcmp (val, "off")) target = falseval; \ 220 else if (!strcmp (val, "off")) target = falseval; \
170 else \ 221 else \
171 slog (L_WARN, \
172 _("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"); \
173 name, var, fname, lineno); 223} while (0)
174 224
175void configuration::read_config (bool need_keys) 225const char *
226configuration_parser::parse_line (char *line)
176{ 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 {
177 char *fname; 310 char *fname;
178 FILE *f; 311 FILE *f;
179 312
180 clear_config (); 313 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
181 314
182 asprintf (&fname, "%s/gvpe.conf", confbase);
183 f = fopen (fname, "r"); 315 f = fopen (fname, "r");
316 if (f)
317 {
318 node->rsa_key = RSA_new ();
184 319
185 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;
186 { 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 {
187 char line[16384]; 583 char line [2048];
188 int lineno = 0; 584 int lineno = 0;
189 char *var, *val;
190 conf_node *node = &default_node;
191 585
192 while (fgets (line, sizeof (line), f)) 586 while (fgets (line, sizeof (line), f))
193 { 587 {
194 lineno++; 588 lineno++;
195 589
196 { 590 const char *warn = parse_line (line);
197 char *end = line + strlen (line);
198 591
199 while (*end < ' ' && end >= line) 592 if (warn)
200 end--; 593 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
201
202 *++end = 0;
203 }
204
205 char *tok = line;
206
207retry:
208 var = strtok (tok, "\t =");
209 tok = 0;
210
211 if (!var || !var[0])
212 continue; /* no tokens on this line */
213
214 if (var[0] == '#')
215 continue; /* comment: ignore */
216
217 val = strtok (NULL, "\t\n\r =");
218
219 if (!val || val[0] == '#')
220 {
221 slog (L_WARN,
222 _("no value for variable `%s', at '%s' line %d, skipping."),
223 var, fname, lineno);
224 continue;
225 }
226
227 if (!strcmp (var, "on"))
228 {
229 if (!::thisnode
230 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
231 || !strcmp (val, ::thisnode))
232 goto retry;
233
234 continue;
235 }
236
237 // truly global
238 if (!strcmp (var, "loglevel"))
239 {
240 loglevel l = string_to_loglevel (val);
241
242 if (l != L_NONE)
243 llevel = l;
244 else
245 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
246 }
247 else if (!strcmp (var, "ip-proto"))
248 ip_proto = atoi (val);
249 else if (!strcmp (var, "icmp-type"))
250 {
251#if ENABLE_ICMP
252 icmp_type = atoi (val);
253#endif
254 }
255
256 // per config
257 else if (!strcmp (var, "node"))
258 {
259 default_node.id++;
260
261 node = new conf_node (default_node);
262
263 nodes.push_back (node);
264
265 node->nodename = strdup (val);
266
267 {
268 char *fname;
269 FILE *f;
270
271 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
272
273 f = fopen (fname, "r");
274 if (f)
275 {
276 node->rsa_key = RSA_new ();
277
278 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
279 {
280 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
281 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
282 exit (EXIT_FAILURE);
283 }
284
285 require (RSA_blinding_on (node->rsa_key, 0));
286
287 fclose (f);
288 }
289 else
290 {
291 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
292
293 if (need_keys)
294 exit (EXIT_FAILURE);
295 }
296
297 free (fname);
298 }
299
300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
301 thisnode = node;
302 }
303 else if (!strcmp (var, "private-key"))
304 free (prikeyfile), prikeyfile = strdup (val);
305 else if (!strcmp (var, "ifpersist"))
306 parse_bool (ifpersist, "ifpersist", true, false);
307 else if (!strcmp (var, "ifname"))
308 free (ifname), ifname = strdup (val);
309 else if (!strcmp (var, "rekey"))
310 rekey = atoi (val);
311 else if (!strcmp (var, "keepalive"))
312 keepalive = atoi (val);
313 else if (!strcmp (var, "mtu"))
314 mtu = atoi (val);
315 else if (!strcmp (var, "if-up"))
316 free (script_if_up), script_if_up = strdup (val);
317 else if (!strcmp (var, "node-up"))
318 free (script_node_up), script_node_up = strdup (val);
319 else if (!strcmp (var, "node-down"))
320 free (script_node_down), script_node_down = strdup (val);
321 else if (!strcmp (var, "pid-file"))
322 free (pidfilename), pidfilename = strdup (val);
323 else if (!strcmp (var, "dns-forw-host"))
324 {
325#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-forw-port"))
330 {
331#if ENABLE_DNS
332 dns_forw_port = atoi (val);
333#endif
334 }
335 else if (!strcmp (var, "http-proxy-host"))
336 {
337#if ENABLE_HTTP_PROXY
338 free (proxy_host), proxy_host = strdup (val);
339#endif
340 }
341 else if (!strcmp (var, "http-proxy-port"))
342 {
343#if ENABLE_HTTP_PROXY
344 proxy_port = atoi (val);
345#endif
346 }
347 else if (!strcmp (var, "http-proxy-auth"))
348 {
349#if ENABLE_HTTP_PROXY
350 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
351#endif
352 }
353
354 /* node-specific, non-defaultable */
355 else if (node != &default_node && !strcmp (var, "hostname"))
356 free (node->hostname), node->hostname = strdup (val);
357
358 /* node-specific, defaultable */
359 else if (!strcmp (var, "udp-port"))
360 node->udp_port = atoi (val);
361 else if (!strcmp (var, "tcp-port"))
362 node->tcp_port = atoi (val);
363 else if (!strcmp (var, "dns-hostname"))
364 {
365#if ENABLE_DNS
366 free (node->dns_hostname), node->dns_hostname = strdup (val);
367#endif
368 }
369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
372 node->dns_port = atoi (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-domain"))
376 {
377#if ENABLE_DNS
378 free (node->domain), node->domain = strdup (val);
379#endif
380 }
381 else if (!strcmp (var, "router-priority"))
382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
385 else if (!strcmp (var, "connect"))
386 {
387 if (!strcmp (val, "ondemand"))
388 node->connectmode = conf_node::C_ONDEMAND;
389 else if (!strcmp (val, "never"))
390 node->connectmode = conf_node::C_NEVER;
391 else if (!strcmp (val, "always"))
392 node->connectmode = conf_node::C_ALWAYS;
393 else if (!strcmp (val, "disabled"))
394 node->connectmode = conf_node::C_DISABLED;
395 else
396 slog (L_WARN,
397 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
398 var, fname, lineno);
399 }
400 else if (!strcmp (var, "inherit-tos"))
401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
402 else if (!strcmp (var, "compress"))
403 parse_bool (node->compress, "compress", true, false);
404 // all these bool options really really cost a lot of executable size!
405 else if (!strcmp (var, "enable-tcp"))
406 {
407#if ENABLE_TCP
408 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
409#endif
410 }
411 else if (!strcmp (var, "enable-icmp"))
412 {
413#if ENABLE_ICMP
414 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-dns"))
418 {
419#if ENABLE_DNS
420 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
421#endif
422 }
423 else if (!strcmp (var, "enable-udp"))
424 {
425 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
426 }
427 else if (!strcmp (var, "enable-rawip"))
428 {
429 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
430 }
431
432 // unknown or misplaced
433 else
434 slog (L_WARN,
435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
436 var, fname, lineno);
437 } 594 }
438 595
439 fclose (f); 596 fclose (f);
597
598 parse_argv ();
440 } 599 }
441 else 600 else
442 { 601 {
443 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));
444 exit (EXIT_FAILURE); 603 exit (EXIT_FAILURE);
445 } 604 }
605}
446 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);
447 free (fname); 620 free (fname);
448 621
449 fname = config_filename (prikeyfile, "hostkey"); 622 fname = conf.config_filename (conf.prikeyfile, "hostkey");
450 623
451 f = fopen (fname, "r"); 624 if (FILE *f = fopen (fname, "r"))
452 if (f)
453 { 625 {
454 rsa_key = RSA_new (); 626 conf.rsa_key = RSA_new ();
455 627
456 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 628 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
457 { 629 {
458 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 630 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
459 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 631 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
460 exit (EXIT_FAILURE); 632 exit (EXIT_FAILURE);
461 } 633 }
462 634
463 require (RSA_blinding_on (rsa_key, 0)); 635 require (RSA_blinding_on (conf.rsa_key, 0));
464 636
465 fclose (f); 637 fclose (f);
466 } 638 }
467 else 639 else
468 { 640 {
469 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
470
471 if (need_keys) 641 if (need_keys)
642 {
643 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
472 exit (EXIT_FAILURE); 644 exit (EXIT_FAILURE);
645 }
473 } 646 }
647
648 free (fname);
474 649
475 if (need_keys && ::thisnode 650 if (need_keys && ::thisnode
476 && rsa_key && thisnode && thisnode->rsa_key) 651 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
477 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 652 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
478 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 653 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
479 { 654 {
480 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 655 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
481 exit (EXIT_FAILURE); 656 exit (EXIT_FAILURE);
482 } 657 }
483 658
484 free (fname); 659 fname = conf.config_filename (conf.pidfilename);
485} 660 free (conf.pidfilename); conf.pidfilename = fname;
486 661
662 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
663 (*i)->finalise ();
664}
665
666char *
487char *configuration::config_filename (const char *name, const char *dflt) 667configuration::config_filename (const char *name, const char *dflt)
488{ 668{
489 char *fname; 669 char *fname;
490 670
491 asprintf (&fname, name ? name : dflt, ::thisnode); 671 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
492 672
493 if (!ABSOLUTE_PATH (fname)) 673 if (!ABSOLUTE_PATH (fname))
494 { 674 {
495 char *rname = fname; 675 char *rname = fname;
496 asprintf (&fname, "%s/%s", confbase, rname); 676 asprintf (&fname, "%s/%s", confbase, rname);
497 free (rname); 677 free (rname);
498 } 678 }
499 679
500 return fname; 680 return fname;
681}
682
683void
684conf_node::print ()
685{
686 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
687 id,
688 id >> 8, id & 0xff,
689 compress ? 'Y' : 'N',
690 connectmode == C_ONDEMAND ? "ondemand"
691 : connectmode == C_NEVER ? "never"
692 : connectmode == C_ALWAYS ? "always"
693 : connectmode == C_DISABLED ? "disabled"
694 : "",
695 nodename,
696 protocols,
697 hostname ? hostname : "",
698 hostname ? ":" : "",
699 hostname ? udp_port : 0
700 );
501} 701}
502 702
503void 703void
504configuration::print () 704configuration::print ()
505{ 705{
512 printf (_("interface: %s\n"), ifname); 712 printf (_("interface: %s\n"), ifname);
513 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 713 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
514 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 714 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
515 printf ("\n"); 715 printf ("\n");
516 716
517 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 717 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
518 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 718 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
519 719
520 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 720 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
521 (*i)->print (); 721 (*i)->print ();
522 722
523 printf ("\n"); 723 printf ("\n");
533configuration::~configuration () 733configuration::~configuration ()
534{ 734{
535 cleanup (); 735 cleanup ();
536} 736}
537 737
538

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines