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

Diff Legend

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