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.15 by pcg, Sun Apr 13 00:35:46 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#include <netinet/ip_icmp.h>
38 35
39#include <openssl/err.h> 36#include <openssl/err.h>
40#include <openssl/pem.h> 37#include <openssl/pem.h>
41#include <openssl/rsa.h> 38#include <openssl/rsa.h>
42#include <openssl/rand.h> 39#include <openssl/rand.h>
43 40#include <openssl/bn.h>
44#include "gettext.h"
45 41
46#include "conf.h" 42#include "conf.h"
47#include "slog.h" 43#include "slog.h"
48#include "util.h" 44#include "util.h"
49 45
50char *confbase; 46char *confbase;
51char *thisnode; 47char *thisnode;
52char *identname; 48char *identname;
53char *pidfilename;
54 49
55struct configuration conf; 50struct configuration conf;
56 51
57u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
58{ 53{
59 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
60 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
61 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
62 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
63 59
64 return 0; 60 return 0;
65} 61}
66 62
67const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
68{ 64{
69 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
70 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
71 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
72 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
73 70
74 return "<unknown>"; 71 return "<unknown>";
75} 72}
76 73
77void 74void
… …
91 ); 88 );
92} 89}
93 90
94conf_node::~conf_node () 91conf_node::~conf_node ()
95{ 92{
93#if 0
94 // does not work, because string pointers etc. are shared
95 // is not called, however
96 if (rsa_key) 96 if (rsa_key)
97 RSA_free (rsa_key); 97 RSA_free (rsa_key);
98 98
99 free (nodename); 99 free (nodename);
100 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
101} 107}
102 108
103void configuration::init () 109void configuration::init ()
104{ 110{
105 memset (this, 0, sizeof (*this)); 111 memset (this, 0, sizeof (*this));
106 112
113 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 114 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 115 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 116 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 117 ip_proto = IPPROTO_GRE;
118#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 119 icmp_type = ICMP_ECHOREPLY;
120#endif
112 121
113 default_node.udp_port = DEFAULT_UDPPORT; 122 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 124 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 125 default_node.compress = true;
117 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");
118} 142}
119 143
120void configuration::cleanup() 144void configuration::cleanup()
121{ 145{
122 if (rsa_key) 146 if (rsa_key)
123 RSA_free (rsa_key); 147 RSA_free (rsa_key);
124 148
125 rsa_key = 0; 149 rsa_key = 0;
126 150
151 free (pidfilename); pidfilename = 0;
127 free (ifname); ifname = 0; 152 free (ifname); ifname = 0;
128#if ENABLE_HTTP_PROXY 153#if ENABLE_HTTP_PROXY
129 free (proxy_host); proxy_host = 0; 154 free (proxy_host); proxy_host = 0;
130 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;
131#endif 159#endif
132} 160}
133 161
134void 162void
135configuration::clear_config () 163configuration::clear ()
136{ 164{
137 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)
138 delete *i; 166 delete *i;
139 167
140 nodes.clear (); 168 nodes.clear ();
141 169
142 cleanup (); 170 cleanup ();
143 init (); 171 init ();
144} 172}
145 173
146#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
147 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
148 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
149 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
150 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
151 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
152 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
153 else \ 181 else \
154 slog (L_WARN, \ 182 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
155 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183} while (0)
156 name, var, fname, lineno);
157 184
158void 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)
159{ 484{
160 char *fname; 485 char *fname;
161 FILE *f; 486 FILE *f;
162 487
163 clear_config (); 488 conf.clear ();
164 489
165 asprintf (&fname, "%s/vped.conf", confbase); 490 asprintf (&fname, "%s/gvpe.conf", confbase);
166 f = fopen (fname, "r"); 491 f = fopen (fname, "r");
167 492
168 if (f) 493 if (f)
169 { 494 {
170 char line[16384]; 495 char line[16384];
171 int lineno = 0; 496 int lineno = 0;
172 char *var, *val; 497 node = &conf.default_node;
173 conf_node *node = &default_node;
174 498
175 while (fgets (line, sizeof (line), f)) 499 while (fgets (line, sizeof (line), f))
176 { 500 {
177 lineno++; 501 lineno++;
178 502
179 { 503 const char *warn = parse_line (line);
180 char *end = line + strlen (line);
181 504
182 while (*end < ' ' && end >= line) 505 if (warn)
183 end--; 506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
184
185 *++end = 0;
186 }
187
188 char *tok = line;
189
190retry:
191 var = strtok (tok, "\t =");
192 tok = 0;
193
194 if (!var || !var[0])
195 continue; /* no tokens on this line */
196
197 if (var[0] == '#')
198 continue; /* comment: ignore */
199
200 val = strtok (NULL, "\t\n\r =");
201
202 if (!val || val[0] == '#')
203 {
204 slog (L_WARN,
205 _("no value for variable `%s', at '%s' line %d"),
206 var, fname, lineno);
207 break;
208 }
209
210 if (!strcmp (var, "on"))
211 {
212 if (!::thisnode
213 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
214 || !strcmp (val, ::thisnode))
215 goto retry;
216
217 continue;
218 }
219
220 // truly global
221 if (!strcmp (var, "loglevel"))
222 {
223 loglevel l = string_to_loglevel (val);
224
225 if (l != L_NONE)
226 llevel = l;
227 else
228 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
229 }
230 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val);
234
235 // per config
236 else if (!strcmp (var, "node"))
237 {
238 default_node.id++;
239
240 node = new conf_node (default_node);
241
242 nodes.push_back (node);
243
244 node->nodename = strdup (val);
245
246 {
247 char *fname;
248 FILE *f;
249
250 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
251
252 f = fopen (fname, "r");
253 if (f)
254 {
255 node->rsa_key = RSA_new ();
256
257 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
258 {
259 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
260 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
261 exit (1);
262 }
263
264 RSA_blinding_on (node->rsa_key, 0);
265
266 fclose (f);
267 }
268 else
269 {
270 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
271
272 if (need_keys)
273 exit (1);
274 }
275
276 free (fname);
277 }
278
279 if (!::thisnode || !strcmp (node->nodename, ::thisnode))
280 thisnode = node;
281 }
282 else if (!strcmp (var, "private-key"))
283 prikeyfile = strdup (val);
284 else if (!strcmp (var, "ifpersist"))
285 {
286 parse_bool (ifpersist, "ifpersist", true, false);
287 }
288 else if (!strcmp (var, "ifname"))
289 ifname = strdup (val);
290 else if (!strcmp (var, "rekey"))
291 rekey = atoi (val);
292 else if (!strcmp (var, "keepalive"))
293 keepalive = atoi (val);
294 else if (!strcmp (var, "mtu"))
295 mtu = atoi (val);
296 else if (!strcmp (var, "if-up"))
297 script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down"))
301 script_node_down = strdup (val);
302#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val);
305 else if (!strcmp (var, "http-proxy-port"))
306 proxy_port = atoi (val);
307 else if (!strcmp (var, "http-proxy-auth"))
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif
310
311 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val);
316 }
317
318 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port"))
322 node->tcp_port = atoi (val);
323 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val);
325 else if (!strcmp (var, "connect"))
326 {
327 if (!strcmp (val, "ondemand"))
328 node->connectmode = conf_node::C_ONDEMAND;
329 else if (!strcmp (val, "never"))
330 node->connectmode = conf_node::C_NEVER;
331 else if (!strcmp (val, "always"))
332 node->connectmode = conf_node::C_ALWAYS;
333 else if (!strcmp (val, "disabled"))
334 node->connectmode = conf_node::C_DISABLED;
335 else
336 slog (L_WARN,
337 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
338 var, fname, lineno);
339 }
340 else if (!strcmp (var, "inherit-tos"))
341 {
342 parse_bool (node->inherit_tos, "inherit-tos", true, false);
343 }
344 else if (!strcmp (var, "compress"))
345 {
346 parse_bool (node->compress, "compress", true, false);
347 }
348 // all these bool options really really cost a lot of executable size!
349 else if (!strcmp (var, "enable-tcp"))
350 {
351#if ENABLE_TCP
352 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
353#endif
354 }
355 else if (!strcmp (var, "enable-icmp"))
356 {
357#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
359#endif
360 }
361 else if (!strcmp (var, "enable-udp"))
362 {
363 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
364 }
365 else if (!strcmp (var, "enable-rawip"))
366 {
367 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
368 }
369
370 // unknown or misplaced
371 else
372 slog (L_WARN,
373 _("unknown or misplaced variable `%s', at '%s' line %d"),
374 var, fname, lineno);
375 } 507 }
376 508
377 fclose (f); 509 fclose (f);
510
511 parse_argv ();
378 } 512 }
379 else 513 else
380 { 514 {
381 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));
382 exit (1); 516 exit (EXIT_FAILURE);
383 } 517 }
384 518
385 free (fname); 519 free (fname);
386 520
387 fname = config_filename (prikeyfile, "hostkey"); 521 fname = conf.config_filename (conf.prikeyfile, "hostkey");
388 522
389 f = fopen (fname, "r"); 523 f = fopen (fname, "r");
390 if (f) 524 if (f)
391 { 525 {
392 rsa_key = RSA_new (); 526 conf.rsa_key = RSA_new ();
393 527
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
395 { 529 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 530 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
397 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));
398 exit (1); 532 exit (EXIT_FAILURE);
399 } 533 }
400 534
401 RSA_blinding_on (rsa_key, 0); 535 require (RSA_blinding_on (conf.rsa_key, 0));
402 536
403 fclose (f); 537 fclose (f);
404 } 538 }
405 else 539 else
406 { 540 {
407 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));
408 542
409 if (need_keys) 543 if (need_keys)
410 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);
411 } 554 }
412 555
413 free (fname); 556 free (fname);
414} 557}
415 558
416char *configuration::config_filename (const char *name, const char *dflt) 559char *configuration::config_filename (const char *name, const char *dflt)
… …
452 printf ("\n"); 595 printf ("\n");
453} 596}
454 597
455configuration::configuration () 598configuration::configuration ()
456{ 599{
600 asprintf (&confbase, "%s/gvpe", CONFDIR);
601
457 init (); 602 init ();
458} 603}
459 604
460configuration::~configuration () 605configuration::~configuration ()
461{ 606{

Diff Legend

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