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.56 by root, Sun Mar 6 21:01:36 2011 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.C -- configuration code
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cstdio> 34#include <cstdio>
33 45
34#include <openssl/err.h> 46#include <openssl/err.h>
35#include <openssl/pem.h> 47#include <openssl/pem.h>
36#include <openssl/rsa.h> 48#include <openssl/rsa.h>
37#include <openssl/rand.h> 49#include <openssl/rand.h>
38 50#include <openssl/bn.h>
39#include "gettext.h"
40 51
41#include "conf.h" 52#include "conf.h"
42#include "slog.h" 53#include "slog.h"
43#include "util.h" 54#include "util.h"
44 55
45char *confbase; 56char *confbase;
46char *thisnode; 57char *thisnode;
47char *identname; 58char *identname;
48char *pidfilename;
49 59
50struct configuration conf; 60struct configuration conf;
51 61
62u8
52u8 best_protocol (u8 protset) 63best_protocol (u8 protset)
53{ 64{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 65 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 66 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 67 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 68 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
69 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 70
59 return 0; 71 return 0;
60} 72}
61 73
74const char *
62const char *strprotocol (u8 protocol) 75strprotocol (u8 protocol)
63{ 76{
64 if (protocol & PROT_IPv4 ) return "rawip"; 77 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp"; 78 if (protocol & PROT_ICMPv4) return "icmp";
66 if (protocol & PROT_UDPv4 ) return "udp"; 79 if (protocol & PROT_UDPv4 ) return "udp";
67 if (protocol & PROT_TCPv4 ) return "tcp"; 80 if (protocol & PROT_TCPv4 ) return "tcp";
81 if (protocol & PROT_DNSv4 ) return "dns";
68 82
69 return "<unknown>"; 83 return "<unknown>";
70} 84}
71 85
72void 86static bool
73conf_node::print () 87match_list (const vector<const char *> &list, const char *str)
74{ 88{
75 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 89 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
76 id, 90 if ((*i)[0] == '*' && !(*i)[1])
77 id >> 8, id & 0xff, 91 return true;
78 compress ? 'Y' : 'N', 92 else if (!strcmp (*i, str))
79 connectmode == C_ONDEMAND ? "ondemand" : 93 return true;
80 connectmode == C_NEVER ? "never" : 94
81 connectmode == C_ALWAYS ? "always" : "", 95 return false;
82 nodename, 96}
83 hostname ? hostname : "", 97
84 hostname ? ":" : "", 98bool
85 hostname ? udp_port : 0 99conf_node::may_direct (struct conf_node *other)
86 ); 100{
101 if (match_list (allow_direct, other->nodename))
102 return true;
103
104 if (match_list (deny_direct, other->nodename))
105 return false;
106
107 return true;
87} 108}
88 109
89conf_node::~conf_node () 110conf_node::~conf_node ()
90{ 111{
112#if 0
113 // does not work, because string pointers etc. are shared
114 // is not called, however
91 if (rsa_key) 115 if (rsa_key)
92 RSA_free (rsa_key); 116 RSA_free (rsa_key);
93 117
94 free (nodename); 118 free (nodename);
95 free (hostname); 119 free (hostname);
120 free (if_up_data);
121#if ENABLE_DNS
122 free (domain);
123 free (dns_hostname);
124#endif
125#endif
96} 126}
97 127
128void
98void configuration::init () 129configuration::init ()
99{ 130{
100 memset (this, 0, sizeof (*this)); 131 memset (this, 0, sizeof (*this));
101 132
102 mtu = DEFAULT_MTU; 133 mtu = DEFAULT_MTU;
134 nfmark = 0;
103 rekey = DEFAULT_REKEY; 135 rekey = DEFAULT_REKEY;
104 keepalive = DEFAULT_KEEPALIVE; 136 keepalive = DEFAULT_KEEPALIVE;
105 llevel = L_INFO; 137 llevel = L_INFO;
106 ip_proto = IPPROTO_GRE; 138 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP 139#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 140 icmp_type = ICMP_ECHOREPLY;
109#endif 141#endif
110 142
111 default_node.udp_port = DEFAULT_UDPPORT; 143 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 144 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 145 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 146 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 147 default_node.protocols = 0;
116} 148 default_node.max_retry = DEFAULT_MAX_RETRY;
149 default_node.max_ttl = DEFAULT_MAX_TTL;
150 default_node.max_queue = DEFAULT_MAX_QUEUE;
151 default_node.if_up_data = strdup ("");
117 152
153#if ENABLE_DNS
154 default_node.dns_port = 0; // default is 0 == client
155
156 dns_case_preserving = true;
157 dns_forw_host = strdup ("127.0.0.1");
158 dns_forw_port = 53;
159 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
160 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
161 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
162 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
163#endif
164
165 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
166}
167
168void
118void configuration::cleanup() 169configuration::cleanup ()
119{ 170{
120 if (rsa_key) 171 if (rsa_key)
121 RSA_free (rsa_key); 172 RSA_free (rsa_key);
122 173
123 rsa_key = 0; 174 rsa_key = 0;
124 175
125 free (ifname); ifname = 0; 176 free (pidfilename); pidfilename = 0;
177 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 178#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 179 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 180 free (proxy_auth); proxy_auth = 0;
129#endif 181#endif
182#if ENABLE_DNS
183 free (dns_forw_host); dns_forw_host = 0;
184#endif
185 free (script_if_up); script_if_up = 0;
186 free (script_node_up); script_node_up = 0;
187 free (script_node_change); script_node_change = 0;
188 free (script_node_down); script_node_down = 0;
130} 189}
131 190
132void 191void
133configuration::clear_config () 192configuration::clear ()
134{ 193{
135 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 194 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
136 delete *i; 195 delete *i;
137 196
138 nodes.clear (); 197 nodes.clear ();
139 198
140 cleanup (); 199 cleanup ();
141 init (); 200 init ();
142} 201}
143 202
203//static bool
204//is_true (const char *name)
205//{
206 //re
207//}
208
144#define parse_bool(target,name,trueval,falseval) \ 209#define parse_bool(target,name,trueval,falseval) do { \
145 if (!strcmp (val, "yes")) target = trueval; \ 210 if (!strcmp (val, "yes")) target = trueval; \
146 else if (!strcmp (val, "no")) target = falseval; \ 211 else if (!strcmp (val, "no")) target = falseval; \
147 else if (!strcmp (val, "true")) target = trueval; \ 212 else if (!strcmp (val, "true")) target = trueval; \
148 else if (!strcmp (val, "false")) target = falseval; \ 213 else if (!strcmp (val, "false")) target = falseval; \
149 else if (!strcmp (val, "on")) target = trueval; \ 214 else if (!strcmp (val, "on")) target = trueval; \
150 else if (!strcmp (val, "off")) target = falseval; \ 215 else if (!strcmp (val, "off")) target = falseval; \
151 else \ 216 else \
152 slog (L_WARN, \
153 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 217 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
154 name, var, fname, lineno); 218} while (0)
155 219
156void configuration::read_config (bool need_keys) 220const char *
221configuration_parser::parse_line (char *line)
157{ 222{
223 {
224 char *end = line + strlen (line);
225
226 while (*end < ' ' && end >= line)
227 end--;
228
229 *++end = 0;
230 }
231
232 char *tok = line;
233 const char *var = strtok (tok, "\t =");
234 tok = 0;
235
236 if (!var || !var[0])
237 return 0; /* no tokens on this line */
238
239 if (var[0] == '#')
240 return 0; /* comment: ignore */
241
242 char *val = strtok (NULL, "\t\n\r =");
243
244 if (!val || val[0] == '#')
245 return _("no value given for variable, ignored");
246
247 else if (!strcmp (var, "on"))
248 {
249 if (::thisnode
250 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
251 || !strcmp (val, ::thisnode)))
252 return parse_line (strtok (NULL, "\n\r"));
253 }
254
255 else if (!strcmp (var, "include"))
256 {
257 char *fname = conf.config_filename (val);
258 parse_file (fname);
259 free (fname);
260 }
261
262 // truly global
263 else if (!strcmp (var, "loglevel"))
264 {
265 loglevel l = string_to_loglevel (val);
266
267 if (l == L_NONE)
268 return _("unknown loglevel, ignored");
269 }
270 else if (!strcmp (var, "ip-proto"))
271 conf.ip_proto = atoi (val);
272 else if (!strcmp (var, "icmp-type"))
273 {
274#if ENABLE_ICMP
275 conf.icmp_type = atoi (val);
276#endif
277 }
278
279 // per config
280 else if (!strcmp (var, "node"))
281 {
282 parse_argv ();
283
284 conf.default_node.id++;
285 node = new conf_node (conf.default_node);
286 conf.nodes.push_back (node);
287 node->nodename = strdup (val);
288
289 {
158 char *fname; 290 char *fname;
159 FILE *f; 291 FILE *f;
160 292
161 clear_config (); 293 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
162 294
163 asprintf (&fname, "%s/vped.conf", confbase);
164 f = fopen (fname, "r"); 295 f = fopen (fname, "r");
296 if (f)
297 {
298 node->rsa_key = RSA_new ();
165 299
166 if (f) 300 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
301 {
302 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
303 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
304 exit (EXIT_FAILURE);
305 }
306
307 require (RSA_blinding_on (node->rsa_key, 0));
308
309 fclose (f);
310 }
311 else
312 {
313 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
314
315 if (need_keys)
316 exit (EXIT_FAILURE);
317 }
318
319 free (fname);
320 }
321
322 if (::thisnode && !strcmp (node->nodename, ::thisnode))
323 conf.thisnode = node;
167 { 324 }
325 else if (!strcmp (var, "private-key"))
326 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
327 else if (!strcmp (var, "ifpersist"))
328 parse_bool (conf.ifpersist, "ifpersist", true, false);
329 else if (!strcmp (var, "ifname"))
330 free (conf.ifname), conf.ifname = strdup (val);
331 else if (!strcmp (var, "rekey"))
332 conf.rekey = atoi (val);
333 else if (!strcmp (var, "keepalive"))
334 conf.keepalive = atoi (val);
335 else if (!strcmp (var, "mtu"))
336 conf.mtu = atoi (val);
337 else if (!strcmp (var, "nfmark"))
338 conf.nfmark = atoi (val);
339 else if (!strcmp (var, "if-up"))
340 free (conf.script_if_up), conf.script_if_up = strdup (val);
341 else if (!strcmp (var, "node-up"))
342 free (conf.script_node_up), conf.script_node_up = strdup (val);
343 else if (!strcmp (var, "node-change"))
344 free (conf.script_node_change), conf.script_node_change = strdup (val);
345 else if (!strcmp (var, "node-down"))
346 free (conf.script_node_down), conf.script_node_down = strdup (val);
347 else if (!strcmp (var, "pid-file"))
348 free (conf.pidfilename), conf.pidfilename = strdup (val);
349 else if (!strcmp (var, "dns-forw-host"))
350 {
351#if ENABLE_DNS
352 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
353#endif
354 }
355 else if (!strcmp (var, "dns-forw-port"))
356 {
357#if ENABLE_DNS
358 conf.dns_forw_port = atoi (val);
359#endif
360 }
361 else if (!strcmp (var, "dns-timeout-factor"))
362 {
363#if ENABLE_DNS
364 conf.dns_timeout_factor = atof (val);
365#endif
366 }
367 else if (!strcmp (var, "dns-send-interval"))
368 {
369#if ENABLE_DNS
370 conf.dns_send_interval = atoi (val);
371#endif
372 }
373 else if (!strcmp (var, "dns-overlap-factor"))
374 {
375#if ENABLE_DNS
376 conf.dns_overlap_factor = atof (val);
377#endif
378 }
379 else if (!strcmp (var, "dns-max-outstanding"))
380 {
381#if ENABLE_DNS
382 conf.dns_max_outstanding = atoi (val);
383#endif
384 }
385 else if (!strcmp (var, "dns-case-preserving"))
386 {
387#if ENABLE_DNS
388 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
389#endif
390 }
391 else if (!strcmp (var, "http-proxy-host"))
392 {
393#if ENABLE_HTTP_PROXY
394 free (conf.proxy_host), conf.proxy_host = strdup (val);
395#endif
396 }
397 else if (!strcmp (var, "http-proxy-port"))
398 {
399#if ENABLE_HTTP_PROXY
400 conf.proxy_port = atoi (val);
401#endif
402 }
403 else if (!strcmp (var, "http-proxy-auth"))
404 {
405#if ENABLE_HTTP_PROXY
406 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
407#endif
408 }
409
410 /* node-specific, non-defaultable */
411 else if (node != &conf.default_node && !strcmp (var, "hostname"))
412 free (node->hostname), node->hostname = strdup (val);
413
414 /* node-specific, defaultable */
415 else if (!strcmp (var, "udp-port"))
416 node->udp_port = atoi (val);
417 else if (!strcmp (var, "tcp-port"))
418 node->tcp_port = atoi (val);
419 else if (!strcmp (var, "dns-hostname"))
420 {
421#if ENABLE_DNS
422 free (node->dns_hostname), node->dns_hostname = strdup (val);
423#endif
424 }
425 else if (!strcmp (var, "dns-port"))
426 {
427#if ENABLE_DNS
428 node->dns_port = atoi (val);
429#endif
430 }
431 else if (!strcmp (var, "dns-domain"))
432 {
433#if ENABLE_DNS
434 free (node->domain), node->domain = strdup (val);
435#endif
436 }
437 else if (!strcmp (var, "if-up-data"))
438 free (node->if_up_data), node->if_up_data = strdup (val);
439 else if (!strcmp (var, "router-priority"))
440 node->routerprio = atoi (val);
441 else if (!strcmp (var, "max-retry"))
442 node->max_retry = atoi (val);
443 else if (!strcmp (var, "connect"))
444 {
445 if (!strcmp (val, "ondemand"))
446 node->connectmode = conf_node::C_ONDEMAND;
447 else if (!strcmp (val, "never"))
448 node->connectmode = conf_node::C_NEVER;
449 else if (!strcmp (val, "always"))
450 node->connectmode = conf_node::C_ALWAYS;
451 else if (!strcmp (val, "disabled"))
452 node->connectmode = conf_node::C_DISABLED;
453 else
454 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
455 }
456 else if (!strcmp (var, "inherit-tos"))
457 parse_bool (node->inherit_tos, "inherit-tos", true, false);
458 else if (!strcmp (var, "compress"))
459 parse_bool (node->compress, "compress", true, false);
460 // all these bool options really really cost a lot of executable size!
461 else if (!strcmp (var, "enable-tcp"))
462 {
463#if ENABLE_TCP
464 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
465#endif
466 }
467 else if (!strcmp (var, "enable-icmp"))
468 {
469#if ENABLE_ICMP
470 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
471#endif
472 }
473 else if (!strcmp (var, "enable-dns"))
474 {
475#if ENABLE_DNS
476 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
477#endif
478 }
479 else if (!strcmp (var, "enable-udp"))
480 {
481 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
482 }
483 else if (!strcmp (var, "enable-rawip"))
484 {
485 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
486 }
487 else if (!strcmp (var, "allow-direct"))
488 node->allow_direct.push_back (strdup (val));
489 else if (!strcmp (var, "deny-direct"))
490 node->deny_direct.push_back (strdup (val));
491 else if (!strcmp (var, "max-ttl"))
492 node->max_ttl = atof (val);
493 else if (!strcmp (var, "max-queue"))
494 node->max_queue = atoi (val);
495
496 // unknown or misplaced
497 else
498 return _("unknown configuration directive - ignored");
499
500 return 0;
501}
502
503void
504conf_node::finalise ()
505{
506 if (max_queue < 1)
507 {
508 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
509 max_queue = 1;
510 }
511
512 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
513 {
514 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
515 connectmode = C_ALWAYS;
516 }
517}
518
519void
520configuration_parser::parse_argv ()
521{
522 for (int i = 0; i < argc; ++i)
523 {
524 char *v = argv [i];
525
526 if (!*v)
527 continue;
528
529 char *enode = v;
530
531 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
532 enode++;
533
534 if (*enode != '.')
535 enode = 0;
536
537 char *wnode = node == &conf.default_node
538 ? 0
539 : node->nodename;
540
541 if ((!wnode && !enode)
542 || (wnode && enode && !strncmp (wnode, v, enode - v)))
543 {
544 const char *warn = parse_line (enode ? enode + 1 : v);
545
546 if (warn)
547 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
548
549 *v = 0;
550 }
551 }
552}
553
554void
555configuration_parser::parse_file (const char *fname)
556{
557 if (FILE *f = fopen (fname, "r"))
558 {
168 char line[16384]; 559 char line [2048];
169 int lineno = 0; 560 int lineno = 0;
170 char *var, *val;
171 conf_node *node = &default_node;
172 561
173 while (fgets (line, sizeof (line), f)) 562 while (fgets (line, sizeof (line), f))
174 { 563 {
175 lineno++; 564 lineno++;
176 565
177 { 566 const char *warn = parse_line (line);
178 char *end = line + strlen (line);
179 567
180 while (*end < ' ' && end >= line) 568 if (warn)
181 end--; 569 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 } 570 }
377 571
378 fclose (f); 572 fclose (f);
573
574 parse_argv ();
379 } 575 }
380 else 576 else
381 { 577 {
382 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 578 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
383 exit (1); 579 exit (EXIT_FAILURE);
384 } 580 }
581}
385 582
583configuration_parser::configuration_parser (configuration &conf,
584 bool need_keys,
585 int argc,
586 char **argv)
587: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
588{
589 char *fname;
590
591 conf.clear ();
592 node = &conf.default_node;
593
594 asprintf (&fname, "%s/gvpe.conf", confbase);
595 parse_file (fname);
386 free (fname); 596 free (fname);
387 597
388 fname = config_filename (prikeyfile, "hostkey"); 598 fname = conf.config_filename (conf.prikeyfile, "hostkey");
389 599
390 f = fopen (fname, "r"); 600 if (FILE *f = fopen (fname, "r"))
391 if (f)
392 { 601 {
393 rsa_key = RSA_new (); 602 conf.rsa_key = RSA_new ();
394 603
395 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 604 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
396 { 605 {
397 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 606 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)); 607 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
399 exit (1); 608 exit (EXIT_FAILURE);
400 } 609 }
401 610
402 RSA_blinding_on (rsa_key, 0); 611 require (RSA_blinding_on (conf.rsa_key, 0));
403 612
404 fclose (f); 613 fclose (f);
405 } 614 }
406 else 615 else
407 { 616 {
408 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 617 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
409 618
410 if (need_keys) 619 if (need_keys)
411 exit (1); 620 exit (EXIT_FAILURE);
412 } 621 }
413 622
414 free (fname); 623 free (fname);
415}
416 624
625 if (need_keys && ::thisnode
626 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
627 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
628 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
629 {
630 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
631 exit (EXIT_FAILURE);
632 }
633
634 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
635 (*i)->finalise ();
636}
637
638char *
417char *configuration::config_filename (const char *name, const char *dflt) 639configuration::config_filename (const char *name, const char *dflt)
418{ 640{
419 char *fname; 641 char *fname;
420 642
421 asprintf (&fname, name ? name : dflt, ::thisnode); 643 asprintf (&fname, name ? name : dflt, ::thisnode);
422 644
426 asprintf (&fname, "%s/%s", confbase, rname); 648 asprintf (&fname, "%s/%s", confbase, rname);
427 free (rname); 649 free (rname);
428 } 650 }
429 651
430 return fname; 652 return fname;
653}
654
655void
656conf_node::print ()
657{
658 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
659 id,
660 id >> 8, id & 0xff,
661 compress ? 'Y' : 'N',
662 connectmode == C_ONDEMAND ? "ondemand"
663 : connectmode == C_NEVER ? "never"
664 : connectmode == C_ALWAYS ? "always"
665 : connectmode == C_DISABLED ? "disabled"
666 : "",
667 nodename,
668 protocols,
669 hostname ? hostname : "",
670 hostname ? ":" : "",
671 hostname ? udp_port : 0
672 );
431} 673}
432 674
433void 675void
434configuration::print () 676configuration::print ()
435{ 677{
442 printf (_("interface: %s\n"), ifname); 684 printf (_("interface: %s\n"), ifname);
443 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 685 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
444 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 686 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
445 printf ("\n"); 687 printf ("\n");
446 688
447 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 689 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
448 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 690 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
449 691
450 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 692 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
451 (*i)->print (); 693 (*i)->print ();
452 694
453 printf ("\n"); 695 printf ("\n");
454} 696}
455 697
456configuration::configuration () 698configuration::configuration ()
457{ 699{
700 asprintf (&confbase, "%s/gvpe", CONFDIR);
701
458 init (); 702 init ();
459} 703}
460 704
461configuration::~configuration () 705configuration::~configuration ()
462{ 706{
463 cleanup (); 707 cleanup ();
464} 708}
465 709
466

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines