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

Diff Legend

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