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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines