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.26 by pcg, Wed May 12 13:32:13 2004 UTC vs.
Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC

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

Diff Legend

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