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.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-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;
47char *thisnode; 57char *thisnode;
48char *identname; 58char *identname;
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;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 69 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 70
60 return 0; 71 return 0;
61} 72}
62 73
74const char *
63const char *strprotocol (u8 protocol) 75strprotocol (u8 protocol)
64{ 76{
65 if (protocol & PROT_IPv4 ) return "rawip"; 77 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 78 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 79 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 80 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns"; 81 if (protocol & PROT_DNSv4 ) return "dns";
70 82
71 return "<unknown>"; 83 return "<unknown>";
72} 84}
73 85
74void 86static bool
75conf_node::print () 87match_list (const vector<const char *> &list, const char *str)
76{ 88{
77 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 (); )
78 id, 90 if ((*i)[0] == '*' && !(*i)[1])
79 id >> 8, id & 0xff, 91 return true;
80 compress ? 'Y' : 'N', 92 else if (!strcmp (*i, str))
81 connectmode == C_ONDEMAND ? "ondemand" : 93 return true;
82 connectmode == C_NEVER ? "never" : 94
83 connectmode == C_ALWAYS ? "always" : "", 95 return false;
84 nodename, 96}
85 hostname ? hostname : "", 97
86 hostname ? ":" : "", 98bool
87 hostname ? udp_port : 0 99conf_node::may_direct (struct conf_node *other)
88 ); 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;
89} 108}
90 109
91conf_node::~conf_node () 110conf_node::~conf_node ()
92{ 111{
112#if 0
113 // does not work, because string pointers etc. are shared
114 // is not called, however
93 if (rsa_key) 115 if (rsa_key)
94 RSA_free (rsa_key); 116 RSA_free (rsa_key);
95 117
96 free (nodename); 118 free (nodename);
97 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
98} 126}
99 127
128void
100void configuration::init () 129configuration::init ()
101{ 130{
102 memset (this, 0, sizeof (*this)); 131 memset (this, 0, sizeof (*this));
103 132
104 mtu = DEFAULT_MTU; 133 mtu = DEFAULT_MTU;
134 nfmark = 0;
105 rekey = DEFAULT_REKEY; 135 rekey = DEFAULT_REKEY;
106 keepalive = DEFAULT_KEEPALIVE; 136 keepalive = DEFAULT_KEEPALIVE;
107 llevel = L_INFO; 137 llevel = L_INFO;
108 ip_proto = IPPROTO_GRE; 138 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP 139#if ENABLE_ICMP
112 142
113 default_node.udp_port = DEFAULT_UDPPORT; 143 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 144 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 145 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 146 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 147 default_node.protocols = 0;
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 ("");
118 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
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid"); 164 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
120} 165}
121 166
167void
122void configuration::cleanup() 168configuration::cleanup ()
123{ 169{
124 if (rsa_key) 170 if (rsa_key)
125 RSA_free (rsa_key); 171 RSA_free (rsa_key);
126 172
127 rsa_key = 0; 173 rsa_key = 0;
128 174
129 free (pidfilename); pidfilename = 0; 175 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0; 176 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY 177#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0; 178 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0; 179 free (proxy_auth); proxy_auth = 0;
134#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;
135} 188}
136 189
137void 190void
138configuration::clear_config () 191configuration::clear ()
139{ 192{
140 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)
141 delete *i; 194 delete *i;
142 195
143 nodes.clear (); 196 nodes.clear ();
144 197
145 cleanup (); 198 cleanup ();
146 init (); 199 init ();
147} 200}
148 201
149#define parse_bool(target,name,trueval,falseval) \ 202#define parse_bool(target,name,trueval,falseval) do { \
150 if (!strcmp (val, "yes")) target = trueval; \ 203 if (!strcmp (val, "yes")) target = trueval; \
151 else if (!strcmp (val, "no")) target = falseval; \ 204 else if (!strcmp (val, "no")) target = falseval; \
152 else if (!strcmp (val, "true")) target = trueval; \ 205 else if (!strcmp (val, "true")) target = trueval; \
153 else if (!strcmp (val, "false")) target = falseval; \ 206 else if (!strcmp (val, "false")) target = falseval; \
154 else if (!strcmp (val, "on")) target = trueval; \ 207 else if (!strcmp (val, "on")) target = trueval; \
155 else if (!strcmp (val, "off")) target = falseval; \ 208 else if (!strcmp (val, "off")) target = falseval; \
156 else \ 209 else \
157 slog (L_WARN, \ 210 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"), \ 211} while (0)
159 name, var, fname, lineno);
160 212
161void 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)
162{ 541{
163 char *fname; 542 char *fname;
164 FILE *f; 543 FILE *f;
165 544
166 clear_config (); 545 conf.clear ();
167 546
168 asprintf (&fname, "%s/vped.conf", confbase); 547 asprintf (&fname, "%s/gvpe.conf", confbase);
169 f = fopen (fname, "r"); 548 f = fopen (fname, "r");
170 549
171 if (f) 550 if (f)
172 { 551 {
173 char line[16384]; 552 char line[16384];
174 int lineno = 0; 553 int lineno = 0;
175 char *var, *val; 554 node = &conf.default_node;
176 conf_node *node = &default_node;
177 555
178 while (fgets (line, sizeof (line), f)) 556 while (fgets (line, sizeof (line), f))
179 { 557 {
180 lineno++; 558 lineno++;
181 559
182 { 560 const char *warn = parse_line (line);
183 char *end = line + strlen (line);
184 561
185 while (*end < ' ' && end >= line) 562 if (warn)
186 end--; 563 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 } 564 }
400 565
401 fclose (f); 566 fclose (f);
567
568 parse_argv ();
402 } 569 }
403 else 570 else
404 { 571 {
405 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));
406 exit (EXIT_FAILURE); 573 exit (EXIT_FAILURE);
407 } 574 }
408 575
409 free (fname); 576 free (fname);
410 577
411 fname = config_filename (prikeyfile, "hostkey"); 578 fname = conf.config_filename (conf.prikeyfile, "hostkey");
412 579
413 f = fopen (fname, "r"); 580 f = fopen (fname, "r");
414 if (f) 581 if (f)
415 { 582 {
416 rsa_key = RSA_new (); 583 conf.rsa_key = RSA_new ();
417 584
418 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 585 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
419 { 586 {
420 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 587 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)); 588 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
422 exit (EXIT_FAILURE); 589 exit (EXIT_FAILURE);
423 } 590 }
424 591
425 require (RSA_blinding_on (rsa_key, 0)); 592 require (RSA_blinding_on (conf.rsa_key, 0));
426 593
427 fclose (f); 594 fclose (f);
428 } 595 }
429 else 596 else
430 { 597 {
433 if (need_keys) 600 if (need_keys)
434 exit (EXIT_FAILURE); 601 exit (EXIT_FAILURE);
435 } 602 }
436 603
437 if (need_keys && ::thisnode 604 if (need_keys && ::thisnode
438 && rsa_key && thisnode && thisnode->rsa_key) 605 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
439 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 606 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
440 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 607 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
441 { 608 {
442 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 609 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
443 exit (EXIT_FAILURE); 610 exit (EXIT_FAILURE);
444 } 611 }
445 612
446 free (fname); 613 free (fname);
447}
448 614
615 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
616 (*i)->finalise ();
617}
618
619char *
449char *configuration::config_filename (const char *name, const char *dflt) 620configuration::config_filename (const char *name, const char *dflt)
450{ 621{
451 char *fname; 622 char *fname;
452 623
453 asprintf (&fname, name ? name : dflt, ::thisnode); 624 asprintf (&fname, name ? name : dflt, ::thisnode);
454 625
458 asprintf (&fname, "%s/%s", confbase, rname); 629 asprintf (&fname, "%s/%s", confbase, rname);
459 free (rname); 630 free (rname);
460 } 631 }
461 632
462 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 );
463} 654}
464 655
465void 656void
466configuration::print () 657configuration::print ()
467{ 658{
474 printf (_("interface: %s\n"), ifname); 665 printf (_("interface: %s\n"), ifname);
475 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 666 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
476 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);
477 printf ("\n"); 668 printf ("\n");
478 669
479 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 670 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
480 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 671 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
481 672
482 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 673 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
483 (*i)->print (); 674 (*i)->print ();
484 675
485 printf ("\n"); 676 printf ("\n");
486} 677}
487 678
488configuration::configuration () 679configuration::configuration ()
489{ 680{
490 asprintf (&confbase, "%s/vpe", CONFDIR); 681 asprintf (&confbase, "%s/gvpe", CONFDIR);
491 682
492 init (); 683 init ();
493} 684}
494 685
495configuration::~configuration () 686configuration::~configuration ()
496{ 687{
497 cleanup (); 688 cleanup ();
498} 689}
499 690
500

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines