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

Diff Legend

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