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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines