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.2 by pcg, Thu Mar 6 18:43:07 2003 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) 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 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"));
111 { 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 {
112 char line[16384]; 527 char line [2048];
113 int lineno = 0; 528 int lineno = 0;
114 char *var, *val;
115 conf_node *node = &default_node;
116 529
117 while (fgets (line, sizeof (line), f)) 530 while (fgets (line, sizeof (line), f))
118 { 531 {
119 lineno++; 532 lineno++;
120 533
121 { 534 const char *warn = parse_line (line);
122 char *end = line + strlen (line);
123 535
124 while (*end < ' ' && end >= line) 536 if (warn)
125 end--; 537 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, "port"))
257 node->port = atoi (val);
258 else if (!strcmp (var, "router-priority"))
259 node->routerprio = atoi (val);
260 else if (!strcmp (var, "connect"))
261 {
262 if (!strcmp (val, "ondemand"))
263 node->connectmode = conf_node::C_ONDEMAND;
264 else if (!strcmp (val, "never"))
265 node->connectmode = conf_node::C_NEVER;
266 else if (!strcmp (val, "always"))
267 node->connectmode = conf_node::C_ALWAYS;
268 else
269 slog (L_WARN,
270 _("illegal value for 'connectmode', use one of 'ondemand', 'never' or 'always', at '%s' line %d"),
271 var, fname, lineno);
272 }
273 else if (!strcmp (var, "compress"))
274 {
275 if (!strcmp (val, "yes"))
276 node->compress = true;
277 else if (!strcmp (val, "no"))
278 node->compress = false;
279 else
280 slog (L_WARN,
281 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
282 var, fname, lineno);
283 }
284
285 // unknown or misplaced
286 else
287 {
288 slog (L_WARN,
289 _("unknown or misplaced variable `%s', at '%s' line %d"),
290 var, fname, lineno);
291 }
292 } 538 }
293 539
294 fclose (f); 540 fclose (f);
295 } 541 }
296 else 542 else
297 { 543 {
298 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));
299 exit (1); 545 exit (EXIT_FAILURE);
300 } 546 }
547}
301 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);
302 free (fname); 562 free (fname);
303 563
304 fname = config_filename (prikeyfile, "hostkey"); 564 fname = conf.config_filename (conf.prikeyfile, "hostkey");
305 565
306 f = fopen (fname, "r"); 566 if (FILE *f = fopen (fname, "r"))
307 if (f)
308 { 567 {
309 rsa_key = RSA_new (); 568 conf.rsa_key = RSA_new ();
310 569
311 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 570 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
312 { 571 {
313 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 572 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
314 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));
315 exit (1); 574 exit (EXIT_FAILURE);
316 } 575 }
317 576
318 RSA_blinding_on (rsa_key, 0); 577 require (RSA_blinding_on (conf.rsa_key, 0));
319 578
320 fclose (f); 579 fclose (f);
321 } 580 }
322 else 581 else
323 { 582 {
324 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
325
326 if (need_keys) 583 if (need_keys)
327 exit (1); 584 {
585 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
586 exit (EXIT_FAILURE);
587 }
328 } 588 }
329 589
330 free (fname); 590 free (fname);
331}
332 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 *
333char *configuration::config_filename (const char *name, const char *dflt) 699configuration::config_filename (const char *name, const char *dflt)
334{ 700{
335 char *fname; 701 char *fname;
336 702
337 asprintf (&fname, name ? name : dflt, ::thisnode); 703 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
338 704
339 if (!ABSOLUTE_PATH (fname)) 705 if (!ABSOLUTE_PATH (fname))
340 { 706 {
341 char *rname = fname; 707 char *rname = fname;
342 asprintf (&fname, "%s/%s", confbase, rname); 708 asprintf (&fname, "%s/%s", confbase, rname);
343 free (rname); 709 free (rname);
344 } 710 }
345 711
346 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 );
347} 733}
348 734
349void 735void
350configuration::print () 736configuration::print ()
351{ 737{
… …
355 printf (_("MTU: %d\n"), mtu); 741 printf (_("MTU: %d\n"), mtu);
356 printf (_("rekeying interval: %d\n"), rekey); 742 printf (_("rekeying interval: %d\n"), rekey);
357 printf (_("keepalive interval: %d\n"), keepalive); 743 printf (_("keepalive interval: %d\n"), keepalive);
358 printf (_("interface: %s\n"), ifname); 744 printf (_("interface: %s\n"), ifname);
359 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 745 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
360 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 746 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
361 printf ("\n"); 747 printf ("\n");
362 748
363 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 749 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
364 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 750 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
365 751
366 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 752 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
367 (*i)->print (); 753 (*i)->print ();
368 754
369 printf ("\n"); 755 printf ("\n");
370} 756}
371 757
372void 758configuration::configuration ()
373conf_node::print ()
374{ 759{
375 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 760 asprintf (&confbase, "%s/gvpe", CONFDIR);
376 id,
377 id >> 8, id & 0xff,
378 compress ? 'Y' : 'N',
379 connectmode == C_ONDEMAND ? "ondemand" :
380 connectmode == C_NEVER ? "never" :
381 connectmode == C_ALWAYS ? "always" : "",
382 nodename,
383 hostname ? hostname : "",
384 hostname ? ":" : "",
385 hostname ? port : 0
386 );
387}
388 761
762 init ();
763}
764
765configuration::~configuration ()
766{
767 cleanup ();
768}
769

Diff Legend

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