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.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) 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
52u8 best_protocol (u8 protset) 62u8 best_protocol (u8 protset)
53{ 63{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 64 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 65 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 66 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 67 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 69
59 return 0; 70 return 0;
60} 71}
61 72
62const char *strprotocol (u8 protocol) 73const char *strprotocol (u8 protocol)
63{ 74{
64 if (protocol & PROT_IPv4 ) return "rawip"; 75 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp"; 76 if (protocol & PROT_ICMPv4) return "icmp";
66 if (protocol & PROT_UDPv4 ) return "udp"; 77 if (protocol & PROT_UDPv4 ) return "udp";
67 if (protocol & PROT_TCPv4 ) return "tcp"; 78 if (protocol & PROT_TCPv4 ) return "tcp";
79 if (protocol & PROT_DNSv4 ) return "dns";
68 80
69 return "<unknown>"; 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;
70} 106}
71 107
72void 108void
73conf_node::print () 109conf_node::print ()
74{ 110{
75 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 111 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
76 id, 112 id,
77 id >> 8, id & 0xff, 113 id >> 8, id & 0xff,
78 compress ? 'Y' : 'N', 114 compress ? 'Y' : 'N',
79 connectmode == C_ONDEMAND ? "ondemand" : 115 connectmode == C_ONDEMAND ? "ondemand"
80 connectmode == C_NEVER ? "never" : 116 : connectmode == C_NEVER ? "never"
81 connectmode == C_ALWAYS ? "always" : "", 117 : connectmode == C_ALWAYS ? "always"
118 : connectmode == C_DISABLED ? "disabled"
119 : "",
82 nodename, 120 nodename,
83 hostname ? hostname : "", 121 hostname ? hostname : "",
84 hostname ? ":" : "", 122 hostname ? ":" : "",
85 hostname ? udp_port : 0 123 hostname ? udp_port : 0
86 ); 124 );
87} 125}
88 126
89conf_node::~conf_node () 127conf_node::~conf_node ()
90{ 128{
129#if 0
130 // does not work, because string pointers etc. are shared
131 // is not called, however
91 if (rsa_key) 132 if (rsa_key)
92 RSA_free (rsa_key); 133 RSA_free (rsa_key);
93 134
94 free (nodename); 135 free (nodename);
95 free (hostname); 136 free (hostname);
137 free (if_up_data);
138#if ENABLE_DNS
139 free (domain);
140 free (dns_hostname);
141#endif
142#endif
96} 143}
97 144
98void configuration::init () 145void configuration::init ()
99{ 146{
100 memset (this, 0, sizeof (*this)); 147 memset (this, 0, sizeof (*this));
101 148
102 mtu = DEFAULT_MTU; 149 mtu = DEFAULT_MTU;
150 nfmark = 0;
103 rekey = DEFAULT_REKEY; 151 rekey = DEFAULT_REKEY;
104 keepalive = DEFAULT_KEEPALIVE; 152 keepalive = DEFAULT_KEEPALIVE;
105 llevel = L_INFO; 153 llevel = L_INFO;
106 ip_proto = IPPROTO_GRE; 154 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP 155#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 156 icmp_type = ICMP_ECHOREPLY;
109#endif 157#endif
110 158
111 default_node.udp_port = DEFAULT_UDPPORT; 159 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 160 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 161 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 162 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 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");
116} 181}
117 182
118void configuration::cleanup() 183void configuration::cleanup()
119{ 184{
120 if (rsa_key) 185 if (rsa_key)
121 RSA_free (rsa_key); 186 RSA_free (rsa_key);
122 187
123 rsa_key = 0; 188 rsa_key = 0;
124 189
190 free (pidfilename); pidfilename = 0;
125 free (ifname); ifname = 0; 191 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 192#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 193 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 194 free (proxy_auth); proxy_auth = 0;
195#endif
196#if ENABLE_DNS
197 free (dns_forw_host); dns_forw_host = 0;
129#endif 198#endif
130} 199}
131 200
132void 201void
133configuration::clear_config () 202configuration::clear ()
134{ 203{
135 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)
136 delete *i; 205 delete *i;
137 206
138 nodes.clear (); 207 nodes.clear ();
139 208
140 cleanup (); 209 cleanup ();
141 init (); 210 init ();
142} 211}
143 212
144#define parse_bool(target,name,trueval,falseval) \ 213#define parse_bool(target,name,trueval,falseval) do { \
145 if (!strcmp (val, "yes")) target = trueval; \ 214 if (!strcmp (val, "yes")) target = trueval; \
146 else if (!strcmp (val, "no")) target = falseval; \ 215 else if (!strcmp (val, "no")) target = falseval; \
147 else if (!strcmp (val, "true")) target = trueval; \ 216 else if (!strcmp (val, "true")) target = trueval; \
148 else if (!strcmp (val, "false")) target = falseval; \ 217 else if (!strcmp (val, "false")) target = falseval; \
149 else if (!strcmp (val, "on")) target = trueval; \ 218 else if (!strcmp (val, "on")) target = trueval; \
150 else if (!strcmp (val, "off")) target = falseval; \ 219 else if (!strcmp (val, "off")) target = falseval; \
151 else \ 220 else \
152 slog (L_WARN, \ 221 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"), \ 222} while (0)
154 name, var, fname, lineno);
155 223
156void configuration::read_config (bool need_keys) 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)
157{ 548{
158 char *fname; 549 char *fname;
159 FILE *f; 550 FILE *f;
160 551
161 clear_config (); 552 conf.clear ();
162 553
163 asprintf (&fname, "%s/vped.conf", confbase); 554 asprintf (&fname, "%s/gvpe.conf", confbase);
164 f = fopen (fname, "r"); 555 f = fopen (fname, "r");
165 556
166 if (f) 557 if (f)
167 { 558 {
168 char line[16384]; 559 char line[16384];
169 int lineno = 0; 560 int lineno = 0;
170 char *var, *val; 561 node = &conf.default_node;
171 conf_node *node = &default_node;
172 562
173 while (fgets (line, sizeof (line), f)) 563 while (fgets (line, sizeof (line), f))
174 { 564 {
175 lineno++; 565 lineno++;
176 566
177 { 567 const char *warn = parse_line (line);
178 char *end = line + strlen (line);
179 568
180 while (*end < ' ' && end >= line) 569 if (warn)
181 end--; 570 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 } 571 }
377 572
378 fclose (f); 573 fclose (f);
574
575 parse_argv ();
379 } 576 }
380 else 577 else
381 { 578 {
382 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));
383 exit (1); 580 exit (EXIT_FAILURE);
384 } 581 }
385 582
386 free (fname); 583 free (fname);
387 584
388 fname = config_filename (prikeyfile, "hostkey"); 585 fname = conf.config_filename (conf.prikeyfile, "hostkey");
389 586
390 f = fopen (fname, "r"); 587 f = fopen (fname, "r");
391 if (f) 588 if (f)
392 { 589 {
393 rsa_key = RSA_new (); 590 conf.rsa_key = RSA_new ();
394 591
395 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 592 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
396 { 593 {
397 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 594 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)); 595 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
399 exit (1); 596 exit (EXIT_FAILURE);
400 } 597 }
401 598
402 RSA_blinding_on (rsa_key, 0); 599 require (RSA_blinding_on (conf.rsa_key, 0));
403 600
404 fclose (f); 601 fclose (f);
405 } 602 }
406 else 603 else
407 { 604 {
408 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));
409 606
410 if (need_keys) 607 if (need_keys)
411 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);
412 } 618 }
413 619
414 free (fname); 620 free (fname);
621
622 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
623 (*i)->finalise ();
415} 624}
416 625
417char *configuration::config_filename (const char *name, const char *dflt) 626char *configuration::config_filename (const char *name, const char *dflt)
418{ 627{
419 char *fname; 628 char *fname;
… …
453 printf ("\n"); 662 printf ("\n");
454} 663}
455 664
456configuration::configuration () 665configuration::configuration ()
457{ 666{
667 asprintf (&confbase, "%s/gvpe", CONFDIR);
668
458 init (); 669 init ();
459} 670}
460 671
461configuration::~configuration () 672configuration::~configuration ()
462{ 673{

Diff Legend

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