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.32 by pcg, Sat Mar 5 15:48:54 2005 UTC vs.
Revision 1.64 by root, Thu Jul 18 17:35:10 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines