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.45 by pcg, Fri Aug 8 16:48:00 2008 UTC vs.
Revision 1.57 by root, Sat Dec 17 22:05:34 2011 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
… …
57char *thisnode; 57char *thisnode;
58char *identname; 58char *identname;
59 59
60struct configuration conf; 60struct configuration conf;
61 61
62u8
62u8 best_protocol (u8 protset) 63best_protocol (u8 protset)
63{ 64{
65#if 1//D2
66 if (protset & PROT_IPv42 ) return PROT_IPv42;
67#endif
64 if (protset & PROT_IPv4 ) return PROT_IPv4; 68 if (protset & PROT_IPv4 ) return PROT_IPv4;
65 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 69 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
66 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 70 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
67 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 71 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 72 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
69 73
70 return 0; 74 return 0;
71} 75}
72 76
77const char *
73const char *strprotocol (u8 protocol) 78strprotocol (u8 protocol)
74{ 79{
80#if 1//D2
81 if (protocol & PROT_IPv42 ) return "rawip2";
82#endif
75 if (protocol & PROT_IPv4 ) return "rawip"; 83 if (protocol & PROT_IPv4 ) return "rawip";
76 if (protocol & PROT_ICMPv4) return "icmp"; 84 if (protocol & PROT_ICMPv4) return "icmp";
77 if (protocol & PROT_UDPv4 ) return "udp"; 85 if (protocol & PROT_UDPv4 ) return "udp";
78 if (protocol & PROT_TCPv4 ) return "tcp"; 86 if (protocol & PROT_TCPv4 ) return "tcp";
79 if (protocol & PROT_DNSv4 ) return "dns"; 87 if (protocol & PROT_DNSv4 ) return "dns";
… …
92 100
93 return false; 101 return false;
94} 102}
95 103
96bool 104bool
97conf_node::can_direct (struct conf_node *other) 105conf_node::may_direct (struct conf_node *other)
98{ 106{
99 if (match_list (allow_direct, other->nodename)) 107 if (match_list (allow_direct, other->nodename))
100 return true; 108 return true;
101 109
102 if (match_list (deny_direct, other->nodename)) 110 if (match_list (deny_direct, other->nodename))
103 return false; 111 return false;
104 112
105 return true; 113 return true;
106}
107
108void
109conf_node::print ()
110{
111 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
112 id,
113 id >> 8, id & 0xff,
114 compress ? 'Y' : 'N',
115 connectmode == C_ONDEMAND ? "ondemand" :
116 connectmode == C_NEVER ? "never" :
117 connectmode == C_ALWAYS ? "always" : "",
118 nodename,
119 hostname ? hostname : "",
120 hostname ? ":" : "",
121 hostname ? udp_port : 0
122 );
123} 114}
124 115
125conf_node::~conf_node () 116conf_node::~conf_node ()
126{ 117{
127#if 0 118#if 0
… …
138 free (dns_hostname); 129 free (dns_hostname);
139#endif 130#endif
140#endif 131#endif
141} 132}
142 133
134void
143void configuration::init () 135configuration::init ()
144{ 136{
145 memset (this, 0, sizeof (*this)); 137 memset (this, 0, sizeof (*this));
146 138
147 mtu = DEFAULT_MTU; 139 mtu = DEFAULT_MTU;
140 nfmark = 0;
148 rekey = DEFAULT_REKEY; 141 rekey = DEFAULT_REKEY;
149 keepalive = DEFAULT_KEEPALIVE; 142 keepalive = DEFAULT_KEEPALIVE;
150 llevel = L_INFO; 143 llevel = L_INFO;
151 ip_proto = IPPROTO_GRE; 144 ip_proto = IPPROTO_GRE;
145#if 1 //D2
146 ip2_proto = 7;
147#endif
152#if ENABLE_ICMP 148#if ENABLE_ICMP
153 icmp_type = ICMP_ECHOREPLY; 149 icmp_type = ICMP_ECHOREPLY;
154#endif 150#endif
155 151
156 default_node.udp_port = DEFAULT_UDPPORT; 152 default_node.udp_port = DEFAULT_UDPPORT;
… …
164 default_node.if_up_data = strdup (""); 160 default_node.if_up_data = strdup ("");
165 161
166#if ENABLE_DNS 162#if ENABLE_DNS
167 default_node.dns_port = 0; // default is 0 == client 163 default_node.dns_port = 0; // default is 0 == client
168 164
165 dns_case_preserving = true;
169 dns_forw_host = strdup ("127.0.0.1"); 166 dns_forw_host = strdup ("127.0.0.1");
170 dns_forw_port = 53; 167 dns_forw_port = 53;
171 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 168 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
172 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 169 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
173 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 170 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
… …
175#endif 172#endif
176 173
177 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 174 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
178} 175}
179 176
177void
180void configuration::cleanup() 178configuration::cleanup ()
181{ 179{
182 if (rsa_key) 180 if (rsa_key)
183 RSA_free (rsa_key); 181 RSA_free (rsa_key);
184 182
185 rsa_key = 0; 183 rsa_key = 0;
186 184
187 free (pidfilename); pidfilename = 0; 185 free (pidfilename); pidfilename = 0;
188 free (ifname); ifname = 0; 186 free (ifname); ifname = 0;
189#if ENABLE_HTTP_PROXY 187#if ENABLE_HTTP_PROXY
190 free (proxy_host); proxy_host = 0; 188 free (proxy_host); proxy_host = 0;
191 free (proxy_auth); proxy_auth = 0; 189 free (proxy_auth); proxy_auth = 0;
192#endif 190#endif
193#if ENABLE_DNS 191#if ENABLE_DNS
194 free (dns_forw_host); dns_forw_host = 0; 192 free (dns_forw_host); dns_forw_host = 0;
195#endif 193#endif
194 free (script_if_up); script_if_up = 0;
195 free (script_node_up); script_node_up = 0;
196 free (script_node_change); script_node_change = 0;
197 free (script_node_down); script_node_down = 0;
196} 198}
197 199
198void 200void
199configuration::clear () 201configuration::clear ()
200{ 202{
… …
204 nodes.clear (); 206 nodes.clear ();
205 207
206 cleanup (); 208 cleanup ();
207 init (); 209 init ();
208} 210}
211
212//static bool
213//is_true (const char *name)
214//{
215 //re
216//}
209 217
210#define parse_bool(target,name,trueval,falseval) do { \ 218#define parse_bool(target,name,trueval,falseval) do { \
211 if (!strcmp (val, "yes")) target = trueval; \ 219 if (!strcmp (val, "yes")) target = trueval; \
212 else if (!strcmp (val, "no")) target = falseval; \ 220 else if (!strcmp (val, "no")) target = falseval; \
213 else if (!strcmp (val, "true")) target = trueval; \ 221 else if (!strcmp (val, "true")) target = trueval; \
214 else if (!strcmp (val, "false")) target = falseval; \ 222 else if (!strcmp (val, "false")) target = falseval; \
215 else if (!strcmp (val, "on")) target = trueval; \ 223 else if (!strcmp (val, "on")) target = trueval; \
216 else if (!strcmp (val, "off")) target = falseval; \ 224 else if (!strcmp (val, "off")) target = falseval; \
217 else \ 225 else \
218 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 226 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
219} while (0) 227} while (0)
220 228
221const char * 229const char *
222configuration_parser::parse_line (char *line) 230configuration_parser::parse_line (char *line)
223{ 231{
… …
241 return 0; /* comment: ignore */ 249 return 0; /* comment: ignore */
242 250
243 char *val = strtok (NULL, "\t\n\r ="); 251 char *val = strtok (NULL, "\t\n\r =");
244 252
245 if (!val || val[0] == '#') 253 if (!val || val[0] == '#')
246 return _("no value given for variable. (ignored)"); 254 return _("no value given for variable, ignored");
247 255
248 if (!strcmp (var, "on")) 256 else if (!strcmp (var, "on"))
249 { 257 {
250 if (!::thisnode 258 if (::thisnode
251 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 259 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
252 || !strcmp (val, ::thisnode)) 260 || !strcmp (val, ::thisnode)))
253 return parse_line (strtok (NULL, "\n\r")); 261 return parse_line (strtok (NULL, "\n\r"));
254 else 262 }
255 return 0; 263
264 else if (!strcmp (var, "include"))
265 {
266 char *fname = conf.config_filename (val);
267 parse_file (fname);
268 free (fname);
256 } 269 }
257 270
258 // truly global 271 // truly global
259 if (!strcmp (var, "loglevel")) 272 else if (!strcmp (var, "loglevel"))
260 { 273 {
261 loglevel l = string_to_loglevel (val); 274 loglevel l = string_to_loglevel (val);
262 275
263 if (l == L_NONE) 276 if (l == L_NONE)
264 return _("unknown loglevel. (skipping)"); 277 return _("unknown loglevel, ignored");
265 } 278 }
266 else if (!strcmp (var, "ip-proto")) 279 else if (!strcmp (var, "ip-proto"))
267 conf.ip_proto = atoi (val); 280 conf.ip_proto = atoi (val);
281#if 1 //D2
282 else if (!strcmp (var, "ip2-proto"))
283 conf.ip2_proto = atoi (val);
284#endif
268 else if (!strcmp (var, "icmp-type")) 285 else if (!strcmp (var, "icmp-type"))
269 { 286 {
270#if ENABLE_ICMP 287#if ENABLE_ICMP
271 conf.icmp_type = atoi (val); 288 conf.icmp_type = atoi (val);
272#endif 289#endif
… …
328 conf.rekey = atoi (val); 345 conf.rekey = atoi (val);
329 else if (!strcmp (var, "keepalive")) 346 else if (!strcmp (var, "keepalive"))
330 conf.keepalive = atoi (val); 347 conf.keepalive = atoi (val);
331 else if (!strcmp (var, "mtu")) 348 else if (!strcmp (var, "mtu"))
332 conf.mtu = atoi (val); 349 conf.mtu = atoi (val);
350 else if (!strcmp (var, "nfmark"))
351 conf.nfmark = atoi (val);
333 else if (!strcmp (var, "if-up")) 352 else if (!strcmp (var, "if-up"))
334 free (conf.script_if_up), conf.script_if_up = strdup (val); 353 free (conf.script_if_up), conf.script_if_up = strdup (val);
335 else if (!strcmp (var, "node-up")) 354 else if (!strcmp (var, "node-up"))
336 free (conf.script_node_up), conf.script_node_up = strdup (val); 355 free (conf.script_node_up), conf.script_node_up = strdup (val);
356 else if (!strcmp (var, "node-change"))
357 free (conf.script_node_change), conf.script_node_change = strdup (val);
337 else if (!strcmp (var, "node-down")) 358 else if (!strcmp (var, "node-down"))
338 free (conf.script_node_down), conf.script_node_down = strdup (val); 359 free (conf.script_node_down), conf.script_node_down = strdup (val);
339 else if (!strcmp (var, "pid-file")) 360 else if (!strcmp (var, "pid-file"))
340 free (conf.pidfilename), conf.pidfilename = strdup (val); 361 free (conf.pidfilename), conf.pidfilename = strdup (val);
341 else if (!strcmp (var, "dns-forw-host")) 362 else if (!strcmp (var, "dns-forw-host"))
… …
370 } 391 }
371 else if (!strcmp (var, "dns-max-outstanding")) 392 else if (!strcmp (var, "dns-max-outstanding"))
372 { 393 {
373#if ENABLE_DNS 394#if ENABLE_DNS
374 conf.dns_max_outstanding = atoi (val); 395 conf.dns_max_outstanding = atoi (val);
396#endif
397 }
398 else if (!strcmp (var, "dns-case-preserving"))
399 {
400#if ENABLE_DNS
401 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
375#endif 402#endif
376 } 403 }
377 else if (!strcmp (var, "http-proxy-host")) 404 else if (!strcmp (var, "http-proxy-host"))
378 { 405 {
379#if ENABLE_HTTP_PROXY 406#if ENABLE_HTTP_PROXY
… …
435 else if (!strcmp (val, "always")) 462 else if (!strcmp (val, "always"))
436 node->connectmode = conf_node::C_ALWAYS; 463 node->connectmode = conf_node::C_ALWAYS;
437 else if (!strcmp (val, "disabled")) 464 else if (!strcmp (val, "disabled"))
438 node->connectmode = conf_node::C_DISABLED; 465 node->connectmode = conf_node::C_DISABLED;
439 else 466 else
440 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 467 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
441 } 468 }
442 else if (!strcmp (var, "inherit-tos")) 469 else if (!strcmp (var, "inherit-tos"))
443 parse_bool (node->inherit_tos, "inherit-tos", true, false); 470 parse_bool (node->inherit_tos, "inherit-tos", true, false);
444 else if (!strcmp (var, "compress")) 471 else if (!strcmp (var, "compress"))
445 parse_bool (node->compress, "compress", true, false); 472 parse_bool (node->compress, "compress", true, false);
… …
468 } 495 }
469 else if (!strcmp (var, "enable-rawip")) 496 else if (!strcmp (var, "enable-rawip"))
470 { 497 {
471 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 498 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
472 } 499 }
500#if 1//D2
501 else if (!strcmp (var, "enable-rawip2"))
502 {
503 u8 v; parse_bool (v, "enable-rawip2", PROT_IPv42, 0); node->protocols = (node->protocols & ~PROT_IPv42 ) | v;
504 }
505#endif
473 else if (!strcmp (var, "allow-direct")) 506 else if (!strcmp (var, "allow-direct"))
474 node->allow_direct.push_back (strdup (val)); 507 node->allow_direct.push_back (strdup (val));
475 else if (!strcmp (var, "deny-direct")) 508 else if (!strcmp (var, "deny-direct"))
476 node->deny_direct.push_back (strdup (val)); 509 node->deny_direct.push_back (strdup (val));
477 else if (!strcmp (var, "max-ttl")) 510 else if (!strcmp (var, "max-ttl"))
478 node->max_ttl = atof (val); 511 node->max_ttl = atof (val);
479 else if (!strcmp (var, "max-queue")) 512 else if (!strcmp (var, "max-queue"))
480 {
481 node->max_queue = atoi (val); 513 node->max_queue = atoi (val);
482
483 if (node->max_queue < 1)
484 node->max_queue = 1;
485 }
486 514
487 // unknown or misplaced 515 // unknown or misplaced
488 else 516 else
489 return _("unknown configuration directive. (ignored)"); 517 return _("unknown configuration directive - ignored");
490 518
491 return 0; 519 return 0;
492} 520}
493 521
522void
523conf_node::finalise ()
524{
525 if (max_queue < 1)
526 {
527 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
528 max_queue = 1;
529 }
530
531 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
532 {
533 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
534 connectmode = C_ALWAYS;
535 }
536}
537
538void
494void configuration_parser::parse_argv () 539configuration_parser::parse_argv ()
495{ 540{
496 for (int i = 0; i < argc; ++i) 541 for (int i = 0; i < argc; ++i)
497 { 542 {
498 char *v = argv [i]; 543 char *v = argv [i];
499 544
… …
520 if (warn) 565 if (warn)
521 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 566 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
522 567
523 *v = 0; 568 *v = 0;
524 } 569 }
570 }
571}
572
573void
574configuration_parser::parse_file (const char *fname)
575{
576 if (FILE *f = fopen (fname, "r"))
577 {
578 char line [2048];
579 int lineno = 0;
580
581 while (fgets (line, sizeof (line), f))
582 {
583 lineno++;
584
585 const char *warn = parse_line (line);
586
587 if (warn)
588 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
589 }
590
591 fclose (f);
592
593 parse_argv ();
594 }
595 else
596 {
597 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
598 exit (EXIT_FAILURE);
525 } 599 }
526} 600}
527 601
528configuration_parser::configuration_parser (configuration &conf, 602configuration_parser::configuration_parser (configuration &conf,
529 bool need_keys, 603 bool need_keys,
530 int argc, 604 int argc,
531 char **argv) 605 char **argv)
532: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 606: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
533{ 607{
534 char *fname; 608 char *fname;
535 FILE *f;
536 609
537 conf.clear (); 610 conf.clear ();
611 node = &conf.default_node;
538 612
539 asprintf (&fname, "%s/gvpe.conf", confbase); 613 asprintf (&fname, "%s/gvpe.conf", confbase);
540 f = fopen (fname, "r"); 614 parse_file (fname);
541
542 if (f)
543 {
544 char line[16384];
545 int lineno = 0;
546 node = &conf.default_node;
547
548 while (fgets (line, sizeof (line), f))
549 {
550 lineno++;
551
552 const char *warn = parse_line (line);
553
554 if (warn)
555 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
556 }
557
558 fclose (f);
559
560 parse_argv ();
561 }
562 else
563 {
564 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
565 exit (EXIT_FAILURE);
566 }
567
568 free (fname); 615 free (fname);
569 616
570 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 617 fname = conf.config_filename (conf.prikeyfile, "hostkey");
571 618
572 f = fopen (fname, "r"); 619 if (FILE *f = fopen (fname, "r"))
573 if (f)
574 { 620 {
575 conf.rsa_key = RSA_new (); 621 conf.rsa_key = RSA_new ();
576 622
577 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 623 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
578 { 624 {
… …
590 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 636 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
591 637
592 if (need_keys) 638 if (need_keys)
593 exit (EXIT_FAILURE); 639 exit (EXIT_FAILURE);
594 } 640 }
641
642 free (fname);
595 643
596 if (need_keys && ::thisnode 644 if (need_keys && ::thisnode
597 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 645 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
598 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 646 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
599 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) 647 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
600 { 648 {
601 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 649 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
602 exit (EXIT_FAILURE); 650 exit (EXIT_FAILURE);
603 } 651 }
604 652
605 free (fname); 653 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
654 (*i)->finalise ();
606} 655}
607 656
657char *
608char *configuration::config_filename (const char *name, const char *dflt) 658configuration::config_filename (const char *name, const char *dflt)
609{ 659{
610 char *fname; 660 char *fname;
611 661
612 asprintf (&fname, name ? name : dflt, ::thisnode); 662 asprintf (&fname, name ? name : dflt, ::thisnode);
613 663
… …
617 asprintf (&fname, "%s/%s", confbase, rname); 667 asprintf (&fname, "%s/%s", confbase, rname);
618 free (rname); 668 free (rname);
619 } 669 }
620 670
621 return fname; 671 return fname;
672}
673
674void
675conf_node::print ()
676{
677 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
678 id,
679 id >> 8, id & 0xff,
680 compress ? 'Y' : 'N',
681 connectmode == C_ONDEMAND ? "ondemand"
682 : connectmode == C_NEVER ? "never"
683 : connectmode == C_ALWAYS ? "always"
684 : connectmode == C_DISABLED ? "disabled"
685 : "",
686 nodename,
687 protocols,
688 hostname ? hostname : "",
689 hostname ? ":" : "",
690 hostname ? udp_port : 0
691 );
622} 692}
623 693
624void 694void
625configuration::print () 695configuration::print ()
626{ 696{
… …
633 printf (_("interface: %s\n"), ifname); 703 printf (_("interface: %s\n"), ifname);
634 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 704 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
635 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 705 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
636 printf ("\n"); 706 printf ("\n");
637 707
638 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 708 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
639 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 709 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
640 710
641 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 711 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
642 (*i)->print (); 712 (*i)->print ();
643 713
644 printf ("\n"); 714 printf ("\n");
… …
654configuration::~configuration () 724configuration::~configuration ()
655{ 725{
656 cleanup (); 726 cleanup ();
657} 727}
658 728
659

Diff Legend

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