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.2 by pcg, Thu Mar 6 18:43:07 2003 UTC vs.
Revision 1.60 by root, Sat Jul 13 04:10:29 2013 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.C -- configuration code
3 Copyright (C) 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>
44
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>
38#include <openssl/rsa.h> 49#include <openssl/rsa.h>
39#include <openssl/rand.h> 50#include <openssl/rand.h>
40 51#include <openssl/bn.h>
41#include "gettext.h"
42 52
43#include "conf.h" 53#include "conf.h"
44#include "slog.h" 54#include "slog.h"
45#include "util.h" 55#include "util.h"
46 56
47char *confbase; 57char *confbase;
48char *thisnode; 58char *thisnode;
49char *identname; 59char *identname;
50char *pidfilename;
51 60
52struct configuration conf; 61struct configuration conf;
53 62
54configuration::configuration () 63u8
64best_protocol (u8 protset)
55{ 65{
56 init (); 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
57} 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;
58 71
59configuration::~configuration () 72 return 0;
60{
61 cleanup ();
62} 73}
63 74
75const char *
76strprotocol (u8 protocol)
77{
78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
80 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp";
82 if (protocol & PROT_DNSv4 ) return "dns";
83
84 return "<unknown>";
85}
86
87static bool
88match_list (const vector<const char *> &list, const char *str)
89{
90 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
91 if ((*i)[0] == '*' && !(*i)[1])
92 return true;
93 else if (!strcmp (*i, str))
94 return true;
95
96 return false;
97}
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
64void configuration::init () 130configuration::init ()
65{ 131{
66 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
67 133
134 mtu = DEFAULT_MTU;
135 nfmark = 0;
68 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 138 llevel = L_INFO;
139 ip_proto = IPPROTO_GRE;
140#if ENABLE_ICMP
141 icmp_type = ICMP_ECHOREPLY;
142#endif
71 143
72 default_node.port = DEFAULT_PORT; 144 default_node.udp_port = DEFAULT_UDPPORT;
145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 147 default_node.compress = true;
75} 148 default_node.protocols = 0;
149 default_node.max_retry = DEFAULT_MAX_RETRY;
150 default_node.max_ttl = DEFAULT_MAX_TTL;
151 default_node.max_queue = DEFAULT_MAX_QUEUE;
152 default_node.if_up_data = strdup ("");
76 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 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
169}
170
171void
77void configuration::cleanup() 172configuration::cleanup ()
78{ 173{
79 if (rsa_key) 174 if (rsa_key)
80 RSA_free (rsa_key); 175 RSA_free (rsa_key);
81 176
82 free (ifname);
83
84 rsa_key = 0; 177 rsa_key = 0;
85 ifname = 0; 178
179 free (seed_dev); seed_dev = 0;
180 free (pidfilename); pidfilename = 0;
181 free (ifname); ifname = 0;
182#if ENABLE_HTTP_PROXY
183 free (proxy_host); proxy_host = 0;
184 free (proxy_auth); proxy_auth = 0;
185#endif
186#if ENABLE_DNS
187 free (dns_forw_host); dns_forw_host = 0;
188#endif
189 free (change_root); change_root = 0;
190 free (script_if_up); script_if_up = 0;
191 free (script_node_up); script_node_up = 0;
192 free (script_node_change); script_node_change = 0;
193 free (script_node_down); script_node_down = 0;
86} 194}
87 195
88void 196void
89configuration::clear_config () 197configuration::clear ()
90{ 198{
91 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)
92 delete *i; 200 delete *i;
93 201
94 nodes.clear (); 202 nodes.clear ();
95 203
96 cleanup (); 204 cleanup ();
97 init (); 205 init ();
98} 206}
99 207
100void configuration::read_config (bool need_keys) 208//static bool
209//is_true (const char *name)
210//{
211 //re
212//}
213
214#define parse_bool(target,name,trueval,falseval) do { \
215 if (!strcmp (val, "yes")) target = trueval; \
216 else if (!strcmp (val, "no")) target = falseval; \
217 else if (!strcmp (val, "true")) target = trueval; \
218 else if (!strcmp (val, "false")) target = falseval; \
219 else if (!strcmp (val, "on")) target = trueval; \
220 else if (!strcmp (val, "off")) target = falseval; \
221 else \
222 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
223} while (0)
224
225const char *
226configuration_parser::parse_line (char *line)
101{ 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 {
102 char *fname; 310 char *fname;
103 FILE *f; 311 FILE *f;
104 312
105 clear_config (); 313 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
106 314
107 asprintf (&fname, "%s/vped.conf", confbase);
108 f = fopen (fname, "r"); 315 f = fopen (fname, "r");
316 if (f)
317 {
318 node->rsa_key = RSA_new ();
109 319
110 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;
111 { 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 {
112 char line[16384]; 583 char line [2048];
113 int lineno = 0; 584 int lineno = 0;
114 char *var, *val;
115 conf_node *node = &default_node;
116 585
117 while (fgets (line, sizeof (line), f)) 586 while (fgets (line, sizeof (line), f))
118 { 587 {
119 lineno++; 588 lineno++;
120 589
121 { 590 const char *warn = parse_line (line);
122 char *end = line + strlen (line);
123 591
124 while (*end < ' ' && end >= line) 592 if (warn)
125 end--; 593 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
126
127 *++end = 0;
128 }
129
130 char *tok = line;
131
132retry:
133 var = strtok (tok, "\t =");
134 tok = 0;
135
136 if (!var || !var[0])
137 continue; /* no tokens on this line */
138
139 if (var[0] == '#')
140 continue; /* comment: ignore */
141
142 val = strtok (NULL, "\t\n\r =");
143
144 if (!val || val[0] == '#')
145 {
146 slog (L_WARN,
147 _("no value for variable `%s', at '%s' line %d"),
148 var, fname, lineno);
149 break;
150 }
151
152 if (!strcmp (var, "on"))
153 {
154 if (!::thisnode
155 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
156 || !strcmp (val, ::thisnode))
157 goto retry;
158
159 continue;
160 }
161
162 // truly global
163 if (!strcmp (var, "loglevel"))
164 {
165 loglevel l = string_to_loglevel (val);
166
167 if (l != L_NONE)
168 llevel = l;
169 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 }
172
173 // per config
174 else if (!strcmp (var, "node"))
175 {
176 default_node.id++;
177
178 node = new conf_node (default_node);
179
180 nodes.push_back (node);
181
182 node->nodename = strdup (val);
183
184 {
185 char *fname;
186 FILE *f;
187
188 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
189
190 f = fopen (fname, "r");
191 if (f)
192 {
193 node->rsa_key = RSA_new ();
194
195 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196 {
197 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
198 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199 exit (1);
200 }
201
202 RSA_blinding_on (node->rsa_key, 0);
203
204 fclose (f);
205 }
206 else
207 {
208 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209
210 if (need_keys)
211 exit (1);
212 }
213
214 free (fname);
215 }
216
217 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
218 thisnode = node;
219 }
220 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist"))
223 {
224 if (!strcmp (val, "yes"))
225 ifpersist = true;
226 else if (!strcmp (val, "no"))
227 ifpersist = false;
228 else
229 slog (L_WARN,
230 _("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231 var, fname, lineno);
232 }
233 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val);
235 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val);
237 else if (!strcmp (var, "keepalive"))
238 keepalive = atoi (val);
239 else if (!strcmp (var, "mtu"))
240 mtu = atoi (val);
241 else if (!strcmp (var, "if-up"))
242 script_if_up = strdup (val);
243 else if (!strcmp (var, "node-up"))
244 script_node_up = strdup (val);
245 else if (!strcmp (var, "node-down"))
246 script_node_down = strdup (val);
247
248 /* node-specific, non-defaultable */
249 else if (node != &default_node && !strcmp (var, "hostname"))
250 {
251 free (node->hostname);
252 node->hostname = strdup (val);
253 }
254
255 /* node-specific, defaultable */
256 else if (!strcmp (var, "port"))
257 node->port = atoi (val);
258 else if (!strcmp (var, "router-priority"))
259 node->routerprio = atoi (val);
260 else if (!strcmp (var, "connect"))
261 {
262 if (!strcmp (val, "ondemand"))
263 node->connectmode = conf_node::C_ONDEMAND;
264 else if (!strcmp (val, "never"))
265 node->connectmode = conf_node::C_NEVER;
266 else if (!strcmp (val, "always"))
267 node->connectmode = conf_node::C_ALWAYS;
268 else
269 slog (L_WARN,
270 _("illegal value for 'connectmode', use one of 'ondemand', 'never' or 'always', at '%s' line %d"),
271 var, fname, lineno);
272 }
273 else if (!strcmp (var, "compress"))
274 {
275 if (!strcmp (val, "yes"))
276 node->compress = true;
277 else if (!strcmp (val, "no"))
278 node->compress = false;
279 else
280 slog (L_WARN,
281 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
282 var, fname, lineno);
283 }
284
285 // unknown or misplaced
286 else
287 {
288 slog (L_WARN,
289 _("unknown or misplaced variable `%s', at '%s' line %d"),
290 var, fname, lineno);
291 }
292 } 594 }
293 595
294 fclose (f); 596 fclose (f);
597
598 parse_argv ();
295 } 599 }
296 else 600 else
297 { 601 {
298 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));
299 exit (1); 603 exit (EXIT_FAILURE);
300 } 604 }
605}
301 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);
302 free (fname); 620 free (fname);
303 621
304 fname = config_filename (prikeyfile, "hostkey"); 622 fname = conf.config_filename (conf.prikeyfile, "hostkey");
305 623
306 f = fopen (fname, "r"); 624 if (FILE *f = fopen (fname, "r"))
307 if (f)
308 { 625 {
309 rsa_key = RSA_new (); 626 conf.rsa_key = RSA_new ();
310 627
311 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 628 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
312 { 629 {
313 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 630 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
314 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));
315 exit (1); 632 exit (EXIT_FAILURE);
316 } 633 }
317 634
318 RSA_blinding_on (rsa_key, 0); 635 require (RSA_blinding_on (conf.rsa_key, 0));
319 636
320 fclose (f); 637 fclose (f);
321 } 638 }
322 else 639 else
323 { 640 {
324 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 641 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
325 642
326 if (need_keys) 643 if (need_keys)
327 exit (1); 644 exit (EXIT_FAILURE);
328 } 645 }
329 646
330 free (fname); 647 free (fname);
331}
332 648
649 if (need_keys && ::thisnode
650 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
651 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
652 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
653 {
654 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
655 exit (EXIT_FAILURE);
656 }
657
658 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
659 (*i)->finalise ();
660}
661
662char *
333char *configuration::config_filename (const char *name, const char *dflt) 663configuration::config_filename (const char *name, const char *dflt)
334{ 664{
335 char *fname; 665 char *fname;
336 666
337 asprintf (&fname, name ? name : dflt, ::thisnode); 667 asprintf (&fname, name ? name : dflt, ::thisnode);
338 668
342 asprintf (&fname, "%s/%s", confbase, rname); 672 asprintf (&fname, "%s/%s", confbase, rname);
343 free (rname); 673 free (rname);
344 } 674 }
345 675
346 return fname; 676 return fname;
677}
678
679void
680conf_node::print ()
681{
682 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
683 id,
684 id >> 8, id & 0xff,
685 compress ? 'Y' : 'N',
686 connectmode == C_ONDEMAND ? "ondemand"
687 : connectmode == C_NEVER ? "never"
688 : connectmode == C_ALWAYS ? "always"
689 : connectmode == C_DISABLED ? "disabled"
690 : "",
691 nodename,
692 protocols,
693 hostname ? hostname : "",
694 hostname ? ":" : "",
695 hostname ? udp_port : 0
696 );
347} 697}
348 698
349void 699void
350configuration::print () 700configuration::print ()
351{ 701{
355 printf (_("MTU: %d\n"), mtu); 705 printf (_("MTU: %d\n"), mtu);
356 printf (_("rekeying interval: %d\n"), rekey); 706 printf (_("rekeying interval: %d\n"), rekey);
357 printf (_("keepalive interval: %d\n"), keepalive); 707 printf (_("keepalive interval: %d\n"), keepalive);
358 printf (_("interface: %s\n"), ifname); 708 printf (_("interface: %s\n"), ifname);
359 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 709 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
360 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 710 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
361 printf ("\n"); 711 printf ("\n");
362 712
363 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 713 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
364 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 714 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
365 715
366 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 716 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
367 (*i)->print (); 717 (*i)->print ();
368 718
369 printf ("\n"); 719 printf ("\n");
370} 720}
371 721
372void 722configuration::configuration ()
373conf_node::print ()
374{ 723{
375 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 724 asprintf (&confbase, "%s/gvpe", CONFDIR);
376 id,
377 id >> 8, id & 0xff,
378 compress ? 'Y' : 'N',
379 connectmode == C_ONDEMAND ? "ondemand" :
380 connectmode == C_NEVER ? "never" :
381 connectmode == C_ALWAYS ? "always" : "",
382 nodename,
383 hostname ? hostname : "",
384 hostname ? ":" : "",
385 hostname ? port : 0
386 );
387}
388 725
726 init ();
727}
728
729configuration::~configuration ()
730{
731 cleanup ();
732}
733

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines