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.12 by pcg, Mon Apr 7 01:12:56 2003 UTC vs.
Revision 1.41 by pcg, Tue Apr 26 00:55:55 2005 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-2005 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
10 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 10 (at your 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,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but 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
17 GNU General Public License for more details. 15 GNU General 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
20 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
21 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22*/ 20*/
23 21
24#include "config.h" 22#include "config.h"
25 23
26#include <cstdio> 24#include <cstdio>
… …
31#include <netdb.h> 29#include <netdb.h>
32#include <sys/stat.h> 30#include <sys/stat.h>
33#include <sys/types.h> 31#include <sys/types.h>
34#include <unistd.h> 32#include <unistd.h>
35 33
36#include <netinet/in.h> 34#include "netcompat.h"
37 35
38#include <openssl/err.h> 36#include <openssl/err.h>
39#include <openssl/pem.h> 37#include <openssl/pem.h>
40#include <openssl/rsa.h> 38#include <openssl/rsa.h>
41#include <openssl/rand.h> 39#include <openssl/rand.h>
42 40#include <openssl/bn.h>
43#include "gettext.h"
44 41
45#include "conf.h" 42#include "conf.h"
46#include "slog.h" 43#include "slog.h"
47#include "util.h" 44#include "util.h"
48 45
49char *confbase; 46char *confbase;
50char *thisnode; 47char *thisnode;
51char *identname; 48char *identname;
52char *pidfilename;
53 49
54struct configuration conf; 50struct configuration conf;
55 51
56u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
57{ 53{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
61 59
62 return 0; 60 return 0;
63} 61}
64 62
65const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
66{ 64{
67 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
70 70
71 return "<unknown>"; 71 return "<unknown>";
72} 72}
73 73
74void 74void
… …
88 ); 88 );
89} 89}
90 90
91conf_node::~conf_node () 91conf_node::~conf_node ()
92{ 92{
93#if 0
94 // does not work, because string pointers etc. are shared
95 // is not called, however
93 if (rsa_key) 96 if (rsa_key)
94 RSA_free (rsa_key); 97 RSA_free (rsa_key);
95 98
96 free (nodename); 99 free (nodename);
97 free (hostname); 100 free (hostname);
101 free (if_up_data);
102#if ENABLE_DNS
103 free (domain);
104 free (dns_hostname);
105#endif
106#endif
98} 107}
99 108
100void configuration::init () 109void configuration::init ()
101{ 110{
102 memset (this, 0, sizeof (*this)); 111 memset (this, 0, sizeof (*this));
103 112
113 mtu = DEFAULT_MTU;
104 rekey = DEFAULT_REKEY; 114 rekey = DEFAULT_REKEY;
105 keepalive = DEFAULT_KEEPALIVE; 115 keepalive = DEFAULT_KEEPALIVE;
106 llevel = L_INFO; 116 llevel = L_INFO;
107 ip_proto = IPPROTO_GRE; 117 ip_proto = IPPROTO_GRE;
118#if ENABLE_ICMP
119 icmp_type = ICMP_ECHOREPLY;
120#endif
108 121
109 default_node.udp_port = DEFAULT_UDPPORT; 122 default_node.udp_port = DEFAULT_UDPPORT;
110 default_node.tcp_port = DEFAULT_UDPPORT; 123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
111 default_node.connectmode = conf_node::C_ALWAYS; 124 default_node.connectmode = conf_node::C_ALWAYS;
112 default_node.compress = true; 125 default_node.compress = true;
113 default_node.protocols = PROT_UDPv4; 126 default_node.protocols = 0;
127 default_node.max_retry = DEFAULT_MAX_RETRY;
128 default_node.if_up_data = strdup ("");
129
130#if ENABLE_DNS
131 default_node.dns_port = 0; // default is 0 == client
132
133 dns_forw_host = strdup ("127.0.0.1");
134 dns_forw_port = 53;
135 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
139#endif
140
141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
114} 142}
115 143
116void configuration::cleanup() 144void configuration::cleanup()
117{ 145{
118 if (rsa_key) 146 if (rsa_key)
119 RSA_free (rsa_key); 147 RSA_free (rsa_key);
120 148
121 rsa_key = 0; 149 rsa_key = 0;
122 150
151 free (pidfilename); pidfilename = 0;
123 free (ifname); ifname = 0; 152 free (ifname); ifname = 0;
124#if ENABLE_HTTP_PROXY 153#if ENABLE_HTTP_PROXY
125 free (proxy_host); proxy_host = 0; 154 free (proxy_host); proxy_host = 0;
126 free (proxy_auth); proxy_auth = 0; 155 free (proxy_auth); proxy_auth = 0;
156#endif
157#if ENABLE_DNS
158 free (dns_forw_host); dns_forw_host = 0;
127#endif 159#endif
128} 160}
129 161
130void 162void
131configuration::clear_config () 163configuration::clear ()
132{ 164{
133 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 165 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
134 delete *i; 166 delete *i;
135 167
136 nodes.clear (); 168 nodes.clear ();
137 169
138 cleanup (); 170 cleanup ();
139 init (); 171 init ();
140} 172}
141 173
142#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
143 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
144 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
145 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
146 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
147 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
148 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
149 else \ 181 else \
150 slog (L_WARN, \ 182 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
151 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183} while (0)
152 name, var, fname, lineno);
153 184
154void configuration::read_config (bool need_keys) 185const char *
186configuration_parser::parse_line (char *line)
187{
188 {
189 char *end = line + strlen (line);
190
191 while (*end < ' ' && end >= line)
192 end--;
193
194 *++end = 0;
195 }
196
197 char *tok = line;
198 const char *var = strtok (tok, "\t =");
199 tok = 0;
200
201 if (!var || !var[0])
202 return 0; /* no tokens on this line */
203
204 if (var[0] == '#')
205 return 0; /* comment: ignore */
206
207 char *val = strtok (NULL, "\t\n\r =");
208
209 if (!val || val[0] == '#')
210 return _("no value given for variable. (ignored)");
211
212 if (!strcmp (var, "on"))
213 {
214 if (!::thisnode
215 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
216 || !strcmp (val, ::thisnode))
217 return parse_line (strtok (NULL, "\n\r"));
218 else
219 return 0;
220 }
221
222 // truly global
223 if (!strcmp (var, "loglevel"))
224 {
225 loglevel l = string_to_loglevel (val);
226
227 if (l == L_NONE)
228 return _("unknown loglevel. (skipping)");
229 }
230 else if (!strcmp (var, "ip-proto"))
231 conf.ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type"))
233 {
234#if ENABLE_ICMP
235 conf.icmp_type = atoi (val);
236#endif
237 }
238
239 // per config
240 else if (!strcmp (var, "node"))
241 {
242 parse_argv ();
243
244 conf.default_node.id++;
245 node = new conf_node (conf.default_node);
246 conf.nodes.push_back (node);
247 node->nodename = strdup (val);
248
249 {
250 char *fname;
251 FILE *f;
252
253 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254
255 f = fopen (fname, "r");
256 if (f)
257 {
258 node->rsa_key = RSA_new ();
259
260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261 {
262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264 exit (EXIT_FAILURE);
265 }
266
267 require (RSA_blinding_on (node->rsa_key, 0));
268
269 fclose (f);
270 }
271 else
272 {
273 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274
275 if (need_keys)
276 exit (EXIT_FAILURE);
277 }
278
279 free (fname);
280 }
281
282 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 conf.thisnode = node;
284 }
285 else if (!strcmp (var, "private-key"))
286 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist"))
288 parse_bool (conf.ifpersist, "ifpersist", true, false);
289 else if (!strcmp (var, "ifname"))
290 free (conf.ifname), conf.ifname = strdup (val);
291 else if (!strcmp (var, "rekey"))
292 conf.rekey = atoi (val);
293 else if (!strcmp (var, "keepalive"))
294 conf.keepalive = atoi (val);
295 else if (!strcmp (var, "mtu"))
296 conf.mtu = atoi (val);
297 else if (!strcmp (var, "if-up"))
298 free (conf.script_if_up), conf.script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up"))
300 free (conf.script_node_up), conf.script_node_up = strdup (val);
301 else if (!strcmp (var, "node-down"))
302 free (conf.script_node_down), conf.script_node_down = strdup (val);
303 else if (!strcmp (var, "pid-file"))
304 free (conf.pidfilename), conf.pidfilename = strdup (val);
305 else if (!strcmp (var, "dns-forw-host"))
306 {
307#if ENABLE_DNS
308 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
309#endif
310 }
311 else if (!strcmp (var, "dns-forw-port"))
312 {
313#if ENABLE_DNS
314 conf.dns_forw_port = atoi (val);
315#endif
316 }
317 else if (!strcmp (var, "dns-timeout-factor"))
318 {
319#if ENABLE_DNS
320 conf.dns_timeout_factor = atof (val);
321#endif
322 }
323 else if (!strcmp (var, "dns-send-interval"))
324 {
325#if ENABLE_DNS
326 conf.dns_send_interval = atoi (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-overlap-factor"))
330 {
331#if ENABLE_DNS
332 conf.dns_overlap_factor = atof (val);
333#endif
334 }
335 else if (!strcmp (var, "dns-max-outstanding"))
336 {
337#if ENABLE_DNS
338 conf.dns_max_outstanding = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "http-proxy-host"))
342 {
343#if ENABLE_HTTP_PROXY
344 free (conf.proxy_host), conf.proxy_host = strdup (val);
345#endif
346 }
347 else if (!strcmp (var, "http-proxy-port"))
348 {
349#if ENABLE_HTTP_PROXY
350 conf.proxy_port = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "http-proxy-auth"))
354 {
355#if ENABLE_HTTP_PROXY
356 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
357#endif
358 }
359
360 /* node-specific, non-defaultable */
361 else if (node != &conf.default_node && !strcmp (var, "hostname"))
362 free (node->hostname), node->hostname = strdup (val);
363
364 /* node-specific, defaultable */
365 else if (!strcmp (var, "udp-port"))
366 node->udp_port = atoi (val);
367 else if (!strcmp (var, "tcp-port"))
368 node->tcp_port = atoi (val);
369 else if (!strcmp (var, "dns-hostname"))
370 {
371#if ENABLE_DNS
372 free (node->dns_hostname), node->dns_hostname = strdup (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-port"))
376 {
377#if ENABLE_DNS
378 node->dns_port = atoi (val);
379#endif
380 }
381 else if (!strcmp (var, "dns-domain"))
382 {
383#if ENABLE_DNS
384 free (node->domain), node->domain = strdup (val);
385#endif
386 }
387 else if (!strcmp (var, "if-up-data"))
388 free (node->if_up_data), node->if_up_data = strdup (val);
389 else if (!strcmp (var, "router-priority"))
390 node->routerprio = atoi (val);
391 else if (!strcmp (var, "max-retry"))
392 node->max_retry = atoi (val);
393 else if (!strcmp (var, "connect"))
394 {
395 if (!strcmp (val, "ondemand"))
396 node->connectmode = conf_node::C_ONDEMAND;
397 else if (!strcmp (val, "never"))
398 node->connectmode = conf_node::C_NEVER;
399 else if (!strcmp (val, "always"))
400 node->connectmode = conf_node::C_ALWAYS;
401 else if (!strcmp (val, "disabled"))
402 node->connectmode = conf_node::C_DISABLED;
403 else
404 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
405 }
406 else if (!strcmp (var, "inherit-tos"))
407 parse_bool (node->inherit_tos, "inherit-tos", true, false);
408 else if (!strcmp (var, "compress"))
409 parse_bool (node->compress, "compress", true, false);
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 return _("unknown configuration directive. (ignored)");
441
442 return 0;
443}
444
445void configuration_parser::parse_argv ()
446{
447 for (int i = 0; i < argc; ++i)
448 {
449 char *v = argv [i];
450
451 if (!*v)
452 continue;
453
454 char *enode = v;
455
456 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
457 enode++;
458
459 if (*enode != '.')
460 enode = 0;
461
462 char *wnode = node == &conf.default_node
463 ? 0
464 : node->nodename;
465
466 if ((!wnode && !enode)
467 || (wnode && enode && !strncmp (wnode, v, enode - v)))
468 {
469 const char *warn = parse_line (enode ? enode + 1 : v);
470
471 if (warn)
472 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
473
474 *v = 0;
475 }
476 }
477}
478
479configuration_parser::configuration_parser (configuration &conf,
480 bool need_keys,
481 int argc,
482 char **argv)
483: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
155{ 484{
156 char *fname; 485 char *fname;
157 FILE *f; 486 FILE *f;
158 487
159 clear_config (); 488 conf.clear ();
160 489
161 asprintf (&fname, "%s/vped.conf", confbase); 490 asprintf (&fname, "%s/gvpe.conf", confbase);
162 f = fopen (fname, "r"); 491 f = fopen (fname, "r");
163 492
164 if (f) 493 if (f)
165 { 494 {
166 char line[16384]; 495 char line[16384];
167 int lineno = 0; 496 int lineno = 0;
168 char *var, *val; 497 node = &conf.default_node;
169 conf_node *node = &default_node;
170 498
171 while (fgets (line, sizeof (line), f)) 499 while (fgets (line, sizeof (line), f))
172 { 500 {
173 lineno++; 501 lineno++;
174 502
175 { 503 const char *warn = parse_line (line);
176 char *end = line + strlen (line);
177 504
178 while (*end < ' ' && end >= line) 505 if (warn)
179 end--; 506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
180
181 *++end = 0;
182 }
183
184 char *tok = line;
185
186retry:
187 var = strtok (tok, "\t =");
188 tok = 0;
189
190 if (!var || !var[0])
191 continue; /* no tokens on this line */
192
193 if (var[0] == '#')
194 continue; /* comment: ignore */
195
196 val = strtok (NULL, "\t\n\r =");
197
198 if (!val || val[0] == '#')
199 {
200 slog (L_WARN,
201 _("no value for variable `%s', at '%s' line %d"),
202 var, fname, lineno);
203 break;
204 }
205
206 if (!strcmp (var, "on"))
207 {
208 if (!::thisnode
209 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
210 || !strcmp (val, ::thisnode))
211 goto retry;
212
213 continue;
214 }
215
216 // truly global
217 if (!strcmp (var, "loglevel"))
218 {
219 loglevel l = string_to_loglevel (val);
220
221 if (l != L_NONE)
222 llevel = l;
223 else
224 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
225 }
226 else if (!strcmp (var, "ip-proto"))
227 ip_proto = atoi (val);
228
229 // per config
230 else if (!strcmp (var, "node"))
231 {
232 default_node.id++;
233
234 node = new conf_node (default_node);
235
236 nodes.push_back (node);
237
238 node->nodename = strdup (val);
239
240 {
241 char *fname;
242 FILE *f;
243
244 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
245
246 f = fopen (fname, "r");
247 if (f)
248 {
249 node->rsa_key = RSA_new ();
250
251 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
252 {
253 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
254 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
255 exit (1);
256 }
257
258 RSA_blinding_on (node->rsa_key, 0);
259
260 fclose (f);
261 }
262 else
263 {
264 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
265
266 if (need_keys)
267 exit (1);
268 }
269
270 free (fname);
271 }
272
273 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
274 thisnode = node;
275 }
276 else if (!strcmp (var, "private-key"))
277 prikeyfile = strdup (val);
278 else if (!strcmp (var, "ifpersist"))
279 {
280 parse_bool (ifpersist, "ifpersist", true, false);
281 }
282 else if (!strcmp (var, "ifname"))
283 ifname = strdup (val);
284 else if (!strcmp (var, "rekey"))
285 rekey = atoi (val);
286 else if (!strcmp (var, "keepalive"))
287 keepalive = atoi (val);
288 else if (!strcmp (var, "mtu"))
289 mtu = atoi (val);
290 else if (!strcmp (var, "if-up"))
291 script_if_up = strdup (val);
292 else if (!strcmp (var, "node-up"))
293 script_node_up = strdup (val);
294 else if (!strcmp (var, "node-down"))
295 script_node_down = strdup (val);
296#if ENABLE_HTTP_PROXY
297 else if (!strcmp (var, "http-proxy-host"))
298 proxy_host = strdup (val);
299 else if (!strcmp (var, "http-proxy-port"))
300 proxy_port = atoi (val);
301 else if (!strcmp (var, "http-proxy-auth"))
302 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
303#endif
304
305 /* node-specific, non-defaultable */
306 else if (node != &default_node && !strcmp (var, "hostname"))
307 {
308 free (node->hostname);
309 node->hostname = strdup (val);
310 }
311
312 /* node-specific, defaultable */
313 else if (!strcmp (var, "udp-port"))
314 node->udp_port = atoi (val);
315 else if (!strcmp (var, "tcp-port"))
316 node->tcp_port = atoi (val);
317 else if (!strcmp (var, "router-priority"))
318 node->routerprio = atoi (val);
319 else if (!strcmp (var, "connect"))
320 {
321 if (!strcmp (val, "ondemand"))
322 node->connectmode = conf_node::C_ONDEMAND;
323 else if (!strcmp (val, "never"))
324 node->connectmode = conf_node::C_NEVER;
325 else if (!strcmp (val, "always"))
326 node->connectmode = conf_node::C_ALWAYS;
327 else if (!strcmp (val, "disabled"))
328 node->connectmode = conf_node::C_DISABLED;
329 else
330 slog (L_WARN,
331 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
332 var, fname, lineno);
333 }
334 else if (!strcmp (var, "inherit-tos"))
335 {
336 parse_bool (node->inherit_tos, "inherit-tos", true, false);
337 }
338 else if (!strcmp (var, "compress"))
339 {
340 parse_bool (node->compress, "compress", true, false);
341 }
342 // all these bool options really really cost a lot of executable size!
343 else if (!strcmp (var, "enable-tcp"))
344 {
345#if ENABLE_TCP
346 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
347#endif
348 }
349 else if (!strcmp (var, "enable-udp"))
350 {
351 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
352 }
353 else if (!strcmp (var, "enable-rawip"))
354 {
355 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
356 }
357
358 // unknown or misplaced
359 else
360 slog (L_WARN,
361 _("unknown or misplaced variable `%s', at '%s' line %d"),
362 var, fname, lineno);
363 } 507 }
364 508
365 fclose (f); 509 fclose (f);
510
511 parse_argv ();
366 } 512 }
367 else 513 else
368 { 514 {
369 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 515 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
370 exit (1); 516 exit (EXIT_FAILURE);
371 } 517 }
372 518
373 free (fname); 519 free (fname);
374 520
375 fname = config_filename (prikeyfile, "hostkey"); 521 fname = conf.config_filename (conf.prikeyfile, "hostkey");
376 522
377 f = fopen (fname, "r"); 523 f = fopen (fname, "r");
378 if (f) 524 if (f)
379 { 525 {
380 rsa_key = RSA_new (); 526 conf.rsa_key = RSA_new ();
381 527
382 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
383 { 529 {
384 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 530 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
385 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 531 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
386 exit (1); 532 exit (EXIT_FAILURE);
387 } 533 }
388 534
389 RSA_blinding_on (rsa_key, 0); 535 require (RSA_blinding_on (conf.rsa_key, 0));
390 536
391 fclose (f); 537 fclose (f);
392 } 538 }
393 else 539 else
394 { 540 {
395 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 541 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
396 542
397 if (need_keys) 543 if (need_keys)
398 exit (1); 544 exit (EXIT_FAILURE);
545 }
546
547 if (need_keys && ::thisnode
548 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
549 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
550 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
551 {
552 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
553 exit (EXIT_FAILURE);
399 } 554 }
400 555
401 free (fname); 556 free (fname);
402} 557}
403 558
404char *configuration::config_filename (const char *name, const char *dflt) 559char *configuration::config_filename (const char *name, const char *dflt)
… …
426 printf (_("MTU: %d\n"), mtu); 581 printf (_("MTU: %d\n"), mtu);
427 printf (_("rekeying interval: %d\n"), rekey); 582 printf (_("rekeying interval: %d\n"), rekey);
428 printf (_("keepalive interval: %d\n"), keepalive); 583 printf (_("keepalive interval: %d\n"), keepalive);
429 printf (_("interface: %s\n"), ifname); 584 printf (_("interface: %s\n"), ifname);
430 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 585 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
431 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 586 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
432 printf ("\n"); 587 printf ("\n");
433 588
434 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 589 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
435 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 590 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
436 591
… …
440 printf ("\n"); 595 printf ("\n");
441} 596}
442 597
443configuration::configuration () 598configuration::configuration ()
444{ 599{
600 asprintf (&confbase, "%s/gvpe", CONFDIR);
601
445 init (); 602 init ();
446} 603}
447 604
448configuration::~configuration () 605configuration::~configuration ()
449{ 606{

Diff Legend

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