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 |
… | |
… | |
57 | char *thisnode; |
57 | char *thisnode; |
58 | char *identname; |
58 | char *identname; |
59 | |
59 | |
60 | struct configuration conf; |
60 | struct configuration conf; |
61 | |
61 | |
|
|
62 | u8 |
62 | u8 best_protocol (u8 protset) |
63 | best_protocol (u8 protset) |
63 | { |
64 | { |
64 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
65 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
65 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
66 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
66 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
67 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
67 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
68 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
68 | if (protset & PROT_DNSv4 ) return PROT_DNSv4; |
69 | if (protset & PROT_DNSv4 ) return PROT_DNSv4; |
69 | |
70 | |
70 | return 0; |
71 | return 0; |
71 | } |
72 | } |
72 | |
73 | |
|
|
74 | const char * |
73 | const char *strprotocol (u8 protocol) |
75 | strprotocol (u8 protocol) |
74 | { |
76 | { |
75 | if (protocol & PROT_IPv4 ) return "rawip"; |
77 | if (protocol & PROT_IPv4 ) return "rawip"; |
76 | if (protocol & PROT_ICMPv4) return "icmp"; |
78 | if (protocol & PROT_ICMPv4) return "icmp"; |
77 | if (protocol & PROT_UDPv4 ) return "udp"; |
79 | if (protocol & PROT_UDPv4 ) return "udp"; |
78 | if (protocol & PROT_TCPv4 ) return "tcp"; |
80 | if (protocol & PROT_TCPv4 ) return "tcp"; |
… | |
… | |
92 | |
94 | |
93 | return false; |
95 | return false; |
94 | } |
96 | } |
95 | |
97 | |
96 | bool |
98 | bool |
97 | conf_node::can_direct (struct conf_node *other) |
99 | conf_node::may_direct (struct conf_node *other) |
98 | { |
100 | { |
99 | if (match_list (allow_direct, other->nodename)) |
101 | if (match_list (allow_direct, other->nodename)) |
100 | return true; |
102 | return true; |
101 | |
103 | |
102 | if (match_list (deny_direct, other->nodename)) |
104 | if (match_list (deny_direct, other->nodename)) |
103 | return false; |
105 | return false; |
104 | |
106 | |
105 | return true; |
107 | return true; |
106 | } |
|
|
107 | |
|
|
108 | void |
|
|
109 | conf_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 | } |
108 | } |
124 | |
109 | |
125 | conf_node::~conf_node () |
110 | conf_node::~conf_node () |
126 | { |
111 | { |
127 | #if 0 |
112 | #if 0 |
… | |
… | |
138 | free (dns_hostname); |
123 | free (dns_hostname); |
139 | #endif |
124 | #endif |
140 | #endif |
125 | #endif |
141 | } |
126 | } |
142 | |
127 | |
|
|
128 | void |
143 | void configuration::init () |
129 | configuration::init () |
144 | { |
130 | { |
145 | memset (this, 0, sizeof (*this)); |
131 | memset (this, 0, sizeof (*this)); |
146 | |
132 | |
147 | mtu = DEFAULT_MTU; |
133 | mtu = DEFAULT_MTU; |
|
|
134 | nfmark = 0; |
148 | rekey = DEFAULT_REKEY; |
135 | rekey = DEFAULT_REKEY; |
149 | keepalive = DEFAULT_KEEPALIVE; |
136 | keepalive = DEFAULT_KEEPALIVE; |
150 | llevel = L_INFO; |
137 | llevel = L_INFO; |
151 | ip_proto = IPPROTO_GRE; |
138 | ip_proto = IPPROTO_GRE; |
152 | #if ENABLE_ICMP |
139 | #if ENABLE_ICMP |
… | |
… | |
164 | default_node.if_up_data = strdup (""); |
151 | default_node.if_up_data = strdup (""); |
165 | |
152 | |
166 | #if ENABLE_DNS |
153 | #if ENABLE_DNS |
167 | default_node.dns_port = 0; // default is 0 == client |
154 | default_node.dns_port = 0; // default is 0 == client |
168 | |
155 | |
|
|
156 | dns_case_preserving = true; |
169 | dns_forw_host = strdup ("127.0.0.1"); |
157 | dns_forw_host = strdup ("127.0.0.1"); |
170 | dns_forw_port = 53; |
158 | dns_forw_port = 53; |
171 | dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; |
159 | dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; |
172 | dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; |
160 | dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; |
173 | dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; |
161 | dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; |
… | |
… | |
175 | #endif |
163 | #endif |
176 | |
164 | |
177 | conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); |
165 | conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); |
178 | } |
166 | } |
179 | |
167 | |
|
|
168 | void |
180 | void configuration::cleanup() |
169 | configuration::cleanup () |
181 | { |
170 | { |
182 | if (rsa_key) |
171 | if (rsa_key) |
183 | RSA_free (rsa_key); |
172 | RSA_free (rsa_key); |
184 | |
173 | |
185 | rsa_key = 0; |
174 | rsa_key = 0; |
186 | |
175 | |
187 | free (pidfilename); pidfilename = 0; |
176 | free (pidfilename); pidfilename = 0; |
188 | free (ifname); ifname = 0; |
177 | free (ifname); ifname = 0; |
189 | #if ENABLE_HTTP_PROXY |
178 | #if ENABLE_HTTP_PROXY |
190 | free (proxy_host); proxy_host = 0; |
179 | free (proxy_host); proxy_host = 0; |
191 | free (proxy_auth); proxy_auth = 0; |
180 | free (proxy_auth); proxy_auth = 0; |
192 | #endif |
181 | #endif |
193 | #if ENABLE_DNS |
182 | #if ENABLE_DNS |
194 | free (dns_forw_host); dns_forw_host = 0; |
183 | free (dns_forw_host); dns_forw_host = 0; |
195 | #endif |
184 | #endif |
|
|
185 | free (script_if_up); script_if_up = 0; |
|
|
186 | free (script_node_up); script_node_up = 0; |
|
|
187 | free (script_node_change); script_node_change = 0; |
|
|
188 | free (script_node_down); script_node_down = 0; |
196 | } |
189 | } |
197 | |
190 | |
198 | void |
191 | void |
199 | configuration::clear () |
192 | configuration::clear () |
200 | { |
193 | { |
… | |
… | |
204 | nodes.clear (); |
197 | nodes.clear (); |
205 | |
198 | |
206 | cleanup (); |
199 | cleanup (); |
207 | init (); |
200 | init (); |
208 | } |
201 | } |
|
|
202 | |
|
|
203 | //static bool |
|
|
204 | //is_true (const char *name) |
|
|
205 | //{ |
|
|
206 | //re |
|
|
207 | //} |
209 | |
208 | |
210 | #define parse_bool(target,name,trueval,falseval) do { \ |
209 | #define parse_bool(target,name,trueval,falseval) do { \ |
211 | if (!strcmp (val, "yes")) target = trueval; \ |
210 | if (!strcmp (val, "yes")) target = trueval; \ |
212 | else if (!strcmp (val, "no")) target = falseval; \ |
211 | else if (!strcmp (val, "no")) target = falseval; \ |
213 | else if (!strcmp (val, "true")) target = trueval; \ |
212 | else if (!strcmp (val, "true")) target = trueval; \ |
… | |
… | |
243 | char *val = strtok (NULL, "\t\n\r ="); |
242 | char *val = strtok (NULL, "\t\n\r ="); |
244 | |
243 | |
245 | if (!val || val[0] == '#') |
244 | if (!val || val[0] == '#') |
246 | return _("no value given for variable. (ignored)"); |
245 | return _("no value given for variable. (ignored)"); |
247 | |
246 | |
248 | if (!strcmp (var, "on")) |
247 | else if (!strcmp (var, "on")) |
249 | { |
248 | { |
250 | if (!::thisnode |
249 | if (!::thisnode |
251 | || (val[0] == '!' && strcmp (val + 1, ::thisnode)) |
250 | || (val[0] == '!' && strcmp (val + 1, ::thisnode)) |
252 | || !strcmp (val, ::thisnode)) |
251 | || !strcmp (val, ::thisnode)) |
253 | return parse_line (strtok (NULL, "\n\r")); |
252 | return parse_line (strtok (NULL, "\n\r")); |
254 | else |
253 | } |
255 | return 0; |
254 | |
|
|
255 | else if (!strcmp (var, "include")) |
|
|
256 | { |
|
|
257 | char *fname = conf.config_filename (val); |
|
|
258 | parse_file (fname); |
|
|
259 | free (fname); |
256 | } |
260 | } |
257 | |
261 | |
258 | // truly global |
262 | // truly global |
259 | if (!strcmp (var, "loglevel")) |
263 | else if (!strcmp (var, "loglevel")) |
260 | { |
264 | { |
261 | loglevel l = string_to_loglevel (val); |
265 | loglevel l = string_to_loglevel (val); |
262 | |
266 | |
263 | if (l == L_NONE) |
267 | if (l == L_NONE) |
264 | return _("unknown loglevel. (skipping)"); |
268 | return _("unknown loglevel. (skipping)"); |
… | |
… | |
328 | conf.rekey = atoi (val); |
332 | conf.rekey = atoi (val); |
329 | else if (!strcmp (var, "keepalive")) |
333 | else if (!strcmp (var, "keepalive")) |
330 | conf.keepalive = atoi (val); |
334 | conf.keepalive = atoi (val); |
331 | else if (!strcmp (var, "mtu")) |
335 | else if (!strcmp (var, "mtu")) |
332 | conf.mtu = atoi (val); |
336 | conf.mtu = atoi (val); |
|
|
337 | else if (!strcmp (var, "nfmark")) |
|
|
338 | conf.nfmark = atoi (val); |
333 | else if (!strcmp (var, "if-up")) |
339 | else if (!strcmp (var, "if-up")) |
334 | free (conf.script_if_up), conf.script_if_up = strdup (val); |
340 | free (conf.script_if_up), conf.script_if_up = strdup (val); |
335 | else if (!strcmp (var, "node-up")) |
341 | else if (!strcmp (var, "node-up")) |
336 | free (conf.script_node_up), conf.script_node_up = strdup (val); |
342 | free (conf.script_node_up), conf.script_node_up = strdup (val); |
|
|
343 | else if (!strcmp (var, "node-change")) |
|
|
344 | free (conf.script_node_change), conf.script_node_change = strdup (val); |
337 | else if (!strcmp (var, "node-down")) |
345 | else if (!strcmp (var, "node-down")) |
338 | free (conf.script_node_down), conf.script_node_down = strdup (val); |
346 | free (conf.script_node_down), conf.script_node_down = strdup (val); |
339 | else if (!strcmp (var, "pid-file")) |
347 | else if (!strcmp (var, "pid-file")) |
340 | free (conf.pidfilename), conf.pidfilename = strdup (val); |
348 | free (conf.pidfilename), conf.pidfilename = strdup (val); |
341 | else if (!strcmp (var, "dns-forw-host")) |
349 | else if (!strcmp (var, "dns-forw-host")) |
… | |
… | |
370 | } |
378 | } |
371 | else if (!strcmp (var, "dns-max-outstanding")) |
379 | else if (!strcmp (var, "dns-max-outstanding")) |
372 | { |
380 | { |
373 | #if ENABLE_DNS |
381 | #if ENABLE_DNS |
374 | conf.dns_max_outstanding = atoi (val); |
382 | conf.dns_max_outstanding = atoi (val); |
|
|
383 | #endif |
|
|
384 | } |
|
|
385 | else if (!strcmp (var, "dns-case-preserving")) |
|
|
386 | { |
|
|
387 | #if ENABLE_DNS |
|
|
388 | parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false); |
375 | #endif |
389 | #endif |
376 | } |
390 | } |
377 | else if (!strcmp (var, "http-proxy-host")) |
391 | else if (!strcmp (var, "http-proxy-host")) |
378 | { |
392 | { |
379 | #if ENABLE_HTTP_PROXY |
393 | #if ENABLE_HTTP_PROXY |
… | |
… | |
479 | else if (!strcmp (var, "max-queue")) |
493 | else if (!strcmp (var, "max-queue")) |
480 | node->max_queue = atoi (val); |
494 | node->max_queue = atoi (val); |
481 | |
495 | |
482 | // unknown or misplaced |
496 | // unknown or misplaced |
483 | else |
497 | else |
484 | return _("unknown configuration directive. (ignored)"); |
498 | return _("unknown configuration directive - ignored"); |
485 | |
499 | |
486 | return 0; |
500 | return 0; |
487 | } |
501 | } |
488 | |
502 | |
|
|
503 | void |
|
|
504 | conf_node::finalise () |
|
|
505 | { |
|
|
506 | if (max_queue < 1) |
|
|
507 | { |
|
|
508 | slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); |
|
|
509 | max_queue = 1; |
|
|
510 | } |
|
|
511 | |
|
|
512 | if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED)) |
|
|
513 | { |
|
|
514 | //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename); |
|
|
515 | connectmode = C_ALWAYS; |
|
|
516 | } |
|
|
517 | } |
|
|
518 | |
|
|
519 | void |
489 | void configuration_parser::parse_argv () |
520 | configuration_parser::parse_argv () |
490 | { |
521 | { |
491 | for (int i = 0; i < argc; ++i) |
522 | for (int i = 0; i < argc; ++i) |
492 | { |
523 | { |
493 | char *v = argv [i]; |
524 | char *v = argv [i]; |
494 | |
525 | |
… | |
… | |
515 | if (warn) |
546 | if (warn) |
516 | slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); |
547 | slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); |
517 | |
548 | |
518 | *v = 0; |
549 | *v = 0; |
519 | } |
550 | } |
|
|
551 | } |
|
|
552 | } |
|
|
553 | |
|
|
554 | void |
|
|
555 | configuration_parser::parse_file (const char *fname) |
|
|
556 | { |
|
|
557 | if (FILE *f = fopen (fname, "r")) |
|
|
558 | { |
|
|
559 | char line [2048]; |
|
|
560 | int lineno = 0; |
|
|
561 | node = &conf.default_node; |
|
|
562 | |
|
|
563 | while (fgets (line, sizeof (line), f)) |
|
|
564 | { |
|
|
565 | lineno++; |
|
|
566 | |
|
|
567 | const char *warn = parse_line (line); |
|
|
568 | |
|
|
569 | if (warn) |
|
|
570 | slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno); |
|
|
571 | } |
|
|
572 | |
|
|
573 | fclose (f); |
|
|
574 | |
|
|
575 | parse_argv (); |
|
|
576 | } |
|
|
577 | else |
|
|
578 | { |
|
|
579 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
|
|
580 | exit (EXIT_FAILURE); |
520 | } |
581 | } |
521 | } |
582 | } |
522 | |
583 | |
523 | configuration_parser::configuration_parser (configuration &conf, |
584 | configuration_parser::configuration_parser (configuration &conf, |
524 | bool need_keys, |
585 | bool need_keys, |
525 | int argc, |
586 | int argc, |
526 | char **argv) |
587 | char **argv) |
527 | : conf (conf),need_keys (need_keys), argc (argc), argv (argv) |
588 | : conf (conf),need_keys (need_keys), argc (argc), argv (argv) |
528 | { |
589 | { |
529 | char *fname; |
590 | char *fname; |
530 | FILE *f; |
|
|
531 | |
591 | |
532 | conf.clear (); |
592 | conf.clear (); |
533 | |
593 | |
534 | asprintf (&fname, "%s/gvpe.conf", confbase); |
594 | asprintf (&fname, "%s/gvpe.conf", confbase); |
535 | f = fopen (fname, "r"); |
595 | parse_file (fname); |
536 | |
|
|
537 | if (f) |
|
|
538 | { |
|
|
539 | char line[16384]; |
|
|
540 | int lineno = 0; |
|
|
541 | node = &conf.default_node; |
|
|
542 | |
|
|
543 | while (fgets (line, sizeof (line), f)) |
|
|
544 | { |
|
|
545 | lineno++; |
|
|
546 | |
|
|
547 | const char *warn = parse_line (line); |
|
|
548 | |
|
|
549 | if (warn) |
|
|
550 | slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno); |
|
|
551 | } |
|
|
552 | |
|
|
553 | fclose (f); |
|
|
554 | |
|
|
555 | parse_argv (); |
|
|
556 | } |
|
|
557 | else |
|
|
558 | { |
|
|
559 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
|
|
560 | exit (EXIT_FAILURE); |
|
|
561 | } |
|
|
562 | |
|
|
563 | free (fname); |
596 | free (fname); |
564 | |
597 | |
565 | fname = conf.config_filename (conf.prikeyfile, "hostkey"); |
598 | fname = conf.config_filename (conf.prikeyfile, "hostkey"); |
566 | |
599 | |
567 | f = fopen (fname, "r"); |
600 | if (FILE *f = fopen (fname, "r")) |
568 | if (f) |
|
|
569 | { |
601 | { |
570 | conf.rsa_key = RSA_new (); |
602 | conf.rsa_key = RSA_new (); |
571 | |
603 | |
572 | if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) |
604 | if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) |
573 | { |
605 | { |
… | |
… | |
585 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
617 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
586 | |
618 | |
587 | if (need_keys) |
619 | if (need_keys) |
588 | exit (EXIT_FAILURE); |
620 | exit (EXIT_FAILURE); |
589 | } |
621 | } |
|
|
622 | |
|
|
623 | free (fname); |
590 | |
624 | |
591 | if (need_keys && ::thisnode |
625 | if (need_keys && ::thisnode |
592 | && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) |
626 | && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) |
593 | if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 |
627 | if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 |
594 | || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) |
628 | || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) |
595 | { |
629 | { |
596 | slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); |
630 | slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); |
597 | exit (EXIT_FAILURE); |
631 | exit (EXIT_FAILURE); |
598 | } |
632 | } |
599 | |
633 | |
600 | free (fname); |
634 | for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) |
|
|
635 | (*i)->finalise (); |
601 | } |
636 | } |
602 | |
637 | |
|
|
638 | char * |
603 | char *configuration::config_filename (const char *name, const char *dflt) |
639 | configuration::config_filename (const char *name, const char *dflt) |
604 | { |
640 | { |
605 | char *fname; |
641 | char *fname; |
606 | |
642 | |
607 | asprintf (&fname, name ? name : dflt, ::thisnode); |
643 | asprintf (&fname, name ? name : dflt, ::thisnode); |
608 | |
644 | |
… | |
… | |
612 | asprintf (&fname, "%s/%s", confbase, rname); |
648 | asprintf (&fname, "%s/%s", confbase, rname); |
613 | free (rname); |
649 | free (rname); |
614 | } |
650 | } |
615 | |
651 | |
616 | return fname; |
652 | return fname; |
|
|
653 | } |
|
|
654 | |
|
|
655 | void |
|
|
656 | conf_node::print () |
|
|
657 | { |
|
|
658 | printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n", |
|
|
659 | id, |
|
|
660 | id >> 8, id & 0xff, |
|
|
661 | compress ? 'Y' : 'N', |
|
|
662 | connectmode == C_ONDEMAND ? "ondemand" |
|
|
663 | : connectmode == C_NEVER ? "never" |
|
|
664 | : connectmode == C_ALWAYS ? "always" |
|
|
665 | : connectmode == C_DISABLED ? "disabled" |
|
|
666 | : "", |
|
|
667 | nodename, |
|
|
668 | protocols, |
|
|
669 | hostname ? hostname : "", |
|
|
670 | hostname ? ":" : "", |
|
|
671 | hostname ? udp_port : 0 |
|
|
672 | ); |
617 | } |
673 | } |
618 | |
674 | |
619 | void |
675 | void |
620 | configuration::print () |
676 | configuration::print () |
621 | { |
677 | { |
… | |
… | |
628 | printf (_("interface: %s\n"), ifname); |
684 | printf (_("interface: %s\n"), ifname); |
629 | printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); |
685 | printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); |
630 | printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); |
686 | printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); |
631 | printf ("\n"); |
687 | printf ("\n"); |
632 | |
688 | |
633 | printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", |
689 | printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n", |
634 | _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); |
690 | _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port")); |
635 | |
691 | |
636 | for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) |
692 | for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) |
637 | (*i)->print (); |
693 | (*i)->print (); |
638 | |
694 | |
639 | printf ("\n"); |
695 | printf ("\n"); |
… | |
… | |
649 | configuration::~configuration () |
705 | configuration::~configuration () |
650 | { |
706 | { |
651 | cleanup (); |
707 | cleanup (); |
652 | } |
708 | } |
653 | |
709 | |
654 | |
|
|