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.27 by pcg, Fri Jun 11 15:56:31 2004 UTC vs.
Revision 1.40 by pcg, Mon Mar 28 20:39:18 2005 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
34#include <openssl/err.h> 36#include <openssl/err.h>
35#include <openssl/pem.h> 37#include <openssl/pem.h>
36#include <openssl/rsa.h> 38#include <openssl/rsa.h>
37#include <openssl/rand.h> 39#include <openssl/rand.h>
38#include <openssl/bn.h> 40#include <openssl/bn.h>
39
40#include "gettext.h"
41 41
42#include "conf.h" 42#include "conf.h"
43#include "slog.h" 43#include "slog.h"
44#include "util.h" 44#include "util.h"
45 45
… …
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));
… …
112 121
113 default_node.udp_port = DEFAULT_UDPPORT; 122 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 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;
118 default_node.max_retry = DEFAULT_MAX_RETRY; 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
119 140
120 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
121} 142}
122 143
123void configuration::cleanup() 144void configuration::cleanup()
… …
125 if (rsa_key) 146 if (rsa_key)
126 RSA_free (rsa_key); 147 RSA_free (rsa_key);
127 148
128 rsa_key = 0; 149 rsa_key = 0;
129 150
130 free (pidfilename); pidfilename = 0; 151 free (pidfilename); pidfilename = 0;
131 free (ifname); ifname = 0; 152 free (ifname); ifname = 0;
132#if ENABLE_HTTP_PROXY 153#if ENABLE_HTTP_PROXY
133 free (proxy_host); proxy_host = 0; 154 free (proxy_host); proxy_host = 0;
134 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;
135#endif 159#endif
136} 160}
137 161
138void 162void
139configuration::clear_config () 163configuration::clear ()
140{ 164{
141 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)
142 delete *i; 166 delete *i;
143 167
144 nodes.clear (); 168 nodes.clear ();
145 169
146 cleanup (); 170 cleanup ();
147 init (); 171 init ();
148} 172}
149 173
150#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
151 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
152 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
153 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
154 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
155 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
156 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
157 else \ 181 else \
158 slog (L_WARN, \ 182 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
159 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183} while (0)
160 name, var, fname, lineno);
161 184
162void 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)
163{ 484{
164 char *fname; 485 char *fname;
165 FILE *f; 486 FILE *f;
166 487
167 clear_config (); 488 conf.clear ();
168 489
169 asprintf (&fname, "%s/gvpe.conf", confbase); 490 asprintf (&fname, "%s/gvpe.conf", confbase);
170 f = fopen (fname, "r"); 491 f = fopen (fname, "r");
171 492
172 if (f) 493 if (f)
173 { 494 {
174 char line[16384]; 495 char line[16384];
175 int lineno = 0; 496 int lineno = 0;
176 char *var, *val; 497 node = &conf.default_node;
177 conf_node *node = &default_node;
178 498
179 while (fgets (line, sizeof (line), f)) 499 while (fgets (line, sizeof (line), f))
180 { 500 {
181 lineno++; 501 lineno++;
182 502
183 { 503 const char *warn = parse_line (line);
184 char *end = line + strlen (line);
185 504
186 while (*end < ' ' && end >= line) 505 if (warn)
187 end--; 506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
188
189 *++end = 0;
190 }
191
192 char *tok = line;
193
194retry:
195 var = strtok (tok, "\t =");
196 tok = 0;
197
198 if (!var || !var[0])
199 continue; /* no tokens on this line */
200
201 if (var[0] == '#')
202 continue; /* comment: ignore */
203
204 val = strtok (NULL, "\t\n\r =");
205
206 if (!val || val[0] == '#')
207 {
208 slog (L_WARN,
209 _("no value for variable `%s', at '%s' line %d"),
210 var, fname, lineno);
211 break;
212 }
213
214 if (!strcmp (var, "on"))
215 {
216 if (!::thisnode
217 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
218 || !strcmp (val, ::thisnode))
219 goto retry;
220
221 continue;
222 }
223
224 // truly global
225 if (!strcmp (var, "loglevel"))
226 {
227 loglevel l = string_to_loglevel (val);
228
229 if (l != L_NONE)
230 llevel = l;
231 else
232 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
233 }
234 else if (!strcmp (var, "ip-proto"))
235 ip_proto = atoi (val);
236 else if (!strcmp (var, "icmp-type"))
237 {
238#if ENABLE_ICMP
239 icmp_type = atoi (val);
240#endif
241 }
242
243 // per config
244 else if (!strcmp (var, "node"))
245 {
246 default_node.id++;
247
248 node = new conf_node (default_node);
249
250 nodes.push_back (node);
251
252 node->nodename = strdup (val);
253
254 {
255 char *fname;
256 FILE *f;
257
258 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
259
260 f = fopen (fname, "r");
261 if (f)
262 {
263 node->rsa_key = RSA_new ();
264
265 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
266 {
267 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
268 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
269 exit (EXIT_FAILURE);
270 }
271
272 require (RSA_blinding_on (node->rsa_key, 0));
273
274 fclose (f);
275 }
276 else
277 {
278 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
279
280 if (need_keys)
281 exit (EXIT_FAILURE);
282 }
283
284 free (fname);
285 }
286
287 if (::thisnode && !strcmp (node->nodename, ::thisnode))
288 thisnode = node;
289 }
290 else if (!strcmp (var, "private-key"))
291 free (prikeyfile), prikeyfile = strdup (val);
292 else if (!strcmp (var, "ifpersist"))
293 {
294 parse_bool (ifpersist, "ifpersist", true, false);
295 }
296 else if (!strcmp (var, "ifname"))
297 free (ifname), ifname = strdup (val);
298 else if (!strcmp (var, "rekey"))
299 rekey = atoi (val);
300 else if (!strcmp (var, "keepalive"))
301 keepalive = atoi (val);
302 else if (!strcmp (var, "mtu"))
303 mtu = atoi (val);
304 else if (!strcmp (var, "if-up"))
305 free (script_if_up), script_if_up = strdup (val);
306 else if (!strcmp (var, "node-up"))
307 free (script_node_up), script_node_up = strdup (val);
308 else if (!strcmp (var, "node-down"))
309 free (script_node_down), script_node_down = strdup (val);
310 else if (!strcmp (var, "pid-file"))
311 free (pidfilename), pidfilename = strdup (val);
312 else if (!strcmp (var, "http-proxy-host"))
313 {
314#if ENABLE_HTTP_PROXY
315 free (proxy_host), proxy_host = strdup (val);
316#endif
317 }
318 else if (!strcmp (var, "http-proxy-port"))
319 {
320#if ENABLE_HTTP_PROXY
321 proxy_port = atoi (val);
322#endif
323 }
324 else if (!strcmp (var, "http-proxy-auth"))
325 {
326#if ENABLE_HTTP_PROXY
327 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
328#endif
329 }
330
331 /* node-specific, non-defaultable */
332 else if (node != &default_node && !strcmp (var, "hostname"))
333 free (node->hostname), node->hostname = strdup (val);
334
335 /* node-specific, defaultable */
336 else if (!strcmp (var, "udp-port"))
337 node->udp_port = atoi (val);
338 else if (!strcmp (var, "tcp-port"))
339 node->tcp_port = atoi (val);
340 else if (!strcmp (var, "dns-port"))
341 node->dns_port = atoi (val);
342 else if (!strcmp (var, "router-priority"))
343 node->routerprio = atoi (val);
344 else if (!strcmp (var, "max-retry"))
345 node->max_retry = atoi (val);
346 else if (!strcmp (var, "connect"))
347 {
348 if (!strcmp (val, "ondemand"))
349 node->connectmode = conf_node::C_ONDEMAND;
350 else if (!strcmp (val, "never"))
351 node->connectmode = conf_node::C_NEVER;
352 else if (!strcmp (val, "always"))
353 node->connectmode = conf_node::C_ALWAYS;
354 else if (!strcmp (val, "disabled"))
355 node->connectmode = conf_node::C_DISABLED;
356 else
357 slog (L_WARN,
358 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
359 var, fname, lineno);
360 }
361 else if (!strcmp (var, "inherit-tos"))
362 {
363 parse_bool (node->inherit_tos, "inherit-tos", true, false);
364 }
365 else if (!strcmp (var, "compress"))
366 {
367 parse_bool (node->compress, "compress", true, false);
368 }
369 // all these bool options really really cost a lot of executable size!
370 else if (!strcmp (var, "enable-tcp"))
371 {
372#if ENABLE_TCP
373 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
374#endif
375 }
376 else if (!strcmp (var, "enable-icmp"))
377 {
378#if ENABLE_ICMP
379 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
380#endif
381 }
382 else if (!strcmp (var, "enable-dns"))
383 {
384#if ENABLE_DNS
385 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
386#endif
387 }
388 else if (!strcmp (var, "enable-udp"))
389 {
390 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
391 }
392 else if (!strcmp (var, "enable-rawip"))
393 {;
394 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
395 }
396
397 // unknown or misplaced
398 else
399 slog (L_WARN,
400 _("unknown or misplaced variable `%s', at '%s' line %d"),
401 var, fname, lineno);
402 } 507 }
403 508
404 fclose (f); 509 fclose (f);
510
511 parse_argv ();
405 } 512 }
406 else 513 else
407 { 514 {
408 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));
409 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
410 } 517 }
411 518
412 free (fname); 519 free (fname);
413 520
414 fname = config_filename (prikeyfile, "hostkey"); 521 fname = conf.config_filename (conf.prikeyfile, "hostkey");
415 522
416 f = fopen (fname, "r"); 523 f = fopen (fname, "r");
417 if (f) 524 if (f)
418 { 525 {
419 rsa_key = RSA_new (); 526 conf.rsa_key = RSA_new ();
420 527
421 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
422 { 529 {
423 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 530 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
424 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));
425 exit (EXIT_FAILURE); 532 exit (EXIT_FAILURE);
426 } 533 }
427 534
428 require (RSA_blinding_on (rsa_key, 0)); 535 require (RSA_blinding_on (conf.rsa_key, 0));
429 536
430 fclose (f); 537 fclose (f);
431 } 538 }
432 else 539 else
433 { 540 {
… …
436 if (need_keys) 543 if (need_keys)
437 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
438 } 545 }
439 546
440 if (need_keys && ::thisnode 547 if (need_keys && ::thisnode
441 && rsa_key && thisnode && thisnode->rsa_key) 548 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
442 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 549 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
443 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 550 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
444 { 551 {
445 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 552 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
446 exit (EXIT_FAILURE); 553 exit (EXIT_FAILURE);
447 } 554 }
448 555

Diff Legend

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