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.52 by root, Tue Feb 8 23:11:35 2011 UTC vs.
Revision 1.65 by root, Fri Oct 11 07:56:07 2013 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.C -- configuration code
3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
38#include <errno.h> 38#include <errno.h>
39#include <netdb.h> 39#include <netdb.h>
40#include <sys/stat.h> 40#include <sys/stat.h>
41#include <sys/types.h> 41#include <sys/types.h>
42#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
43 44
44#include "netcompat.h" 45#include "netcompat.h"
45 46
46#include <openssl/err.h> 47#include <openssl/err.h>
47#include <openssl/pem.h> 48#include <openssl/pem.h>
… …
103 104
104 if (match_list (deny_direct, other->nodename)) 105 if (match_list (deny_direct, other->nodename))
105 return false; 106 return false;
106 107
107 return true; 108 return true;
108}
109
110void
111conf_node::print ()
112{
113 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
114 id,
115 id >> 8, id & 0xff,
116 compress ? 'Y' : 'N',
117 connectmode == C_ONDEMAND ? "ondemand"
118 : connectmode == C_NEVER ? "never"
119 : connectmode == C_ALWAYS ? "always"
120 : connectmode == C_DISABLED ? "disabled"
121 : "",
122 nodename,
123 hostname ? hostname : "",
124 hostname ? ":" : "",
125 hostname ? udp_port : 0
126 );
127} 109}
128 110
129conf_node::~conf_node () 111conf_node::~conf_node ()
130{ 112{
131#if 0 113#if 0
… …
170 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
171 153
172#if ENABLE_DNS 154#if ENABLE_DNS
173 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
174 156
157 dns_case_preserving = true;
175 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
176 dns_forw_port = 53; 159 dns_forw_port = 53;
177 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
178 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
179 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
180 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; 163 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
181#endif 164#endif
182 165
183 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
184} 169}
185 170
186void 171void
187configuration::cleanup () 172configuration::cleanup ()
188{ 173{
189 if (rsa_key) 174 if (rsa_key)
190 RSA_free (rsa_key); 175 RSA_free (rsa_key);
191 176
192 rsa_key = 0; 177 rsa_key = 0;
193 178
179 free (seed_dev); seed_dev = 0;
194 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
195 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
196#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
197 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
198 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
199#endif 185#endif
200#if ENABLE_DNS 186#if ENABLE_DNS
201 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
202#endif 188#endif
189 free (change_root); change_root = 0;
203 free (script_if_up); script_if_up = 0; 190 free (script_if_up); script_if_up = 0;
204 free (script_node_up); script_node_up = 0; 191 free (script_node_up); script_node_up = 0;
205 free (script_node_change); script_node_change = 0; 192 free (script_node_change); script_node_change = 0;
206 free (script_node_down); script_node_down = 0; 193 free (script_node_down); script_node_down = 0;
207} 194}
… …
215 nodes.clear (); 202 nodes.clear ();
216 203
217 cleanup (); 204 cleanup ();
218 init (); 205 init ();
219} 206}
207
208conf_node *
209configuration::find_node (const char *name)
210{
211 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
212 if (!strcmp ((*i)->nodename, name))
213 return *i;
214
215 return 0;
216}
217
218//static bool
219//is_true (const char *name)
220//{
221 //re
222//}
220 223
221#define parse_bool(target,name,trueval,falseval) do { \ 224#define parse_bool(target,name,trueval,falseval) do { \
222 if (!strcmp (val, "yes")) target = trueval; \ 225 if (!strcmp (val, "yes")) target = trueval; \
223 else if (!strcmp (val, "no")) target = falseval; \ 226 else if (!strcmp (val, "no")) target = falseval; \
224 else if (!strcmp (val, "true")) target = trueval; \ 227 else if (!strcmp (val, "true")) target = trueval; \
225 else if (!strcmp (val, "false")) target = falseval; \ 228 else if (!strcmp (val, "false")) target = falseval; \
226 else if (!strcmp (val, "on")) target = trueval; \ 229 else if (!strcmp (val, "on")) target = trueval; \
227 else if (!strcmp (val, "off")) target = falseval; \ 230 else if (!strcmp (val, "off")) target = falseval; \
228 else \ 231 else \
229 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 232 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
230} while (0) 233} while (0)
231 234
232const char * 235const char *
233configuration_parser::parse_line (char *line) 236configuration_parser::parse_line (char *line)
234{ 237{
… …
249 return 0; /* no tokens on this line */ 252 return 0; /* no tokens on this line */
250 253
251 if (var[0] == '#') 254 if (var[0] == '#')
252 return 0; /* comment: ignore */ 255 return 0; /* comment: ignore */
253 256
257 if (!strcmp (var, "global"))
258 {
259 node = &conf.default_node;
260 return 0;
261 }
262
254 char *val = strtok (NULL, "\t\n\r ="); 263 char *val = strtok (NULL, "\t\n\r =");
255 264
256 if (!val || val[0] == '#') 265 if (!val || val[0] == '#')
257 return _("no value given for variable. (ignored)"); 266 return _("no value given for variable, ignored");
258 267
259 if (!strcmp (var, "on")) 268 else if (!strcmp (var, "on"))
260 { 269 {
261 if (!::thisnode 270 if (::thisnode
262 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 271 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
263 || !strcmp (val, ::thisnode)) 272 || !strcmp (val, ::thisnode)))
264 return parse_line (strtok (NULL, "\n\r")); 273 return parse_line (strtok (NULL, "\n\r"));
265 else 274 }
266 return 0; 275
276 else if (!strcmp (var, "include"))
277 {
278 char *fname = conf.config_filename (val);
279 parse_file (fname);
280 free (fname);
267 } 281 }
268 282
269 // truly global 283 // truly global
270 if (!strcmp (var, "loglevel")) 284 else if (!strcmp (var, "loglevel"))
271 { 285 {
272 loglevel l = string_to_loglevel (val); 286 loglevel l = string_to_loglevel (val);
273 287
274 if (l == L_NONE) 288 if (l == L_NONE)
275 return _("unknown loglevel. (skipping)"); 289 return _("unknown loglevel, ignored");
276 } 290 }
291 else if (!strcmp (var, "serial"))
292 strncpy (conf.serial, val, sizeof (conf.serial));
277 else if (!strcmp (var, "ip-proto")) 293 else if (!strcmp (var, "ip-proto"))
278 conf.ip_proto = atoi (val); 294 conf.ip_proto = atoi (val);
279 else if (!strcmp (var, "icmp-type")) 295 else if (!strcmp (var, "icmp-type"))
280 { 296 {
281#if ENABLE_ICMP 297#if ENABLE_ICMP
282 conf.icmp_type = atoi (val); 298 conf.icmp_type = atoi (val);
283#endif 299#endif
284 } 300 }
301 else if (!strcmp (var, "chuser"))
302 {
303 struct passwd *pw = getpwnam (val);
304 if (!pw)
305 return _("user specified for chuser not found");
285 306
286 // per config 307 conf.change_uid = pw->pw_uid;
308 conf.change_gid = pw->pw_gid;
309 }
310 else if (!strcmp (var, "chuid"))
311 conf.change_uid = atoi (val);
312 else if (!strcmp (var, "chgid"))
313 conf.change_gid = atoi (val);
314 else if (!strcmp (var, "chroot"))
315 free (conf.change_root), conf.change_root = strdup (val);
316
317 // per node
287 else if (!strcmp (var, "node")) 318 else if (!strcmp (var, "node"))
288 { 319 {
289 parse_argv (); 320 node = conf.find_node (val);
290 321
322 if (!node)
323 {
291 conf.default_node.id++; 324 conf.default_node.id++;
292 node = new conf_node (conf.default_node); 325 node = new conf_node (conf.default_node);
293 conf.nodes.push_back (node); 326 conf.nodes.push_back (node);
294 node->nodename = strdup (val); 327 node->nodename = strdup (val);
295
296 {
297 char *fname;
298 FILE *f;
299
300 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
301
302 f = fopen (fname, "r");
303 if (f)
304 {
305 node->rsa_key = RSA_new ();
306
307 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
308 {
309 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
310 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
311 exit (EXIT_FAILURE);
312 }
313
314 require (RSA_blinding_on (node->rsa_key, 0));
315
316 fclose (f);
317 } 328 }
318 else
319 {
320 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
321
322 if (need_keys)
323 exit (EXIT_FAILURE);
324 }
325
326 free (fname);
327 }
328
329 if (::thisnode && !strcmp (node->nodename, ::thisnode))
330 conf.thisnode = node;
331 } 329 }
332 else if (!strcmp (var, "private-key")) 330 else if (!strcmp (var, "private-key"))
333 free (conf.prikeyfile), conf.prikeyfile = strdup (val); 331 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
334 else if (!strcmp (var, "ifpersist")) 332 else if (!strcmp (var, "ifpersist"))
335 parse_bool (conf.ifpersist, "ifpersist", true, false); 333 parse_bool (conf.ifpersist, "ifpersist", true, false);
… …
341 conf.keepalive = atoi (val); 339 conf.keepalive = atoi (val);
342 else if (!strcmp (var, "mtu")) 340 else if (!strcmp (var, "mtu"))
343 conf.mtu = atoi (val); 341 conf.mtu = atoi (val);
344 else if (!strcmp (var, "nfmark")) 342 else if (!strcmp (var, "nfmark"))
345 conf.nfmark = atoi (val); 343 conf.nfmark = atoi (val);
344 else if (!strcmp (var, "seed-device"))
345 free (conf.seed_dev), conf.seed_dev = strdup (val);
346 else if (!strcmp (var, "seed-interval"))
347 conf.reseed = atoi (val);
346 else if (!strcmp (var, "if-up")) 348 else if (!strcmp (var, "if-up"))
347 free (conf.script_if_up), conf.script_if_up = strdup (val); 349 free (conf.script_if_up), conf.script_if_up = strdup (val);
348 else if (!strcmp (var, "node-up")) 350 else if (!strcmp (var, "node-up"))
349 free (conf.script_node_up), conf.script_node_up = strdup (val); 351 free (conf.script_node_up), conf.script_node_up = strdup (val);
350 else if (!strcmp (var, "node-change")) 352 else if (!strcmp (var, "node-change"))
… …
387 { 389 {
388#if ENABLE_DNS 390#if ENABLE_DNS
389 conf.dns_max_outstanding = atoi (val); 391 conf.dns_max_outstanding = atoi (val);
390#endif 392#endif
391 } 393 }
394 else if (!strcmp (var, "dns-case-preserving"))
395 {
396#if ENABLE_DNS
397 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
398#endif
399 }
392 else if (!strcmp (var, "http-proxy-host")) 400 else if (!strcmp (var, "http-proxy-host"))
393 { 401 {
394#if ENABLE_HTTP_PROXY 402#if ENABLE_HTTP_PROXY
395 free (conf.proxy_host), conf.proxy_host = strdup (val); 403 free (conf.proxy_host), conf.proxy_host = strdup (val);
396#endif 404#endif
… …
450 else if (!strcmp (val, "always")) 458 else if (!strcmp (val, "always"))
451 node->connectmode = conf_node::C_ALWAYS; 459 node->connectmode = conf_node::C_ALWAYS;
452 else if (!strcmp (val, "disabled")) 460 else if (!strcmp (val, "disabled"))
453 node->connectmode = conf_node::C_DISABLED; 461 node->connectmode = conf_node::C_DISABLED;
454 else 462 else
455 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 463 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
456 } 464 }
457 else if (!strcmp (var, "inherit-tos")) 465 else if (!strcmp (var, "inherit-tos"))
458 parse_bool (node->inherit_tos, "inherit-tos", true, false); 466 parse_bool (node->inherit_tos, "inherit-tos", true, false);
459 else if (!strcmp (var, "compress")) 467 else if (!strcmp (var, "compress"))
460 parse_bool (node->compress, "compress", true, false); 468 parse_bool (node->compress, "compress", true, false);
469 else if (!strcmp (var, "low-power"))
470 parse_bool (node->low_power, "low-power", true, false);
461 // all these bool options really really cost a lot of executable size! 471 // all these bool options really really cost a lot of executable size!
462 else if (!strcmp (var, "enable-tcp")) 472 else if (!strcmp (var, "enable-tcp"))
463 { 473 {
464#if ENABLE_TCP 474#if ENABLE_TCP
465 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 475 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
494 else if (!strcmp (var, "max-queue")) 504 else if (!strcmp (var, "max-queue"))
495 node->max_queue = atoi (val); 505 node->max_queue = atoi (val);
496 506
497 // unknown or misplaced 507 // unknown or misplaced
498 else 508 else
499 return _("unknown configuration directive. (ignored)"); 509 return _("unknown configuration directive - ignored");
500 510
501 return 0; 511 return 0;
502} 512}
503 513
504void 514void
… …
516 connectmode = C_ALWAYS; 526 connectmode = C_ALWAYS;
517 } 527 }
518} 528}
519 529
520void 530void
521configuration_parser::parse_argv () 531configuration_parser::parse_file (const char *fname)
522{ 532{
523 for (int i = 0; i < argc; ++i) 533 if (FILE *f = fopen (fname, "r"))
524 { 534 {
525 char *v = argv [i]; 535 char line [2048];
536 int lineno = 0;
526 537
527 if (!*v) 538 while (fgets (line, sizeof (line), f))
528 continue;
529
530 char *enode = v;
531
532 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
533 enode++;
534
535 if (*enode != '.')
536 enode = 0;
537
538 char *wnode = node == &conf.default_node
539 ? 0
540 : node->nodename;
541
542 if ((!wnode && !enode)
543 || (wnode && enode && !strncmp (wnode, v, enode - v)))
544 { 539 {
540 lineno++;
541
545 const char *warn = parse_line (enode ? enode + 1 : v); 542 const char *warn = parse_line (line);
546 543
547 if (warn) 544 if (warn)
548 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 545 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
549
550 *v = 0;
551 } 546 }
547
548 fclose (f);
549 }
550 else
551 {
552 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
553 exit (EXIT_FAILURE);
552 } 554 }
553} 555}
554 556
555configuration_parser::configuration_parser (configuration &conf, 557configuration_parser::configuration_parser (configuration &conf,
556 bool need_keys, 558 bool need_keys,
557 int argc, 559 int argc,
558 char **argv) 560 char **argv)
559: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 561: conf (conf), need_keys (need_keys), argc (argc), argv (argv)
560{ 562{
561 char *fname; 563 char *fname;
562 FILE *f;
563 564
564 conf.clear (); 565 conf.clear ();
566 node = &conf.default_node;
565 567
566 asprintf (&fname, "%s/gvpe.conf", confbase); 568 asprintf (&fname, "%s/gvpe.conf", confbase);
567 f = fopen (fname, "r"); 569 parse_file (fname);
568
569 if (f)
570 {
571 char line[16384];
572 int lineno = 0;
573 node = &conf.default_node;
574
575 while (fgets (line, sizeof (line), f))
576 {
577 lineno++;
578
579 const char *warn = parse_line (line);
580
581 if (warn)
582 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
583 }
584
585 fclose (f);
586
587 parse_argv ();
588 }
589 else
590 {
591 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
592 exit (EXIT_FAILURE);
593 }
594
595 free (fname); 570 free (fname);
596 571
597 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 572 fname = conf.config_filename (conf.prikeyfile, "hostkey");
598 573
599 f = fopen (fname, "r"); 574 if (FILE *f = fopen (fname, "r"))
600 if (f)
601 { 575 {
602 conf.rsa_key = RSA_new (); 576 conf.rsa_key = RSA_new ();
603 577
604 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 578 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
605 { 579 {
… …
612 586
613 fclose (f); 587 fclose (f);
614 } 588 }
615 else 589 else
616 { 590 {
617 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
618
619 if (need_keys) 591 if (need_keys)
592 {
593 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
620 exit (EXIT_FAILURE); 594 exit (EXIT_FAILURE);
621 }
622
623 if (need_keys && ::thisnode
624 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
625 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
626 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
627 {
628 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
629 exit (EXIT_FAILURE);
630 } 595 }
596 }
631 597
632 free (fname); 598 free (fname);
633 599
600 fname = conf.config_filename (conf.pidfilename);
601 free (conf.pidfilename); conf.pidfilename = fname;
602
634 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) 603 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
604 {
605 conf_node *node = *i;
606 char *fname;
607 FILE *f;
608
609 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
610
611 f = fopen (fname, "r");
612 if (f)
613 {
614 node->rsa_key = RSA_new ();
615
616 if (!PEM_read_RSAPublicKey (f, &node->rsa_key, NULL, NULL))
617 {
618 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
619 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
620 exit (EXIT_FAILURE);
621 }
622
623 require (RSA_blinding_on (node->rsa_key, 0));
624
625 fclose (f);
626 }
627 else
628 {
629 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
630
631 if (need_keys)
632 exit (EXIT_FAILURE);
633 }
634
635 free (fname);
636
635 (*i)->finalise (); 637 (*i)->finalise ();
638 }
639
640 if (::thisnode)
641 {
642 conf.thisnode = conf.find_node (::thisnode);
643
644 if (need_keys)
645 {
646 if (!conf.thisnode)
647 {
648 slog (L_NOTICE, _("local node ('%s') not found in config file, aborting."), ::thisnode);
649 exit (EXIT_FAILURE);
650 }
651
652 if (conf.rsa_key && conf.thisnode->rsa_key)
653 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
654 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
655 {
656 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
657 exit (EXIT_FAILURE);
658 }
659 }
660 }
661
662 parse_argv ();
663}
664
665void
666configuration_parser::parse_argv ()
667{
668 for (int i = 0; i < argc; ++i)
669 {
670 char *v = argv [i];
671
672 if (!*v)
673 continue;
674
675 char *enode = v;
676
677 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
678 enode++;
679
680 if (*enode != '.')
681 enode = 0;
682
683 if (enode)
684 {
685 char *val = strdup (v);
686 val [enode - v] = 0;
687 node = conf.find_node (val);
688 free (val);
689
690 if (!node)
691 {
692 slog (L_WARN, _("command line option '%s' refers to unknown node, ignoring."), v);
693 continue;
694 }
695 }
696 else
697 node = &conf.default_node;
698
699 const char *warn = parse_line (enode ? enode + 1 : v);
700
701 if (warn)
702 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
703 }
636} 704}
637 705
638char * 706char *
639configuration::config_filename (const char *name, const char *dflt) 707configuration::config_filename (const char *name, const char *dflt)
640{ 708{
641 char *fname; 709 char *fname;
642 710
643 asprintf (&fname, name ? name : dflt, ::thisnode); 711 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
644 712
645 if (!ABSOLUTE_PATH (fname)) 713 if (!ABSOLUTE_PATH (fname))
646 { 714 {
647 char *rname = fname; 715 char *rname = fname;
648 asprintf (&fname, "%s/%s", confbase, rname); 716 asprintf (&fname, "%s/%s", confbase, rname);
649 free (rname); 717 free (rname);
650 } 718 }
651 719
652 return fname; 720 return fname;
721}
722
723void
724conf_node::print ()
725{
726 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
727 id,
728 id >> 8, id & 0xff,
729 compress ? 'Y' : 'N',
730 connectmode == C_ONDEMAND ? "ondemand"
731 : connectmode == C_NEVER ? "never"
732 : connectmode == C_ALWAYS ? "always"
733 : connectmode == C_DISABLED ? "disabled"
734 : "",
735 nodename,
736 protocols,
737 hostname ? hostname : "",
738 hostname ? ":" : "",
739 hostname ? udp_port : 0
740 );
653} 741}
654 742
655void 743void
656configuration::print () 744configuration::print ()
657{ 745{
… …
664 printf (_("interface: %s\n"), ifname); 752 printf (_("interface: %s\n"), ifname);
665 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 753 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
666 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 754 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
667 printf ("\n"); 755 printf ("\n");
668 756
669 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 757 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
670 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 758 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
671 759
672 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 760 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
673 (*i)->print (); 761 (*i)->print ();
674 762
675 printf ("\n"); 763 printf ("\n");

Diff Legend

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