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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines