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.48 by pcg, Sun Aug 10 02:49:27 2008 UTC vs.
Revision 1.60 by root, Sat Jul 13 04:10:29 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>
… …
57char *thisnode; 58char *thisnode;
58char *identname; 59char *identname;
59 60
60struct configuration conf; 61struct configuration conf;
61 62
63u8
62u8 best_protocol (u8 protset) 64best_protocol (u8 protset)
63{ 65{
64 if (protset & PROT_IPv4 ) return PROT_IPv4; 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
65 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
66 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
67 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
69 71
70 return 0; 72 return 0;
71} 73}
72 74
75const char *
73const char *strprotocol (u8 protocol) 76strprotocol (u8 protocol)
74{ 77{
75 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
76 if (protocol & PROT_ICMPv4) return "icmp"; 79 if (protocol & PROT_ICMPv4) return "icmp";
77 if (protocol & PROT_UDPv4 ) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
78 if (protocol & PROT_TCPv4 ) return "tcp"; 81 if (protocol & PROT_TCPv4 ) return "tcp";
… …
103 return false; 106 return false;
104 107
105 return true; 108 return true;
106} 109}
107 110
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 : connectmode == C_DISABLED ? "disabled"
119 : "",
120 nodename,
121 hostname ? hostname : "",
122 hostname ? ":" : "",
123 hostname ? udp_port : 0
124 );
125}
126
127conf_node::~conf_node () 111conf_node::~conf_node ()
128{ 112{
129#if 0 113#if 0
130 // does not work, because string pointers etc. are shared 114 // does not work, because string pointers etc. are shared
131 // is not called, however 115 // is not called, however
… …
140 free (dns_hostname); 124 free (dns_hostname);
141#endif 125#endif
142#endif 126#endif
143} 127}
144 128
129void
145void configuration::init () 130configuration::init ()
146{ 131{
147 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
148 133
149 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
135 nfmark = 0;
150 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
151 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
152 llevel = L_INFO; 138 llevel = L_INFO;
153 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
154#if ENABLE_ICMP 140#if ENABLE_ICMP
… …
166 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
167 153
168#if ENABLE_DNS 154#if ENABLE_DNS
169 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
170 156
157 dns_case_preserving = true;
171 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
172 dns_forw_port = 53; 159 dns_forw_port = 53;
173 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
174 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
175 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
176 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; 163 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
177#endif 164#endif
178 165
179 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
180} 169}
181 170
171void
182void configuration::cleanup() 172configuration::cleanup ()
183{ 173{
184 if (rsa_key) 174 if (rsa_key)
185 RSA_free (rsa_key); 175 RSA_free (rsa_key);
186 176
187 rsa_key = 0; 177 rsa_key = 0;
188 178
179 free (seed_dev); seed_dev = 0;
189 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
190 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
191#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
192 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
193 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
194#endif 185#endif
195#if ENABLE_DNS 186#if ENABLE_DNS
196 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
197#endif 188#endif
189 free (change_root); change_root = 0;
190 free (script_if_up); script_if_up = 0;
191 free (script_node_up); script_node_up = 0;
192 free (script_node_change); script_node_change = 0;
193 free (script_node_down); script_node_down = 0;
198} 194}
199 195
200void 196void
201configuration::clear () 197configuration::clear ()
202{ 198{
… …
206 nodes.clear (); 202 nodes.clear ();
207 203
208 cleanup (); 204 cleanup ();
209 init (); 205 init ();
210} 206}
207
208//static bool
209//is_true (const char *name)
210//{
211 //re
212//}
211 213
212#define parse_bool(target,name,trueval,falseval) do { \ 214#define parse_bool(target,name,trueval,falseval) do { \
213 if (!strcmp (val, "yes")) target = trueval; \ 215 if (!strcmp (val, "yes")) target = trueval; \
214 else if (!strcmp (val, "no")) target = falseval; \ 216 else if (!strcmp (val, "no")) target = falseval; \
215 else if (!strcmp (val, "true")) target = trueval; \ 217 else if (!strcmp (val, "true")) target = trueval; \
216 else if (!strcmp (val, "false")) target = falseval; \ 218 else if (!strcmp (val, "false")) target = falseval; \
217 else if (!strcmp (val, "on")) target = trueval; \ 219 else if (!strcmp (val, "on")) target = trueval; \
218 else if (!strcmp (val, "off")) target = falseval; \ 220 else if (!strcmp (val, "off")) target = falseval; \
219 else \ 221 else \
220 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 222 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
221} while (0) 223} while (0)
222 224
223const char * 225const char *
224configuration_parser::parse_line (char *line) 226configuration_parser::parse_line (char *line)
225{ 227{
… …
243 return 0; /* comment: ignore */ 245 return 0; /* comment: ignore */
244 246
245 char *val = strtok (NULL, "\t\n\r ="); 247 char *val = strtok (NULL, "\t\n\r =");
246 248
247 if (!val || val[0] == '#') 249 if (!val || val[0] == '#')
248 return _("no value given for variable. (ignored)"); 250 return _("no value given for variable, ignored");
249 251
250 if (!strcmp (var, "on")) 252 else if (!strcmp (var, "on"))
251 { 253 {
252 if (!::thisnode 254 if (::thisnode
253 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 255 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
254 || !strcmp (val, ::thisnode)) 256 || !strcmp (val, ::thisnode)))
255 return parse_line (strtok (NULL, "\n\r")); 257 return parse_line (strtok (NULL, "\n\r"));
256 else 258 }
257 return 0; 259
260 else if (!strcmp (var, "include"))
261 {
262 char *fname = conf.config_filename (val);
263 parse_file (fname);
264 free (fname);
258 } 265 }
259 266
260 // truly global 267 // truly global
261 if (!strcmp (var, "loglevel")) 268 else if (!strcmp (var, "loglevel"))
262 { 269 {
263 loglevel l = string_to_loglevel (val); 270 loglevel l = string_to_loglevel (val);
264 271
265 if (l == L_NONE) 272 if (l == L_NONE)
266 return _("unknown loglevel. (skipping)"); 273 return _("unknown loglevel, ignored");
267 } 274 }
268 else if (!strcmp (var, "ip-proto")) 275 else if (!strcmp (var, "ip-proto"))
269 conf.ip_proto = atoi (val); 276 conf.ip_proto = atoi (val);
270 else if (!strcmp (var, "icmp-type")) 277 else if (!strcmp (var, "icmp-type"))
271 { 278 {
272#if ENABLE_ICMP 279#if ENABLE_ICMP
273 conf.icmp_type = atoi (val); 280 conf.icmp_type = atoi (val);
274#endif 281#endif
275 } 282 }
283 else if (!strcmp (var, "chuser"))
284 {
285 struct passwd *pw = getpwnam (val);
286 if (!pw)
287 return _("user specified for chuser not found");
276 288
277 // per config 289 conf.change_uid = pw->pw_uid;
290 conf.change_gid = pw->pw_gid;
291 }
292 else if (!strcmp (var, "chuid"))
293 conf.change_uid = atoi (val);
294 else if (!strcmp (var, "chgid"))
295 conf.change_gid = atoi (val);
296 else if (!strcmp (var, "chroot"))
297 free (conf.change_root), conf.change_root = strdup (val);
298
299 // per node
278 else if (!strcmp (var, "node")) 300 else if (!strcmp (var, "node"))
279 { 301 {
280 parse_argv (); 302 parse_argv ();
281 303
282 conf.default_node.id++; 304 conf.default_node.id++;
… …
330 conf.rekey = atoi (val); 352 conf.rekey = atoi (val);
331 else if (!strcmp (var, "keepalive")) 353 else if (!strcmp (var, "keepalive"))
332 conf.keepalive = atoi (val); 354 conf.keepalive = atoi (val);
333 else if (!strcmp (var, "mtu")) 355 else if (!strcmp (var, "mtu"))
334 conf.mtu = atoi (val); 356 conf.mtu = atoi (val);
357 else if (!strcmp (var, "nfmark"))
358 conf.nfmark = atoi (val);
359 else if (!strcmp (var, "seed-device"))
360 free (conf.seed_dev), conf.seed_dev = strdup (val);
361 else if (!strcmp (var, "seed-interval"))
362 conf.reseed = atoi (val);
335 else if (!strcmp (var, "if-up")) 363 else if (!strcmp (var, "if-up"))
336 free (conf.script_if_up), conf.script_if_up = strdup (val); 364 free (conf.script_if_up), conf.script_if_up = strdup (val);
337 else if (!strcmp (var, "node-up")) 365 else if (!strcmp (var, "node-up"))
338 free (conf.script_node_up), conf.script_node_up = strdup (val); 366 free (conf.script_node_up), conf.script_node_up = strdup (val);
367 else if (!strcmp (var, "node-change"))
368 free (conf.script_node_change), conf.script_node_change = strdup (val);
339 else if (!strcmp (var, "node-down")) 369 else if (!strcmp (var, "node-down"))
340 free (conf.script_node_down), conf.script_node_down = strdup (val); 370 free (conf.script_node_down), conf.script_node_down = strdup (val);
341 else if (!strcmp (var, "pid-file")) 371 else if (!strcmp (var, "pid-file"))
342 free (conf.pidfilename), conf.pidfilename = strdup (val); 372 free (conf.pidfilename), conf.pidfilename = strdup (val);
343 else if (!strcmp (var, "dns-forw-host")) 373 else if (!strcmp (var, "dns-forw-host"))
… …
372 } 402 }
373 else if (!strcmp (var, "dns-max-outstanding")) 403 else if (!strcmp (var, "dns-max-outstanding"))
374 { 404 {
375#if ENABLE_DNS 405#if ENABLE_DNS
376 conf.dns_max_outstanding = atoi (val); 406 conf.dns_max_outstanding = atoi (val);
407#endif
408 }
409 else if (!strcmp (var, "dns-case-preserving"))
410 {
411#if ENABLE_DNS
412 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
377#endif 413#endif
378 } 414 }
379 else if (!strcmp (var, "http-proxy-host")) 415 else if (!strcmp (var, "http-proxy-host"))
380 { 416 {
381#if ENABLE_HTTP_PROXY 417#if ENABLE_HTTP_PROXY
… …
437 else if (!strcmp (val, "always")) 473 else if (!strcmp (val, "always"))
438 node->connectmode = conf_node::C_ALWAYS; 474 node->connectmode = conf_node::C_ALWAYS;
439 else if (!strcmp (val, "disabled")) 475 else if (!strcmp (val, "disabled"))
440 node->connectmode = conf_node::C_DISABLED; 476 node->connectmode = conf_node::C_DISABLED;
441 else 477 else
442 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 478 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
443 } 479 }
444 else if (!strcmp (var, "inherit-tos")) 480 else if (!strcmp (var, "inherit-tos"))
445 parse_bool (node->inherit_tos, "inherit-tos", true, false); 481 parse_bool (node->inherit_tos, "inherit-tos", true, false);
446 else if (!strcmp (var, "compress")) 482 else if (!strcmp (var, "compress"))
447 parse_bool (node->compress, "compress", true, false); 483 parse_bool (node->compress, "compress", true, false);
… …
481 else if (!strcmp (var, "max-queue")) 517 else if (!strcmp (var, "max-queue"))
482 node->max_queue = atoi (val); 518 node->max_queue = atoi (val);
483 519
484 // unknown or misplaced 520 // unknown or misplaced
485 else 521 else
486 return _("unknown configuration directive. (ignored)"); 522 return _("unknown configuration directive - ignored");
487 523
488 return 0; 524 return 0;
489} 525}
490 526
527void
491void conf_node::finalise () 528conf_node::finalise ()
492{ 529{
493 if (max_queue < 1) 530 if (max_queue < 1)
494 { 531 {
495 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); 532 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
496 max_queue = 1; 533 max_queue = 1;
497 } 534 }
498 535
499 if (routerprio && (connectmode != C_ALWAYS && connectmode != C_DISABLED)) 536 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
500 { 537 {
501 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename); 538 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
502 connectmode = C_ALWAYS; 539 connectmode = C_ALWAYS;
503 } 540 }
504} 541}
505 542
543void
506void configuration_parser::parse_argv () 544configuration_parser::parse_argv ()
507{ 545{
508 for (int i = 0; i < argc; ++i) 546 for (int i = 0; i < argc; ++i)
509 { 547 {
510 char *v = argv [i]; 548 char *v = argv [i];
511 549
… …
532 if (warn) 570 if (warn)
533 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 571 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
534 572
535 *v = 0; 573 *v = 0;
536 } 574 }
575 }
576}
577
578void
579configuration_parser::parse_file (const char *fname)
580{
581 if (FILE *f = fopen (fname, "r"))
582 {
583 char line [2048];
584 int lineno = 0;
585
586 while (fgets (line, sizeof (line), f))
587 {
588 lineno++;
589
590 const char *warn = parse_line (line);
591
592 if (warn)
593 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
594 }
595
596 fclose (f);
597
598 parse_argv ();
599 }
600 else
601 {
602 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
603 exit (EXIT_FAILURE);
537 } 604 }
538} 605}
539 606
540configuration_parser::configuration_parser (configuration &conf, 607configuration_parser::configuration_parser (configuration &conf,
541 bool need_keys, 608 bool need_keys,
542 int argc, 609 int argc,
543 char **argv) 610 char **argv)
544: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 611: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
545{ 612{
546 char *fname; 613 char *fname;
547 FILE *f;
548 614
549 conf.clear (); 615 conf.clear ();
616 node = &conf.default_node;
550 617
551 asprintf (&fname, "%s/gvpe.conf", confbase); 618 asprintf (&fname, "%s/gvpe.conf", confbase);
552 f = fopen (fname, "r"); 619 parse_file (fname);
553
554 if (f)
555 {
556 char line[16384];
557 int lineno = 0;
558 node = &conf.default_node;
559
560 while (fgets (line, sizeof (line), f))
561 {
562 lineno++;
563
564 const char *warn = parse_line (line);
565
566 if (warn)
567 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
568 }
569
570 fclose (f);
571
572 parse_argv ();
573 }
574 else
575 {
576 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
577 exit (EXIT_FAILURE);
578 }
579
580 free (fname); 620 free (fname);
581 621
582 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 622 fname = conf.config_filename (conf.prikeyfile, "hostkey");
583 623
584 f = fopen (fname, "r"); 624 if (FILE *f = fopen (fname, "r"))
585 if (f)
586 { 625 {
587 conf.rsa_key = RSA_new (); 626 conf.rsa_key = RSA_new ();
588 627
589 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 628 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
590 { 629 {
… …
602 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 641 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
603 642
604 if (need_keys) 643 if (need_keys)
605 exit (EXIT_FAILURE); 644 exit (EXIT_FAILURE);
606 } 645 }
646
647 free (fname);
607 648
608 if (need_keys && ::thisnode 649 if (need_keys && ::thisnode
609 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 650 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
610 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 651 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
611 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) 652 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
612 { 653 {
613 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 654 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
614 exit (EXIT_FAILURE); 655 exit (EXIT_FAILURE);
615 } 656 }
616 657
617 free (fname);
618
619 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) 658 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
620 (*i)->finalise (); 659 (*i)->finalise ();
621} 660}
622 661
662char *
623char *configuration::config_filename (const char *name, const char *dflt) 663configuration::config_filename (const char *name, const char *dflt)
624{ 664{
625 char *fname; 665 char *fname;
626 666
627 asprintf (&fname, name ? name : dflt, ::thisnode); 667 asprintf (&fname, name ? name : dflt, ::thisnode);
628 668
… …
632 asprintf (&fname, "%s/%s", confbase, rname); 672 asprintf (&fname, "%s/%s", confbase, rname);
633 free (rname); 673 free (rname);
634 } 674 }
635 675
636 return fname; 676 return fname;
677}
678
679void
680conf_node::print ()
681{
682 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
683 id,
684 id >> 8, id & 0xff,
685 compress ? 'Y' : 'N',
686 connectmode == C_ONDEMAND ? "ondemand"
687 : connectmode == C_NEVER ? "never"
688 : connectmode == C_ALWAYS ? "always"
689 : connectmode == C_DISABLED ? "disabled"
690 : "",
691 nodename,
692 protocols,
693 hostname ? hostname : "",
694 hostname ? ":" : "",
695 hostname ? udp_port : 0
696 );
637} 697}
638 698
639void 699void
640configuration::print () 700configuration::print ()
641{ 701{
… …
648 printf (_("interface: %s\n"), ifname); 708 printf (_("interface: %s\n"), ifname);
649 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 709 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
650 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 710 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
651 printf ("\n"); 711 printf ("\n");
652 712
653 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 713 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
654 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 714 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
655 715
656 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 716 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
657 (*i)->print (); 717 (*i)->print ();
658 718
659 printf ("\n"); 719 printf ("\n");
… …
669configuration::~configuration () 729configuration::~configuration ()
670{ 730{
671 cleanup (); 731 cleanup ();
672} 732}
673 733
674

Diff Legend

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