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.4 by pcg, Sun Mar 23 14:49:16 2003 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) 1998 Robert van der Meulen 3 Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
5 This file is part of GVPE.
6
9 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
10 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
11 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
12 (at your option) any later version. 10 option) any later version.
13 11
14 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
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
17 GNU General Public License for more details. 15 Public License for more details.
18 16
19 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
20 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
21 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.
22*/ 30*/
23 31
24#include "config.h" 32#include "config.h"
25 33
26#include <cstdio> 34#include <cstdio>
… …
30#include <errno.h> 38#include <errno.h>
31#include <netdb.h> 39#include <netdb.h>
32#include <sys/stat.h> 40#include <sys/stat.h>
33#include <sys/types.h> 41#include <sys/types.h>
34#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
44
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 51#include <openssl/bn.h>
41#include "gettext.h"
42 52
43#include "conf.h" 53#include "conf.h"
44#include "slog.h" 54#include "slog.h"
45#include "util.h" 55#include "util.h"
46 56
47char *confbase; 57char *confbase;
48char *thisnode; 58char *thisnode;
49char *identname; 59char *identname;
50char *pidfilename;
51 60
52struct configuration conf; 61struct configuration conf;
53 62
54configuration::configuration () 63u8
64best_protocol (u8 protset)
55{ 65{
56 init (); 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
57} 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 71
59configuration::~configuration () 72 return 0;
60{
61 cleanup ();
62} 73}
63 74
75const char *
76strprotocol (u8 protocol)
77{
78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
80 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp";
82 if (protocol & PROT_DNSv4 ) return "dns";
83
84 return "<unknown>";
85}
86
87static bool
88match_list (const vector<const char *> &list, const char *str)
89{
90 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
91 if ((*i)[0] == '*' && !(*i)[1])
92 return true;
93 else if (!strcmp (*i, str))
94 return true;
95
96 return false;
97}
98
99bool
100conf_node::may_direct (struct conf_node *other)
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;
109}
110
111conf_node::~conf_node ()
112{
113#if 0
114 // does not work, because string pointers etc. are shared
115 // is not called, however
116 if (rsa_key)
117 RSA_free (rsa_key);
118
119 free (nodename);
120 free (hostname);
121 free (if_up_data);
122#if ENABLE_DNS
123 free (domain);
124 free (dns_hostname);
125#endif
126#endif
127}
128
129void
64void configuration::init () 130configuration::init ()
65{ 131{
66 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
67 133
134 mtu = DEFAULT_MTU;
135 nfmark = 0;
68 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 138 llevel = L_INFO;
139 ip_proto = IPPROTO_GRE;
140#if ENABLE_ICMP
141 icmp_type = ICMP_ECHOREPLY;
142#endif
71 143
72 default_node.port = DEFAULT_PORT; 144 default_node.udp_port = DEFAULT_UDPPORT;
145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 147 default_node.compress = true;
75} 148 default_node.protocols = 0;
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 ("");
76 153
154#if ENABLE_DNS
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");
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;
164#endif
165
166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
169}
170
171void
77void configuration::cleanup() 172configuration::cleanup ()
78{ 173{
79 if (rsa_key) 174 if (rsa_key)
80 RSA_free (rsa_key); 175 RSA_free (rsa_key);
81 176
82 free (ifname);
83
84 rsa_key = 0; 177 rsa_key = 0;
85 ifname = 0; 178
179 free (seed_dev); seed_dev = 0;
180 free (pidfilename); pidfilename = 0;
181 free (ifname); ifname = 0;
182#if ENABLE_HTTP_PROXY
183 free (proxy_host); proxy_host = 0;
184 free (proxy_auth); proxy_auth = 0;
185#endif
186#if ENABLE_DNS
187 free (dns_forw_host); dns_forw_host = 0;
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;
86} 194}
87 195
88void 196void
89configuration::clear_config () 197configuration::clear ()
90{ 198{
91 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)
92 delete *i; 200 delete *i;
93 201
94 nodes.clear (); 202 nodes.clear ();
95 203
96 cleanup (); 204 cleanup ();
97 init (); 205 init ();
98} 206}
99 207
100void configuration::read_config (bool need_keys) 208conf_node *
209configuration::find_node (const char *name)
101{ 210{
102 char *fname; 211 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
103 FILE *f; 212 if (!strcmp ((*i)->nodename, name))
213 return *i;
104 214
105 clear_config (); 215 return 0;
216}
106 217
107 asprintf (&fname, "%s/vped.conf", confbase); 218//static bool
108 f = fopen (fname, "r"); 219//is_true (const char *name)
220//{
221 //re
222//}
109 223
110 if (f) 224#define parse_bool(target,name,trueval,falseval) do { \
225 if (!strcmp (val, "yes")) target = trueval; \
226 else if (!strcmp (val, "no")) target = falseval; \
227 else if (!strcmp (val, "true")) target = trueval; \
228 else if (!strcmp (val, "false")) target = falseval; \
229 else if (!strcmp (val, "on")) target = trueval; \
230 else if (!strcmp (val, "off")) target = falseval; \
231 else \
232 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
233} while (0)
234
235const char *
236configuration_parser::parse_line (char *line)
237{
238 {
239 char *end = line + strlen (line);
240
241 while (*end < ' ' && end >= line)
242 end--;
243
244 *++end = 0;
245 }
246
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;
111 { 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 {
112 char line[16384]; 533 char line [2048];
113 int lineno = 0; 534 int lineno = 0;
114 char *var, *val;
115 conf_node *node = &default_node;
116 535
117 while (fgets (line, sizeof (line), f)) 536 while (fgets (line, sizeof (line), f))
118 { 537 {
119 lineno++; 538 lineno++;
120 539
121 { 540 const char *warn = parse_line (line);
122 char *end = line + strlen (line);
123 541
124 while (*end < ' ' && end >= line) 542 if (warn)
125 end--; 543 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
126
127 *++end = 0;
128 }
129
130 char *tok = line;
131
132retry:
133 var = strtok (tok, "\t =");
134 tok = 0;
135
136 if (!var || !var[0])
137 continue; /* no tokens on this line */
138
139 if (var[0] == '#')
140 continue; /* comment: ignore */
141
142 val = strtok (NULL, "\t\n\r =");
143
144 if (!val || val[0] == '#')
145 {
146 slog (L_WARN,
147 _("no value for variable `%s', at '%s' line %d"),
148 var, fname, lineno);
149 break;
150 }
151
152 if (!strcmp (var, "on"))
153 {
154 if (!::thisnode
155 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
156 || !strcmp (val, ::thisnode))
157 goto retry;
158
159 continue;
160 }
161
162 // truly global
163 if (!strcmp (var, "loglevel"))
164 {
165 loglevel l = string_to_loglevel (val);
166
167 if (l != L_NONE)
168 llevel = l;
169 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 }
172
173 // per config
174 else if (!strcmp (var, "node"))
175 {
176 default_node.id++;
177
178 node = new conf_node (default_node);
179
180 nodes.push_back (node);
181
182 node->nodename = strdup (val);
183
184 {
185 char *fname;
186 FILE *f;
187
188 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
189
190 f = fopen (fname, "r");
191 if (f)
192 {
193 node->rsa_key = RSA_new ();
194
195 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196 {
197 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
198 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199 exit (1);
200 }
201
202 RSA_blinding_on (node->rsa_key, 0);
203
204 fclose (f);
205 }
206 else
207 {
208 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209
210 if (need_keys)
211 exit (1);
212 }
213
214 free (fname);
215 }
216
217 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
218 thisnode = node;
219 }
220 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist"))
223 {
224 if (!strcmp (val, "yes"))
225 ifpersist = true;
226 else if (!strcmp (val, "no"))
227 ifpersist = false;
228 else
229 slog (L_WARN,
230 _("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231 var, fname, lineno);
232 }
233 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val);
235 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val);
237 else if (!strcmp (var, "keepalive"))
238 keepalive = atoi (val);
239 else if (!strcmp (var, "mtu"))
240 mtu = atoi (val);
241 else if (!strcmp (var, "if-up"))
242 script_if_up = strdup (val);
243 else if (!strcmp (var, "node-up"))
244 script_node_up = strdup (val);
245 else if (!strcmp (var, "node-down"))
246 script_node_down = strdup (val);
247
248 /* node-specific, non-defaultable */
249 else if (node != &default_node && !strcmp (var, "hostname"))
250 {
251 free (node->hostname);
252 node->hostname = strdup (val);
253 }
254
255 /* node-specific, defaultable */
256 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val);
258 else if (!strcmp (var, "port")) //deprecated
259 node->port = atoi (val);
260 else if (!strcmp (var, "router-priority"))
261 node->routerprio = atoi (val);
262 else if (!strcmp (var, "connect"))
263 {
264 if (!strcmp (val, "ondemand"))
265 node->connectmode = conf_node::C_ONDEMAND;
266 else if (!strcmp (val, "never"))
267 node->connectmode = conf_node::C_NEVER;
268 else if (!strcmp (val, "always"))
269 node->connectmode = conf_node::C_ALWAYS;
270 else if (!strcmp (val, "disabled"))
271 node->connectmode = conf_node::C_DISABLED;
272 else
273 slog (L_WARN,
274 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275 var, fname, lineno);
276 }
277 else if (!strcmp (var, "inherit-tos"))
278 {
279 if (!strcmp (val, "yes"))
280 node->inherit_tos = true;
281 else if (!strcmp (val, "no"))
282 node->inherit_tos = false;
283 else
284 slog (L_WARN,
285 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286 var, fname, lineno);
287 }
288
289 else if (!strcmp (var, "compress"))
290 {
291 if (!strcmp (val, "yes"))
292 node->compress = true;
293 else if (!strcmp (val, "no"))
294 node->compress = false;
295 else
296 slog (L_WARN,
297 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
298 var, fname, lineno);
299 }
300
301 // unknown or misplaced
302 else
303 {
304 slog (L_WARN,
305 _("unknown or misplaced variable `%s', at '%s' line %d"),
306 var, fname, lineno);
307 }
308 } 544 }
309 545
310 fclose (f); 546 fclose (f);
311 } 547 }
312 else 548 else
313 { 549 {
314 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));
315 exit (1); 551 exit (EXIT_FAILURE);
316 } 552 }
553}
317 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);
318 free (fname); 568 free (fname);
319 569
320 fname = config_filename (prikeyfile, "hostkey"); 570 fname = conf.config_filename (conf.prikeyfile, "hostkey");
321 571
322 f = fopen (fname, "r"); 572 if (FILE *f = fopen (fname, "r"))
323 if (f)
324 { 573 {
325 rsa_key = RSA_new (); 574 conf.rsa_key = RSA_new ();
326 575
327 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 576 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
328 { 577 {
329 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 578 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
330 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));
331 exit (1); 580 exit (EXIT_FAILURE);
332 } 581 }
333 582
334 RSA_blinding_on (rsa_key, 0); 583 require (RSA_blinding_on (conf.rsa_key, 0));
335 584
336 fclose (f); 585 fclose (f);
337 } 586 }
338 else 587 else
339 { 588 {
340 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341
342 if (need_keys) 589 if (need_keys)
343 exit (1); 590 {
591 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
592 exit (EXIT_FAILURE);
593 }
344 } 594 }
345 595
346 free (fname); 596 free (fname);
347}
348 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 *
349char *configuration::config_filename (const char *name, const char *dflt) 705configuration::config_filename (const char *name, const char *dflt)
350{ 706{
351 char *fname; 707 char *fname;
352 708
353 asprintf (&fname, name ? name : dflt, ::thisnode); 709 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
354 710
355 if (!ABSOLUTE_PATH (fname)) 711 if (!ABSOLUTE_PATH (fname))
356 { 712 {
357 char *rname = fname; 713 char *rname = fname;
358 asprintf (&fname, "%s/%s", confbase, rname); 714 asprintf (&fname, "%s/%s", confbase, rname);
359 free (rname); 715 free (rname);
360 } 716 }
361 717
362 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 );
363} 739}
364 740
365void 741void
366configuration::print () 742configuration::print ()
367{ 743{
… …
371 printf (_("MTU: %d\n"), mtu); 747 printf (_("MTU: %d\n"), mtu);
372 printf (_("rekeying interval: %d\n"), rekey); 748 printf (_("rekeying interval: %d\n"), rekey);
373 printf (_("keepalive interval: %d\n"), keepalive); 749 printf (_("keepalive interval: %d\n"), keepalive);
374 printf (_("interface: %s\n"), ifname); 750 printf (_("interface: %s\n"), ifname);
375 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 751 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 752 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377 printf ("\n"); 753 printf ("\n");
378 754
379 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 755 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
380 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 756 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
381 757
382 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 758 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
383 (*i)->print (); 759 (*i)->print ();
384 760
385 printf ("\n"); 761 printf ("\n");
386} 762}
387 763
388void 764configuration::configuration ()
389conf_node::print ()
390{ 765{
391 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 766 asprintf (&confbase, "%s/gvpe", CONFDIR);
392 id,
393 id >> 8, id & 0xff,
394 compress ? 'Y' : 'N',
395 connectmode == C_ONDEMAND ? "ondemand" :
396 connectmode == C_NEVER ? "never" :
397 connectmode == C_ALWAYS ? "always" : "",
398 nodename,
399 hostname ? hostname : "",
400 hostname ? ":" : "",
401 hostname ? port : 0
402 );
403}
404 767
768 init ();
769}
770
771configuration::~configuration ()
772{
773 cleanup ();
774}
775

Diff Legend

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