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.39 by pcg, Sat Mar 26 03:16:24 2005 UTC vs.
Revision 1.43 by pcg, Thu Aug 7 16:34:21 2008 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#include <cstdio> 24#include <cstdio>
… …
67 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns"; 69 if (protocol & PROT_DNSv4 ) return "dns";
70 70
71 return "<unknown>"; 71 return "<unknown>";
72}
73
74static bool
75match_list (const vector<const char *> &list, const char *str)
76{
77 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
78 if ((*i)[0] == '*' && !(*i)[1])
79 return true;
80 else if (!strcmp (*i, str))
81 return true;
82
83 return false;
84}
85
86bool
87conf_node::can_direct (struct conf_node *other)
88{
89 if (match_list (allow_direct, other->nodename))
90 return true;
91
92 if (match_list (deny_direct, other->nodename))
93 return false;
94
95 return true;
72} 96}
73 97
74void 98void
75conf_node::print () 99conf_node::print ()
76{ 100{
… …
123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 147 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
124 default_node.connectmode = conf_node::C_ALWAYS; 148 default_node.connectmode = conf_node::C_ALWAYS;
125 default_node.compress = true; 149 default_node.compress = true;
126 default_node.protocols = 0; 150 default_node.protocols = 0;
127 default_node.max_retry = DEFAULT_MAX_RETRY; 151 default_node.max_retry = DEFAULT_MAX_RETRY;
152 default_node.max_ttl = DEFAULT_MAX_TTL;
153 default_node.max_queue = DEFAULT_MAX_QUEUE;
128 default_node.if_up_data = strdup (""); 154 default_node.if_up_data = strdup ("");
129 155
130#if ENABLE_DNS 156#if ENABLE_DNS
131 default_node.dns_port = 0; // default is 0 == client 157 default_node.dns_port = 0; // default is 0 == client
132 158
… …
158 free (dns_forw_host); dns_forw_host = 0; 184 free (dns_forw_host); dns_forw_host = 0;
159#endif 185#endif
160} 186}
161 187
162void 188void
163configuration::clear_config () 189configuration::clear ()
164{ 190{
165 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 191 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
166 delete *i; 192 delete *i;
167 193
168 nodes.clear (); 194 nodes.clear ();
… …
177 else if (!strcmp (val, "true")) target = trueval; \ 203 else if (!strcmp (val, "true")) target = trueval; \
178 else if (!strcmp (val, "false")) target = falseval; \ 204 else if (!strcmp (val, "false")) target = falseval; \
179 else if (!strcmp (val, "on")) target = trueval; \ 205 else if (!strcmp (val, "on")) target = trueval; \
180 else if (!strcmp (val, "off")) target = falseval; \ 206 else if (!strcmp (val, "off")) target = falseval; \
181 else \ 207 else \
182 slog (L_WARN, \ 208 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
183 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
184 name, var, fname, lineno); \
185} while (0) 209} while (0)
186 210
187void configuration::read_config (bool need_keys) 211const char *
212configuration_parser::parse_line (char *line)
213{
214 {
215 char *end = line + strlen (line);
216
217 while (*end < ' ' && end >= line)
218 end--;
219
220 *++end = 0;
221 }
222
223 char *tok = line;
224 const char *var = strtok (tok, "\t =");
225 tok = 0;
226
227 if (!var || !var[0])
228 return 0; /* no tokens on this line */
229
230 if (var[0] == '#')
231 return 0; /* comment: ignore */
232
233 char *val = strtok (NULL, "\t\n\r =");
234
235 if (!val || val[0] == '#')
236 return _("no value given for variable. (ignored)");
237
238 if (!strcmp (var, "on"))
239 {
240 if (!::thisnode
241 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
242 || !strcmp (val, ::thisnode))
243 return parse_line (strtok (NULL, "\n\r"));
244 else
245 return 0;
246 }
247
248 // truly global
249 if (!strcmp (var, "loglevel"))
250 {
251 loglevel l = string_to_loglevel (val);
252
253 if (l == L_NONE)
254 return _("unknown loglevel. (skipping)");
255 }
256 else if (!strcmp (var, "ip-proto"))
257 conf.ip_proto = atoi (val);
258 else if (!strcmp (var, "icmp-type"))
259 {
260#if ENABLE_ICMP
261 conf.icmp_type = atoi (val);
262#endif
263 }
264
265 // per config
266 else if (!strcmp (var, "node"))
267 {
268 parse_argv ();
269
270 conf.default_node.id++;
271 node = new conf_node (conf.default_node);
272 conf.nodes.push_back (node);
273 node->nodename = strdup (val);
274
275 {
276 char *fname;
277 FILE *f;
278
279 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
280
281 f = fopen (fname, "r");
282 if (f)
283 {
284 node->rsa_key = RSA_new ();
285
286 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
287 {
288 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
289 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
290 exit (EXIT_FAILURE);
291 }
292
293 require (RSA_blinding_on (node->rsa_key, 0));
294
295 fclose (f);
296 }
297 else
298 {
299 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
300
301 if (need_keys)
302 exit (EXIT_FAILURE);
303 }
304
305 free (fname);
306 }
307
308 if (::thisnode && !strcmp (node->nodename, ::thisnode))
309 conf.thisnode = node;
310 }
311 else if (!strcmp (var, "private-key"))
312 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
313 else if (!strcmp (var, "ifpersist"))
314 parse_bool (conf.ifpersist, "ifpersist", true, false);
315 else if (!strcmp (var, "ifname"))
316 free (conf.ifname), conf.ifname = strdup (val);
317 else if (!strcmp (var, "rekey"))
318 conf.rekey = atoi (val);
319 else if (!strcmp (var, "keepalive"))
320 conf.keepalive = atoi (val);
321 else if (!strcmp (var, "mtu"))
322 conf.mtu = atoi (val);
323 else if (!strcmp (var, "if-up"))
324 free (conf.script_if_up), conf.script_if_up = strdup (val);
325 else if (!strcmp (var, "node-up"))
326 free (conf.script_node_up), conf.script_node_up = strdup (val);
327 else if (!strcmp (var, "node-down"))
328 free (conf.script_node_down), conf.script_node_down = strdup (val);
329 else if (!strcmp (var, "pid-file"))
330 free (conf.pidfilename), conf.pidfilename = strdup (val);
331 else if (!strcmp (var, "dns-forw-host"))
332 {
333#if ENABLE_DNS
334 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
335#endif
336 }
337 else if (!strcmp (var, "dns-forw-port"))
338 {
339#if ENABLE_DNS
340 conf.dns_forw_port = atoi (val);
341#endif
342 }
343 else if (!strcmp (var, "dns-timeout-factor"))
344 {
345#if ENABLE_DNS
346 conf.dns_timeout_factor = atof (val);
347#endif
348 }
349 else if (!strcmp (var, "dns-send-interval"))
350 {
351#if ENABLE_DNS
352 conf.dns_send_interval = atoi (val);
353#endif
354 }
355 else if (!strcmp (var, "dns-overlap-factor"))
356 {
357#if ENABLE_DNS
358 conf.dns_overlap_factor = atof (val);
359#endif
360 }
361 else if (!strcmp (var, "dns-max-outstanding"))
362 {
363#if ENABLE_DNS
364 conf.dns_max_outstanding = atoi (val);
365#endif
366 }
367 else if (!strcmp (var, "http-proxy-host"))
368 {
369#if ENABLE_HTTP_PROXY
370 free (conf.proxy_host), conf.proxy_host = strdup (val);
371#endif
372 }
373 else if (!strcmp (var, "http-proxy-port"))
374 {
375#if ENABLE_HTTP_PROXY
376 conf.proxy_port = atoi (val);
377#endif
378 }
379 else if (!strcmp (var, "http-proxy-auth"))
380 {
381#if ENABLE_HTTP_PROXY
382 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
383#endif
384 }
385
386 /* node-specific, non-defaultable */
387 else if (node != &conf.default_node && !strcmp (var, "hostname"))
388 free (node->hostname), node->hostname = strdup (val);
389
390 /* node-specific, defaultable */
391 else if (!strcmp (var, "udp-port"))
392 node->udp_port = atoi (val);
393 else if (!strcmp (var, "tcp-port"))
394 node->tcp_port = atoi (val);
395 else if (!strcmp (var, "dns-hostname"))
396 {
397#if ENABLE_DNS
398 free (node->dns_hostname), node->dns_hostname = strdup (val);
399#endif
400 }
401 else if (!strcmp (var, "dns-port"))
402 {
403#if ENABLE_DNS
404 node->dns_port = atoi (val);
405#endif
406 }
407 else if (!strcmp (var, "dns-domain"))
408 {
409#if ENABLE_DNS
410 free (node->domain), node->domain = strdup (val);
411#endif
412 }
413 else if (!strcmp (var, "if-up-data"))
414 free (node->if_up_data), node->if_up_data = strdup (val);
415 else if (!strcmp (var, "router-priority"))
416 node->routerprio = atoi (val);
417 else if (!strcmp (var, "max-retry"))
418 node->max_retry = atoi (val);
419 else if (!strcmp (var, "connect"))
420 {
421 if (!strcmp (val, "ondemand"))
422 node->connectmode = conf_node::C_ONDEMAND;
423 else if (!strcmp (val, "never"))
424 node->connectmode = conf_node::C_NEVER;
425 else if (!strcmp (val, "always"))
426 node->connectmode = conf_node::C_ALWAYS;
427 else if (!strcmp (val, "disabled"))
428 node->connectmode = conf_node::C_DISABLED;
429 else
430 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
431 }
432 else if (!strcmp (var, "inherit-tos"))
433 parse_bool (node->inherit_tos, "inherit-tos", true, false);
434 else if (!strcmp (var, "compress"))
435 parse_bool (node->compress, "compress", true, false);
436 // all these bool options really really cost a lot of executable size!
437 else if (!strcmp (var, "enable-tcp"))
438 {
439#if ENABLE_TCP
440 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
441#endif
442 }
443 else if (!strcmp (var, "enable-icmp"))
444 {
445#if ENABLE_ICMP
446 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
447#endif
448 }
449 else if (!strcmp (var, "enable-dns"))
450 {
451#if ENABLE_DNS
452 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
453#endif
454 }
455 else if (!strcmp (var, "enable-udp"))
456 {
457 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
458 }
459 else if (!strcmp (var, "enable-rawip"))
460 {
461 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
462 }
463 else if (!strcmp (var, "allow-direct"))
464 node->allow_direct.push_back (strdup (val));
465 else if (!strcmp (var, "deny-direct"))
466 node->deny_direct.push_back (strdup (val));
467 else if (!strcmp (var, "max-ttl"))
468 node->max_ttl = atof (val);
469 else if (!strcmp (var, "max-queue"))
470 node->max_queue = atoi (val);
471
472 // unknown or misplaced
473 else
474 return _("unknown configuration directive. (ignored)");
475
476 return 0;
477}
478
479void configuration_parser::parse_argv ()
480{
481 for (int i = 0; i < argc; ++i)
482 {
483 char *v = argv [i];
484
485 if (!*v)
486 continue;
487
488 char *enode = v;
489
490 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
491 enode++;
492
493 if (*enode != '.')
494 enode = 0;
495
496 char *wnode = node == &conf.default_node
497 ? 0
498 : node->nodename;
499
500 if ((!wnode && !enode)
501 || (wnode && enode && !strncmp (wnode, v, enode - v)))
502 {
503 const char *warn = parse_line (enode ? enode + 1 : v);
504
505 if (warn)
506 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
507
508 *v = 0;
509 }
510 }
511}
512
513configuration_parser::configuration_parser (configuration &conf,
514 bool need_keys,
515 int argc,
516 char **argv)
517: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
188{ 518{
189 char *fname; 519 char *fname;
190 FILE *f; 520 FILE *f;
191 521
192 clear_config (); 522 conf.clear ();
193 523
194 asprintf (&fname, "%s/gvpe.conf", confbase); 524 asprintf (&fname, "%s/gvpe.conf", confbase);
195 f = fopen (fname, "r"); 525 f = fopen (fname, "r");
196 526
197 if (f) 527 if (f)
198 { 528 {
199 char line[16384]; 529 char line[16384];
200 int lineno = 0; 530 int lineno = 0;
201 char *var, *val; 531 node = &conf.default_node;
202 conf_node *node = &default_node;
203 532
204 while (fgets (line, sizeof (line), f)) 533 while (fgets (line, sizeof (line), f))
205 { 534 {
206 lineno++; 535 lineno++;
207 536
208 { 537 const char *warn = parse_line (line);
209 char *end = line + strlen (line);
210 538
211 while (*end < ' ' && end >= line) 539 if (warn)
212 end--; 540 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
213
214 *++end = 0;
215 }
216
217 char *tok = line;
218
219retry:
220 var = strtok (tok, "\t =");
221 tok = 0;
222
223 if (!var || !var[0])
224 continue; /* no tokens on this line */
225
226 if (var[0] == '#')
227 continue; /* comment: ignore */
228
229 val = strtok (NULL, "\t\n\r =");
230
231 if (!val || val[0] == '#')
232 {
233 slog (L_WARN,
234 _("no value for variable `%s', at '%s' line %d, skipping."),
235 var, fname, lineno);
236 continue;
237 }
238
239 if (!strcmp (var, "on"))
240 {
241 if (!::thisnode
242 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
243 || !strcmp (val, ::thisnode))
244 goto retry;
245
246 continue;
247 }
248
249 // truly global
250 if (!strcmp (var, "loglevel"))
251 {
252 loglevel l = string_to_loglevel (val);
253
254 if (l != L_NONE)
255 llevel = l;
256 else
257 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
258 }
259 else if (!strcmp (var, "ip-proto"))
260 ip_proto = atoi (val);
261 else if (!strcmp (var, "icmp-type"))
262 {
263#if ENABLE_ICMP
264 icmp_type = atoi (val);
265#endif
266 }
267
268 // per config
269 else if (!strcmp (var, "node"))
270 {
271 default_node.id++;
272
273 node = new conf_node (default_node);
274
275 nodes.push_back (node);
276
277 node->nodename = strdup (val);
278
279 {
280 char *fname;
281 FILE *f;
282
283 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
284
285 f = fopen (fname, "r");
286 if (f)
287 {
288 node->rsa_key = RSA_new ();
289
290 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
291 {
292 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
293 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
294 exit (EXIT_FAILURE);
295 }
296
297 require (RSA_blinding_on (node->rsa_key, 0));
298
299 fclose (f);
300 }
301 else
302 {
303 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
304
305 if (need_keys)
306 exit (EXIT_FAILURE);
307 }
308
309 free (fname);
310 }
311
312 if (::thisnode && !strcmp (node->nodename, ::thisnode))
313 thisnode = node;
314 }
315 else if (!strcmp (var, "private-key"))
316 free (prikeyfile), prikeyfile = strdup (val);
317 else if (!strcmp (var, "ifpersist"))
318 parse_bool (ifpersist, "ifpersist", true, false);
319 else if (!strcmp (var, "ifname"))
320 free (ifname), ifname = strdup (val);
321 else if (!strcmp (var, "rekey"))
322 rekey = atoi (val);
323 else if (!strcmp (var, "keepalive"))
324 keepalive = atoi (val);
325 else if (!strcmp (var, "mtu"))
326 mtu = atoi (val);
327 else if (!strcmp (var, "if-up"))
328 free (script_if_up), script_if_up = strdup (val);
329 else if (!strcmp (var, "node-up"))
330 free (script_node_up), script_node_up = strdup (val);
331 else if (!strcmp (var, "node-down"))
332 free (script_node_down), script_node_down = strdup (val);
333 else if (!strcmp (var, "pid-file"))
334 free (pidfilename), pidfilename = strdup (val);
335 else if (!strcmp (var, "dns-forw-host"))
336 {
337#if ENABLE_DNS
338 free (dns_forw_host), dns_forw_host = strdup (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-forw-port"))
342 {
343#if ENABLE_DNS
344 dns_forw_port = atoi (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-timeout-factor"))
348 {
349#if ENABLE_DNS
350 dns_timeout_factor = atof (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-send-interval"))
354 {
355#if ENABLE_DNS
356 dns_send_interval = atoi (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-overlap-factor"))
360 {
361#if ENABLE_DNS
362 dns_overlap_factor = atof (val);
363#endif
364 }
365 else if (!strcmp (var, "dns-max-outstanding"))
366 {
367#if ENABLE_DNS
368 dns_max_outstanding = atoi (val);
369#endif
370 }
371 else if (!strcmp (var, "http-proxy-host"))
372 {
373#if ENABLE_HTTP_PROXY
374 free (proxy_host), proxy_host = strdup (val);
375#endif
376 }
377 else if (!strcmp (var, "http-proxy-port"))
378 {
379#if ENABLE_HTTP_PROXY
380 proxy_port = atoi (val);
381#endif
382 }
383 else if (!strcmp (var, "http-proxy-auth"))
384 {
385#if ENABLE_HTTP_PROXY
386 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
387#endif
388 }
389
390 /* node-specific, non-defaultable */
391 else if (node != &default_node && !strcmp (var, "hostname"))
392 free (node->hostname), node->hostname = strdup (val);
393
394 /* node-specific, defaultable */
395 else if (!strcmp (var, "udp-port"))
396 node->udp_port = atoi (val);
397 else if (!strcmp (var, "tcp-port"))
398 node->tcp_port = atoi (val);
399 else if (!strcmp (var, "dns-hostname"))
400 {
401#if ENABLE_DNS
402 free (node->dns_hostname), node->dns_hostname = strdup (val);
403#endif
404 }
405 else if (!strcmp (var, "dns-port"))
406 {
407#if ENABLE_DNS
408 node->dns_port = atoi (val);
409#endif
410 }
411 else if (!strcmp (var, "dns-domain"))
412 {
413#if ENABLE_DNS
414 free (node->domain), node->domain = strdup (val);
415#endif
416 }
417 else if (!strcmp (var, "if-up-data"))
418 free (node->if_up_data), node->if_up_data = strdup (val);
419 else if (!strcmp (var, "router-priority"))
420 node->routerprio = atoi (val);
421 else if (!strcmp (var, "max-retry"))
422 node->max_retry = atoi (val);
423 else if (!strcmp (var, "connect"))
424 {
425 if (!strcmp (val, "ondemand"))
426 node->connectmode = conf_node::C_ONDEMAND;
427 else if (!strcmp (val, "never"))
428 node->connectmode = conf_node::C_NEVER;
429 else if (!strcmp (val, "always"))
430 node->connectmode = conf_node::C_ALWAYS;
431 else if (!strcmp (val, "disabled"))
432 node->connectmode = conf_node::C_DISABLED;
433 else
434 slog (L_WARN,
435 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
436 var, fname, lineno);
437 }
438 else if (!strcmp (var, "inherit-tos"))
439 parse_bool (node->inherit_tos, "inherit-tos", true, false);
440 else if (!strcmp (var, "compress"))
441 parse_bool (node->compress, "compress", true, false);
442 // all these bool options really really cost a lot of executable size!
443 else if (!strcmp (var, "enable-tcp"))
444 {
445#if ENABLE_TCP
446 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
447#endif
448 }
449 else if (!strcmp (var, "enable-icmp"))
450 {
451#if ENABLE_ICMP
452 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
453#endif
454 }
455 else if (!strcmp (var, "enable-dns"))
456 {
457#if ENABLE_DNS
458 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
459#endif
460 }
461 else if (!strcmp (var, "enable-udp"))
462 {
463 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
464 }
465 else if (!strcmp (var, "enable-rawip"))
466 {
467 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
468 }
469
470 // unknown or misplaced
471 else
472 slog (L_WARN,
473 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
474 var, fname, lineno);
475 } 541 }
476 542
477 fclose (f); 543 fclose (f);
544
545 parse_argv ();
478 } 546 }
479 else 547 else
480 { 548 {
481 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 549 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
482 exit (EXIT_FAILURE); 550 exit (EXIT_FAILURE);
483 } 551 }
484 552
485 free (fname); 553 free (fname);
486 554
487 fname = config_filename (prikeyfile, "hostkey"); 555 fname = conf.config_filename (conf.prikeyfile, "hostkey");
488 556
489 f = fopen (fname, "r"); 557 f = fopen (fname, "r");
490 if (f) 558 if (f)
491 { 559 {
492 rsa_key = RSA_new (); 560 conf.rsa_key = RSA_new ();
493 561
494 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 562 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
495 { 563 {
496 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 564 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
497 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 565 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
498 exit (EXIT_FAILURE); 566 exit (EXIT_FAILURE);
499 } 567 }
500 568
501 require (RSA_blinding_on (rsa_key, 0)); 569 require (RSA_blinding_on (conf.rsa_key, 0));
502 570
503 fclose (f); 571 fclose (f);
504 } 572 }
505 else 573 else
506 { 574 {
… …
509 if (need_keys) 577 if (need_keys)
510 exit (EXIT_FAILURE); 578 exit (EXIT_FAILURE);
511 } 579 }
512 580
513 if (need_keys && ::thisnode 581 if (need_keys && ::thisnode
514 && rsa_key && thisnode && thisnode->rsa_key) 582 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
515 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 583 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
516 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 584 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
517 { 585 {
518 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 586 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
519 exit (EXIT_FAILURE); 587 exit (EXIT_FAILURE);
520 } 588 }
521 589

Diff Legend

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