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.19 by pcg, Thu Oct 16 20:35:14 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) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 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
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cstdio> 34#include <cstdio>
33 45
34#include <openssl/err.h> 46#include <openssl/err.h>
35#include <openssl/pem.h> 47#include <openssl/pem.h>
36#include <openssl/rsa.h> 48#include <openssl/rsa.h>
37#include <openssl/rand.h> 49#include <openssl/rand.h>
38 50#include <openssl/bn.h>
39#include "gettext.h"
40 51
41#include "conf.h" 52#include "conf.h"
42#include "slog.h" 53#include "slog.h"
43#include "util.h" 54#include "util.h"
44 55
45char *confbase; 56char *confbase;
46char *thisnode; 57char *thisnode;
47char *identname; 58char *identname;
48char *pidfilename;
49 59
50struct configuration conf; 60struct configuration conf;
51 61
62u8
52u8 best_protocol (u8 protset) 63best_protocol (u8 protset)
53{ 64{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 65 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 66 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 67 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 68 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
69 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 70
59 return 0; 71 return 0;
60} 72}
61 73
74const char *
62const char *strprotocol (u8 protocol) 75strprotocol (u8 protocol)
63{ 76{
64 if (protocol & PROT_IPv4 ) return "rawip"; 77 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp"; 78 if (protocol & PROT_ICMPv4) return "icmp";
66 if (protocol & PROT_UDPv4 ) return "udp"; 79 if (protocol & PROT_UDPv4 ) return "udp";
67 if (protocol & PROT_TCPv4 ) return "tcp"; 80 if (protocol & PROT_TCPv4 ) return "tcp";
81 if (protocol & PROT_DNSv4 ) return "dns";
68 82
69 return "<unknown>"; 83 return "<unknown>";
70} 84}
71 85
72void 86static bool
73conf_node::print () 87match_list (const vector<const char *> &list, const char *str)
74{ 88{
75 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 (); )
76 id, 90 if ((*i)[0] == '*' && !(*i)[1])
77 id >> 8, id & 0xff, 91 return true;
78 compress ? 'Y' : 'N', 92 else if (!strcmp (*i, str))
79 connectmode == C_ONDEMAND ? "ondemand" : 93 return true;
80 connectmode == C_NEVER ? "never" : 94
81 connectmode == C_ALWAYS ? "always" : "", 95 return false;
82 nodename, 96}
83 hostname ? hostname : "", 97
84 hostname ? ":" : "", 98bool
85 hostname ? udp_port : 0 99conf_node::may_direct (struct conf_node *other)
86 ); 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;
87} 108}
88 109
89conf_node::~conf_node () 110conf_node::~conf_node ()
90{ 111{
112#if 0
113 // does not work, because string pointers etc. are shared
114 // is not called, however
91 if (rsa_key) 115 if (rsa_key)
92 RSA_free (rsa_key); 116 RSA_free (rsa_key);
93 117
94 free (nodename); 118 free (nodename);
95 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
96} 126}
97 127
128void
98void configuration::init () 129configuration::init ()
99{ 130{
100 memset (this, 0, sizeof (*this)); 131 memset (this, 0, sizeof (*this));
101 132
102 mtu = DEFAULT_MTU; 133 mtu = DEFAULT_MTU;
134 nfmark = 0;
103 rekey = DEFAULT_REKEY; 135 rekey = DEFAULT_REKEY;
104 keepalive = DEFAULT_KEEPALIVE; 136 keepalive = DEFAULT_KEEPALIVE;
105 llevel = L_INFO; 137 llevel = L_INFO;
106 ip_proto = IPPROTO_GRE; 138 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP 139#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 140 icmp_type = ICMP_ECHOREPLY;
109#endif 141#endif
110 142
111 default_node.udp_port = DEFAULT_UDPPORT; 143 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 144 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 145 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 146 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 147 default_node.protocols = 0;
116} 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 ("");
117 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
118void configuration::cleanup() 168configuration::cleanup ()
119{ 169{
120 if (rsa_key) 170 if (rsa_key)
121 RSA_free (rsa_key); 171 RSA_free (rsa_key);
122 172
123 rsa_key = 0; 173 rsa_key = 0;
124 174
125 free (ifname); ifname = 0; 175 free (pidfilename); pidfilename = 0;
176 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 177#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 178 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 179 free (proxy_auth); proxy_auth = 0;
129#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;
130} 188}
131 189
132void 190void
133configuration::clear_config () 191configuration::clear ()
134{ 192{
135 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)
136 delete *i; 194 delete *i;
137 195
138 nodes.clear (); 196 nodes.clear ();
139 197
140 cleanup (); 198 cleanup ();
141 init (); 199 init ();
142} 200}
143 201
144#define parse_bool(target,name,trueval,falseval) \ 202#define parse_bool(target,name,trueval,falseval) do { \
145 if (!strcmp (val, "yes")) target = trueval; \ 203 if (!strcmp (val, "yes")) target = trueval; \
146 else if (!strcmp (val, "no")) target = falseval; \ 204 else if (!strcmp (val, "no")) target = falseval; \
147 else if (!strcmp (val, "true")) target = trueval; \ 205 else if (!strcmp (val, "true")) target = trueval; \
148 else if (!strcmp (val, "false")) target = falseval; \ 206 else if (!strcmp (val, "false")) target = falseval; \
149 else if (!strcmp (val, "on")) target = trueval; \ 207 else if (!strcmp (val, "on")) target = trueval; \
150 else if (!strcmp (val, "off")) target = falseval; \ 208 else if (!strcmp (val, "off")) target = falseval; \
151 else \ 209 else \
152 slog (L_WARN, \ 210 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
153 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 211} while (0)
154 name, var, fname, lineno);
155 212
156void 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)
157{ 541{
158 char *fname; 542 char *fname;
159 FILE *f; 543 FILE *f;
160 544
161 clear_config (); 545 conf.clear ();
162 546
163 asprintf (&fname, "%s/vped.conf", confbase); 547 asprintf (&fname, "%s/gvpe.conf", confbase);
164 f = fopen (fname, "r"); 548 f = fopen (fname, "r");
165 549
166 if (f) 550 if (f)
167 { 551 {
168 char line[16384]; 552 char line[16384];
169 int lineno = 0; 553 int lineno = 0;
170 char *var, *val; 554 node = &conf.default_node;
171 conf_node *node = &default_node;
172 555
173 while (fgets (line, sizeof (line), f)) 556 while (fgets (line, sizeof (line), f))
174 { 557 {
175 lineno++; 558 lineno++;
176 559
177 { 560 const char *warn = parse_line (line);
178 char *end = line + strlen (line);
179 561
180 while (*end < ' ' && end >= line) 562 if (warn)
181 end--; 563 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
182
183 *++end = 0;
184 }
185
186 char *tok = line;
187
188retry:
189 var = strtok (tok, "\t =");
190 tok = 0;
191
192 if (!var || !var[0])
193 continue; /* no tokens on this line */
194
195 if (var[0] == '#')
196 continue; /* comment: ignore */
197
198 val = strtok (NULL, "\t\n\r =");
199
200 if (!val || val[0] == '#')
201 {
202 slog (L_WARN,
203 _("no value for variable `%s', at '%s' line %d"),
204 var, fname, lineno);
205 break;
206 }
207
208 if (!strcmp (var, "on"))
209 {
210 if (!::thisnode
211 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
212 || !strcmp (val, ::thisnode))
213 goto retry;
214
215 continue;
216 }
217
218 // truly global
219 if (!strcmp (var, "loglevel"))
220 {
221 loglevel l = string_to_loglevel (val);
222
223 if (l != L_NONE)
224 llevel = l;
225 else
226 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
227 }
228 else if (!strcmp (var, "ip-proto"))
229 ip_proto = atoi (val);
230#if ENABLE_ICMP
231 //TODO: error message
232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val);
234#endif
235
236 // per config
237 else if (!strcmp (var, "node"))
238 {
239 default_node.id++;
240
241 node = new conf_node (default_node);
242
243 nodes.push_back (node);
244
245 node->nodename = strdup (val);
246
247 {
248 char *fname;
249 FILE *f;
250
251 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
252
253 f = fopen (fname, "r");
254 if (f)
255 {
256 node->rsa_key = RSA_new ();
257
258 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
259 {
260 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
261 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
262 exit (1);
263 }
264
265 RSA_blinding_on (node->rsa_key, 0);
266
267 fclose (f);
268 }
269 else
270 {
271 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
272
273 if (need_keys)
274 exit (1);
275 }
276
277 free (fname);
278 }
279
280 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
281 thisnode = node;
282 }
283 else if (!strcmp (var, "private-key"))
284 prikeyfile = strdup (val);
285 else if (!strcmp (var, "ifpersist"))
286 {
287 parse_bool (ifpersist, "ifpersist", true, false);
288 }
289 else if (!strcmp (var, "ifname"))
290 ifname = strdup (val);
291 else if (!strcmp (var, "rekey"))
292 rekey = atoi (val);
293 else if (!strcmp (var, "keepalive"))
294 keepalive = atoi (val);
295 else if (!strcmp (var, "mtu"))
296 mtu = atoi (val);
297 else if (!strcmp (var, "if-up"))
298 script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up"))
300 script_node_up = strdup (val);
301 else if (!strcmp (var, "node-down"))
302 script_node_down = strdup (val);
303#if ENABLE_HTTP_PROXY
304 else if (!strcmp (var, "http-proxy-host"))
305 proxy_host = strdup (val);
306 else if (!strcmp (var, "http-proxy-port"))
307 proxy_port = atoi (val);
308 else if (!strcmp (var, "http-proxy-auth"))
309 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
310#endif
311
312 /* node-specific, non-defaultable */
313 else if (node != &default_node && !strcmp (var, "hostname"))
314 {
315 free (node->hostname);
316 node->hostname = strdup (val);
317 }
318
319 /* node-specific, defaultable */
320 else if (!strcmp (var, "udp-port"))
321 node->udp_port = atoi (val);
322 else if (!strcmp (var, "tcp-port"))
323 node->tcp_port = atoi (val);
324 else if (!strcmp (var, "router-priority"))
325 node->routerprio = atoi (val);
326 else if (!strcmp (var, "connect"))
327 {
328 if (!strcmp (val, "ondemand"))
329 node->connectmode = conf_node::C_ONDEMAND;
330 else if (!strcmp (val, "never"))
331 node->connectmode = conf_node::C_NEVER;
332 else if (!strcmp (val, "always"))
333 node->connectmode = conf_node::C_ALWAYS;
334 else if (!strcmp (val, "disabled"))
335 node->connectmode = conf_node::C_DISABLED;
336 else
337 slog (L_WARN,
338 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
339 var, fname, lineno);
340 }
341 else if (!strcmp (var, "inherit-tos"))
342 {
343 parse_bool (node->inherit_tos, "inherit-tos", true, false);
344 }
345 else if (!strcmp (var, "compress"))
346 {
347 parse_bool (node->compress, "compress", true, false);
348 }
349 // all these bool options really really cost a lot of executable size!
350 else if (!strcmp (var, "enable-tcp"))
351 {
352#if ENABLE_TCP
353 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
354#endif
355 }
356 else if (!strcmp (var, "enable-icmp"))
357 {
358#if ENABLE_ICMP
359 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
360#endif
361 }
362 else if (!strcmp (var, "enable-udp"))
363 {
364 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
365 }
366 else if (!strcmp (var, "enable-rawip"))
367 {
368 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
369 }
370
371 // unknown or misplaced
372 else
373 slog (L_WARN,
374 _("unknown or misplaced variable `%s', at '%s' line %d"),
375 var, fname, lineno);
376 } 564 }
377 565
378 fclose (f); 566 fclose (f);
567
568 parse_argv ();
379 } 569 }
380 else 570 else
381 { 571 {
382 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));
383 exit (1); 573 exit (EXIT_FAILURE);
384 } 574 }
385 575
386 free (fname); 576 free (fname);
387 577
388 fname = config_filename (prikeyfile, "hostkey"); 578 fname = conf.config_filename (conf.prikeyfile, "hostkey");
389 579
390 f = fopen (fname, "r"); 580 f = fopen (fname, "r");
391 if (f) 581 if (f)
392 { 582 {
393 rsa_key = RSA_new (); 583 conf.rsa_key = RSA_new ();
394 584
395 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 585 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
396 { 586 {
397 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 587 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
398 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));
399 exit (1); 589 exit (EXIT_FAILURE);
400 } 590 }
401 591
402 RSA_blinding_on (rsa_key, 0); 592 require (RSA_blinding_on (conf.rsa_key, 0));
403 593
404 fclose (f); 594 fclose (f);
405 } 595 }
406 else 596 else
407 { 597 {
408 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));
409 599
410 if (need_keys) 600 if (need_keys)
411 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);
412 } 611 }
413 612
414 free (fname); 613 free (fname);
415}
416 614
615 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
616 (*i)->finalise ();
617}
618
619char *
417char *configuration::config_filename (const char *name, const char *dflt) 620configuration::config_filename (const char *name, const char *dflt)
418{ 621{
419 char *fname; 622 char *fname;
420 623
421 asprintf (&fname, name ? name : dflt, ::thisnode); 624 asprintf (&fname, name ? name : dflt, ::thisnode);
422 625
426 asprintf (&fname, "%s/%s", confbase, rname); 629 asprintf (&fname, "%s/%s", confbase, rname);
427 free (rname); 630 free (rname);
428 } 631 }
429 632
430 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 );
431} 654}
432 655
433void 656void
434configuration::print () 657configuration::print ()
435{ 658{
442 printf (_("interface: %s\n"), ifname); 665 printf (_("interface: %s\n"), ifname);
443 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 666 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
444 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);
445 printf ("\n"); 668 printf ("\n");
446 669
447 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 670 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
448 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 671 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
449 672
450 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 673 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
451 (*i)->print (); 674 (*i)->print ();
452 675
453 printf ("\n"); 676 printf ("\n");
454} 677}
455 678
456configuration::configuration () 679configuration::configuration ()
457{ 680{
681 asprintf (&confbase, "%s/gvpe", CONFDIR);
682
458 init (); 683 init ();
459} 684}
460 685
461configuration::~configuration () 686configuration::~configuration ()
462{ 687{
463 cleanup (); 688 cleanup ();
464} 689}
465 690
466

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines