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

Diff Legend

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