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.8 by pcg, Wed Apr 2 03:25:17 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) 1998 Robert van der Meulen 3 Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
5 This file is part of GVPE.
6
9 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
10 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
11 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
12 (at your option) any later version. 10 option) any later version.
13 11
14 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
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
17 GNU General Public License for more details. 15 Public License for more details.
18 16
19 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
20 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
21 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.
22*/ 30*/
23 31
24#include "config.h" 32#include "config.h"
25 33
26#include <cstdio> 34#include <cstdio>
30#include <errno.h> 38#include <errno.h>
31#include <netdb.h> 39#include <netdb.h>
32#include <sys/stat.h> 40#include <sys/stat.h>
33#include <sys/types.h> 41#include <sys/types.h>
34#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
35 44
36#include <netinet/in.h> 45#include "netcompat.h"
37 46
38#include <openssl/err.h> 47#include <openssl/err.h>
39#include <openssl/pem.h> 48#include <openssl/pem.h>
40#include <openssl/rsa.h> 49#include <openssl/rsa.h>
41#include <openssl/rand.h> 50#include <openssl/rand.h>
42 51#include <openssl/bn.h>
43#include "gettext.h"
44 52
45#include "conf.h" 53#include "conf.h"
46#include "slog.h" 54#include "slog.h"
47#include "util.h" 55#include "util.h"
48 56
49char *confbase; 57char *confbase;
50char *thisnode; 58char *thisnode;
51char *identname; 59char *identname;
52char *pidfilename;
53 60
54struct configuration conf; 61struct configuration conf;
55 62
63u8
56u8 best_protocol (u8 protset) 64best_protocol (u8 protset)
57{ 65{
58 if (protset & PROT_IPv4) 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
60 71
61 return PROT_UDPv4; 72 return 0;
62} 73}
63 74
75const char *
64const char *strprotocol (u8 protocol) 76strprotocol (u8 protocol)
65{ 77{
66 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
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
72configuration::configuration () 87static bool
88match_list (const vector<const char *> &list, const char *str)
73{ 89{
74 init (); 90 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
75} 91 if ((*i)[0] == '*' && !(*i)[1])
92 return true;
93 else if (!strcmp (*i, str))
94 return true;
76 95
77configuration::~configuration () 96 return false;
78{
79 cleanup ();
80} 97}
81 98
99bool
100conf_node::may_direct (struct conf_node *other)
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;
109}
110
111conf_node::~conf_node ()
112{
113#if 0
114 // does not work, because string pointers etc. are shared
115 // is not called, however
116 if (rsa_key)
117 RSA_free (rsa_key);
118
119 free (nodename);
120 free (hostname);
121 free (if_up_data);
122#if ENABLE_DNS
123 free (domain);
124 free (dns_hostname);
125#endif
126#endif
127}
128
129void
82void configuration::init () 130configuration::init ()
83{ 131{
84 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
85 133
134 mtu = DEFAULT_MTU;
135 nfmark = 0;
86 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 138 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
140#if ENABLE_ICMP
141 icmp_type = ICMP_ECHOREPLY;
142#endif
90 143
91 default_node.udp_port = DEFAULT_UDPPORT; 144 default_node.udp_port = DEFAULT_UDPPORT;
92 default_node.tcp_port = DEFAULT_UDPPORT; 145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
93 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
94 default_node.compress = true; 147 default_node.compress = true;
95 default_node.protocols = PROT_UDPv4; 148 default_node.protocols = 0;
96} 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 ("");
97 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
98void configuration::cleanup() 170configuration::cleanup ()
99{ 171{
100 if (rsa_key) 172 if (rsa_key)
101 RSA_free (rsa_key); 173 RSA_free (rsa_key);
102 174
103 free (ifname);
104
105 rsa_key = 0; 175 rsa_key = 0;
106 ifname = 0; 176
177 free (pidfilename); pidfilename = 0;
178 free (ifname); ifname = 0;
179#if ENABLE_HTTP_PROXY
180 free (proxy_host); proxy_host = 0;
181 free (proxy_auth); proxy_auth = 0;
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;
107} 191}
108 192
109void 193void
110configuration::clear_config () 194configuration::clear ()
111{ 195{
112 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)
113 delete *i; 197 delete *i;
114 198
115 nodes.clear (); 199 nodes.clear ();
116 200
117 cleanup (); 201 cleanup ();
118 init (); 202 init ();
119} 203}
120 204
205//static bool
206//is_true (const char *name)
207//{
208 //re
209//}
210
121#define parse_bool(target,name,trueval,falseval) \ 211#define parse_bool(target,name,trueval,falseval) do { \
122 if (!strcmp (val, "yes")) target = trueval; \ 212 if (!strcmp (val, "yes")) target = trueval; \
123 else if (!strcmp (val, "no")) target = falseval; \ 213 else if (!strcmp (val, "no")) target = falseval; \
124 else if (!strcmp (val, "true")) target = trueval; \ 214 else if (!strcmp (val, "true")) target = trueval; \
125 else if (!strcmp (val, "false")) target = falseval; \ 215 else if (!strcmp (val, "false")) target = falseval; \
126 else if (!strcmp (val, "on")) target = trueval; \ 216 else if (!strcmp (val, "on")) target = trueval; \
127 else if (!strcmp (val, "off")) target = falseval; \ 217 else if (!strcmp (val, "off")) target = falseval; \
128 else \ 218 else \
129 slog (L_WARN, \
130 _("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"); \
131 name, var, fname, lineno); 220} while (0)
132 221
133void configuration::read_config (bool need_keys) 222const char *
223configuration_parser::parse_line (char *line)
134{ 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 {
135 char *fname; 307 char *fname;
136 FILE *f; 308 FILE *f;
137 309
138 clear_config (); 310 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
139 311
140 asprintf (&fname, "%s/vped.conf", confbase);
141 f = fopen (fname, "r"); 312 f = fopen (fname, "r");
313 if (f)
314 {
315 node->rsa_key = RSA_new ();
142 316
143 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;
144 { 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 {
145 char line[16384]; 576 char line [2048];
146 int lineno = 0; 577 int lineno = 0;
147 char *var, *val;
148 conf_node *node = &default_node;
149 578
150 while (fgets (line, sizeof (line), f)) 579 while (fgets (line, sizeof (line), f))
151 { 580 {
152 lineno++; 581 lineno++;
153 582
154 { 583 const char *warn = parse_line (line);
155 char *end = line + strlen (line);
156 584
157 while (*end < ' ' && end >= line) 585 if (warn)
158 end--; 586 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
159
160 *++end = 0;
161 }
162
163 char *tok = line;
164
165retry:
166 var = strtok (tok, "\t =");
167 tok = 0;
168
169 if (!var || !var[0])
170 continue; /* no tokens on this line */
171
172 if (var[0] == '#')
173 continue; /* comment: ignore */
174
175 val = strtok (NULL, "\t\n\r =");
176
177 if (!val || val[0] == '#')
178 {
179 slog (L_WARN,
180 _("no value for variable `%s', at '%s' line %d"),
181 var, fname, lineno);
182 break;
183 }
184
185 if (!strcmp (var, "on"))
186 {
187 if (!::thisnode
188 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
189 || !strcmp (val, ::thisnode))
190 goto retry;
191
192 continue;
193 }
194
195 // truly global
196 if (!strcmp (var, "loglevel"))
197 {
198 loglevel l = string_to_loglevel (val);
199
200 if (l != L_NONE)
201 llevel = l;
202 else
203 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
204 }
205 else if (!strcmp (var, "ip-proto"))
206 ip_proto = atoi (val);
207
208 // per config
209 else if (!strcmp (var, "node"))
210 {
211 default_node.id++;
212
213 node = new conf_node (default_node);
214
215 nodes.push_back (node);
216
217 node->nodename = strdup (val);
218
219 {
220 char *fname;
221 FILE *f;
222
223 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
224
225 f = fopen (fname, "r");
226 if (f)
227 {
228 node->rsa_key = RSA_new ();
229
230 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
231 {
232 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
233 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
234 exit (1);
235 }
236
237 RSA_blinding_on (node->rsa_key, 0);
238
239 fclose (f);
240 }
241 else
242 {
243 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
244
245 if (need_keys)
246 exit (1);
247 }
248
249 free (fname);
250 }
251
252 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
253 thisnode = node;
254 }
255 else if (!strcmp (var, "private-key"))
256 prikeyfile = strdup (val);
257 else if (!strcmp (var, "ifpersist"))
258 {
259 parse_bool (ifpersist, "ifpersist", true, false);
260 }
261 else if (!strcmp (var, "ifname"))
262 ifname = strdup (val);
263 else if (!strcmp (var, "rekey"))
264 rekey = atoi (val);
265 else if (!strcmp (var, "keepalive"))
266 keepalive = atoi (val);
267 else if (!strcmp (var, "mtu"))
268 mtu = atoi (val);
269 else if (!strcmp (var, "if-up"))
270 script_if_up = strdup (val);
271 else if (!strcmp (var, "node-up"))
272 script_node_up = strdup (val);
273 else if (!strcmp (var, "node-down"))
274 script_node_down = strdup (val);
275
276 /* node-specific, non-defaultable */
277 else if (node != &default_node && !strcmp (var, "hostname"))
278 {
279 free (node->hostname);
280 node->hostname = strdup (val);
281 }
282
283 /* node-specific, defaultable */
284 else if (!strcmp (var, "udp-port"))
285 node->udp_port = atoi (val);
286 else if (!strcmp (var, "tcp-port"))
287 node->tcp_port = atoi (val);
288 else if (!strcmp (var, "router-priority"))
289 node->routerprio = atoi (val);
290 else if (!strcmp (var, "connect"))
291 {
292 if (!strcmp (val, "ondemand"))
293 node->connectmode = conf_node::C_ONDEMAND;
294 else if (!strcmp (val, "never"))
295 node->connectmode = conf_node::C_NEVER;
296 else if (!strcmp (val, "always"))
297 node->connectmode = conf_node::C_ALWAYS;
298 else if (!strcmp (val, "disabled"))
299 node->connectmode = conf_node::C_DISABLED;
300 else
301 slog (L_WARN,
302 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
303 var, fname, lineno);
304 }
305 else if (!strcmp (var, "inherit-tos"))
306 {
307 parse_bool (node->inherit_tos, "inherit-tos", true, false);
308 }
309 else if (!strcmp (var, "compress"))
310 {
311 parse_bool (node->compress, "compress", true, false);
312 }
313 // all these bool options really really cost a lot of executable size!
314 else if (!strcmp (var, "enable-tcp"))
315 {
316 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
317 }
318 else if (!strcmp (var, "enable-udp"))
319 {
320 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
321 }
322 else if (!strcmp (var, "enable-rawip"))
323 {
324 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
325 }
326
327 // unknown or misplaced
328 else
329 {
330 slog (L_WARN,
331 _("unknown or misplaced variable `%s', at '%s' line %d"),
332 var, fname, lineno);
333 }
334 } 587 }
335 588
336 fclose (f); 589 fclose (f);
590
591 parse_argv ();
337 } 592 }
338 else 593 else
339 { 594 {
340 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));
341 exit (1); 596 exit (EXIT_FAILURE);
342 } 597 }
598}
343 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);
344 free (fname); 613 free (fname);
345 614
346 fname = config_filename (prikeyfile, "hostkey"); 615 fname = conf.config_filename (conf.prikeyfile, "hostkey");
347 616
348 f = fopen (fname, "r"); 617 if (FILE *f = fopen (fname, "r"))
349 if (f)
350 { 618 {
351 rsa_key = RSA_new (); 619 conf.rsa_key = RSA_new ();
352 620
353 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 621 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
354 { 622 {
355 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 623 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
356 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));
357 exit (1); 625 exit (EXIT_FAILURE);
358 } 626 }
359 627
360 RSA_blinding_on (rsa_key, 0); 628 require (RSA_blinding_on (conf.rsa_key, 0));
361 629
362 fclose (f); 630 fclose (f);
363 } 631 }
364 else 632 else
365 { 633 {
366 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));
367 635
368 if (need_keys) 636 if (need_keys)
369 exit (1); 637 exit (EXIT_FAILURE);
370 } 638 }
371 639
372 free (fname); 640 free (fname);
373}
374 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 *
375char *configuration::config_filename (const char *name, const char *dflt) 656configuration::config_filename (const char *name, const char *dflt)
376{ 657{
377 char *fname; 658 char *fname;
378 659
379 asprintf (&fname, name ? name : dflt, ::thisnode); 660 asprintf (&fname, name ? name : dflt, ::thisnode);
380 661
384 asprintf (&fname, "%s/%s", confbase, rname); 665 asprintf (&fname, "%s/%s", confbase, rname);
385 free (rname); 666 free (rname);
386 } 667 }
387 668
388 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 );
389} 690}
390 691
391void 692void
392configuration::print () 693configuration::print ()
393{ 694{
397 printf (_("MTU: %d\n"), mtu); 698 printf (_("MTU: %d\n"), mtu);
398 printf (_("rekeying interval: %d\n"), rekey); 699 printf (_("rekeying interval: %d\n"), rekey);
399 printf (_("keepalive interval: %d\n"), keepalive); 700 printf (_("keepalive interval: %d\n"), keepalive);
400 printf (_("interface: %s\n"), ifname); 701 printf (_("interface: %s\n"), ifname);
401 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 702 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
402 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 703 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
403 printf ("\n"); 704 printf ("\n");
404 705
405 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 706 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
406 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 707 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
407 708
408 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 709 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
409 (*i)->print (); 710 (*i)->print ();
410 711
411 printf ("\n"); 712 printf ("\n");
412} 713}
413 714
414void 715configuration::configuration ()
415conf_node::print ()
416{ 716{
417 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 717 asprintf (&confbase, "%s/gvpe", CONFDIR);
418 id,
419 id >> 8, id & 0xff,
420 compress ? 'Y' : 'N',
421 connectmode == C_ONDEMAND ? "ondemand" :
422 connectmode == C_NEVER ? "never" :
423 connectmode == C_ALWAYS ? "always" : "",
424 nodename,
425 hostname ? hostname : "",
426 hostname ? ":" : "",
427 hostname ? udp_port : 0
428 );
429}
430 718
719 init ();
720}
721
722configuration::~configuration ()
723{
724 cleanup ();
725}
726

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines