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

Diff Legend

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