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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines