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

Diff Legend

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