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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines