ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.C
Revision: 1.40
Committed: Mon Mar 28 20:39:18 2005 UTC (19 years, 2 months ago) by pcg
Content type: text/plain
Branch: MAIN
CVS Tags: rel-1_9
Changes since 1.39: +280 -246 lines
Log Message:
*** empty log message ***

File Contents

# User Rev Content
1 pcg 1.1 /*
2     conf.c -- configuration code
3 pcg 1.31 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 pcg 1.1
5 pcg 1.31 This file is part of GVPE.
6    
7     GVPE is free software; you can redistribute it and/or modify
8 pcg 1.1 it under the terms of the GNU General Public License as published by
9     the Free Software Foundation; either version 2 of the License, or
10     (at your option) any later version.
11    
12     This program is distributed in the hope that it will be useful,
13     but WITHOUT ANY WARRANTY; without even the implied warranty of
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15     GNU General Public License for more details.
16    
17     You should have received a copy of the GNU General Public License
18 pcg 1.31 along with gvpe; if not, write to the Free Software
19 pcg 1.1 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20     */
21    
22     #include "config.h"
23    
24     #include <cstdio>
25     #include <cstdlib>
26     #include <cstring>
27    
28     #include <errno.h>
29     #include <netdb.h>
30     #include <sys/stat.h>
31     #include <sys/types.h>
32     #include <unistd.h>
33    
34 pcg 1.17 #include "netcompat.h"
35 pcg 1.5
36 pcg 1.1 #include <openssl/err.h>
37     #include <openssl/pem.h>
38     #include <openssl/rsa.h>
39     #include <openssl/rand.h>
40 pcg 1.22 #include <openssl/bn.h>
41 pcg 1.1
42     #include "conf.h"
43     #include "slog.h"
44     #include "util.h"
45    
46     char *confbase;
47     char *thisnode;
48     char *identname;
49    
50     struct configuration conf;
51    
52 pcg 1.7 u8 best_protocol (u8 protset)
53     {
54 pcg 1.13 if (protset & PROT_IPv4 ) return PROT_IPv4;
55     if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56     if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57     if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 pcg 1.24 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 pcg 1.7
60 pcg 1.9 return 0;
61 pcg 1.7 }
62    
63     const char *strprotocol (u8 protocol)
64     {
65 pcg 1.13 if (protocol & PROT_IPv4 ) return "rawip";
66     if (protocol & PROT_ICMPv4) return "icmp";
67     if (protocol & PROT_UDPv4 ) return "udp";
68     if (protocol & PROT_TCPv4 ) return "tcp";
69 pcg 1.24 if (protocol & PROT_DNSv4 ) return "dns";
70 pcg 1.7
71     return "<unknown>";
72     }
73    
74 pcg 1.12 void
75     conf_node::print ()
76 pcg 1.1 {
77 pcg 1.12 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
78     id,
79     id >> 8, id & 0xff,
80     compress ? 'Y' : 'N',
81     connectmode == C_ONDEMAND ? "ondemand" :
82     connectmode == C_NEVER ? "never" :
83     connectmode == C_ALWAYS ? "always" : "",
84     nodename,
85     hostname ? hostname : "",
86     hostname ? ":" : "",
87     hostname ? udp_port : 0
88     );
89 pcg 1.1 }
90    
91 pcg 1.12 conf_node::~conf_node ()
92 pcg 1.1 {
93 pcg 1.39 #if 0
94     // does not work, because string pointers etc. are shared
95     // is not called, however
96 pcg 1.12 if (rsa_key)
97     RSA_free (rsa_key);
98    
99     free (nodename);
100     free (hostname);
101 pcg 1.39 free (if_up_data);
102 pcg 1.30 #if ENABLE_DNS
103 pcg 1.28 free (domain);
104 pcg 1.30 free (dns_hostname);
105     #endif
106 pcg 1.39 #endif
107 pcg 1.1 }
108    
109     void configuration::init ()
110     {
111     memset (this, 0, sizeof (*this));
112    
113 pcg 1.19 mtu = DEFAULT_MTU;
114 pcg 1.1 rekey = DEFAULT_REKEY;
115     keepalive = DEFAULT_KEEPALIVE;
116 pcg 1.2 llevel = L_INFO;
117 pcg 1.5 ip_proto = IPPROTO_GRE;
118 pcg 1.16 #if ENABLE_ICMP
119 pcg 1.13 icmp_type = ICMP_ECHOREPLY;
120 pcg 1.16 #endif
121 pcg 1.1
122 pcg 1.5 default_node.udp_port = DEFAULT_UDPPORT;
123 pcg 1.24 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
124 pcg 1.1 default_node.connectmode = conf_node::C_ALWAYS;
125     default_node.compress = true;
126 pcg 1.29 default_node.protocols = 0;
127 pcg 1.27 default_node.max_retry = DEFAULT_MAX_RETRY;
128 pcg 1.39 default_node.if_up_data = strdup ("");
129 pcg 1.25
130 pcg 1.30 #if ENABLE_DNS
131 pcg 1.32 default_node.dns_port = 0; // default is 0 == client
132 pcg 1.38
133     dns_forw_host = strdup ("127.0.0.1");
134     dns_forw_port = 53;
135     dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136     dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137     dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138     dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
139 pcg 1.30 #endif
140    
141 pcg 1.27 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
142 pcg 1.1 }
143    
144     void configuration::cleanup()
145     {
146     if (rsa_key)
147     RSA_free (rsa_key);
148    
149 pcg 1.12 rsa_key = 0;
150 pcg 1.1
151 pcg 1.28 free (pidfilename); pidfilename = 0;
152     free (ifname); ifname = 0;
153 pcg 1.12 #if ENABLE_HTTP_PROXY
154 pcg 1.28 free (proxy_host); proxy_host = 0;
155     free (proxy_auth); proxy_auth = 0;
156     #endif
157     #if ENABLE_DNS
158     free (dns_forw_host); dns_forw_host = 0;
159 pcg 1.12 #endif
160 pcg 1.1 }
161    
162     void
163 pcg 1.40 configuration::clear ()
164 pcg 1.1 {
165     for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
166     delete *i;
167    
168     nodes.clear ();
169    
170     cleanup ();
171     init ();
172     }
173    
174 pcg 1.37 #define parse_bool(target,name,trueval,falseval) do { \
175     if (!strcmp (val, "yes")) target = trueval; \
176 pcg 1.5 else if (!strcmp (val, "no")) target = falseval; \
177     else if (!strcmp (val, "true")) target = trueval; \
178     else if (!strcmp (val, "false")) target = falseval; \
179     else if (!strcmp (val, "on")) target = trueval; \
180     else if (!strcmp (val, "off")) target = falseval; \
181     else \
182 pcg 1.40 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
183 pcg 1.37 } while (0)
184 pcg 1.5
185 pcg 1.40 const char *
186     configuration_parser::parse_line (char *line)
187 pcg 1.1 {
188 pcg 1.40 {
189     char *end = line + strlen (line);
190    
191     while (*end < ' ' && end >= line)
192     end--;
193 pcg 1.1
194 pcg 1.40 *++end = 0;
195     }
196 pcg 1.1
197 pcg 1.40 char *tok = line;
198     const char *var = strtok (tok, "\t =");
199     tok = 0;
200 pcg 1.1
201 pcg 1.40 if (!var || !var[0])
202     return 0; /* no tokens on this line */
203 pcg 1.1
204 pcg 1.40 if (var[0] == '#')
205     return 0; /* comment: ignore */
206 pcg 1.1
207 pcg 1.40 char *val = strtok (NULL, "\t\n\r =");
208 pcg 1.1
209 pcg 1.40 if (!val || val[0] == '#')
210     return _("no value given for variable. (ignored)");
211 pcg 1.1
212 pcg 1.40 if (!strcmp (var, "on"))
213     {
214     if (!::thisnode
215     || (val[0] == '!' && strcmp (val + 1, ::thisnode))
216     || !strcmp (val, ::thisnode))
217     return parse_line (strtok (NULL, "\n\r"));
218     else
219     return 0;
220     }
221 pcg 1.1
222 pcg 1.40 // truly global
223     if (!strcmp (var, "loglevel"))
224     {
225     loglevel l = string_to_loglevel (val);
226 pcg 1.1
227 pcg 1.40 if (l == L_NONE)
228     return _("unknown loglevel. (skipping)");
229     }
230     else if (!strcmp (var, "ip-proto"))
231     conf.ip_proto = atoi (val);
232     else if (!strcmp (var, "icmp-type"))
233     {
234 pcg 1.16 #if ENABLE_ICMP
235 pcg 1.40 conf.icmp_type = atoi (val);
236 pcg 1.16 #endif
237 pcg 1.40 }
238 pcg 1.1
239 pcg 1.40 // per config
240     else if (!strcmp (var, "node"))
241     {
242     parse_argv ();
243 pcg 1.1
244 pcg 1.40 conf.default_node.id++;
245     node = new conf_node (conf.default_node);
246     conf.nodes.push_back (node);
247     node->nodename = strdup (val);
248 pcg 1.1
249 pcg 1.40 {
250     char *fname;
251     FILE *f;
252    
253     asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254 pcg 1.1
255 pcg 1.40 f = fopen (fname, "r");
256     if (f)
257     {
258     node->rsa_key = RSA_new ();
259 pcg 1.1
260 pcg 1.40 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261 pcg 1.1 {
262 pcg 1.40 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263     slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264     exit (EXIT_FAILURE);
265     }
266    
267     require (RSA_blinding_on (node->rsa_key, 0));
268 pcg 1.1
269 pcg 1.40 fclose (f);
270     }
271     else
272     {
273     slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274 pcg 1.1
275 pcg 1.40 if (need_keys)
276     exit (EXIT_FAILURE);
277     }
278 pcg 1.1
279 pcg 1.40 free (fname);
280     }
281 pcg 1.1
282 pcg 1.40 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283     conf.thisnode = node;
284     }
285     else if (!strcmp (var, "private-key"))
286     free (conf.prikeyfile), conf.prikeyfile = strdup (val);
287     else if (!strcmp (var, "ifpersist"))
288     parse_bool (conf.ifpersist, "ifpersist", true, false);
289     else if (!strcmp (var, "ifname"))
290     free (conf.ifname), conf.ifname = strdup (val);
291     else if (!strcmp (var, "rekey"))
292     conf.rekey = atoi (val);
293     else if (!strcmp (var, "keepalive"))
294     conf.keepalive = atoi (val);
295     else if (!strcmp (var, "mtu"))
296     conf.mtu = atoi (val);
297     else if (!strcmp (var, "if-up"))
298     free (conf.script_if_up), conf.script_if_up = strdup (val);
299     else if (!strcmp (var, "node-up"))
300     free (conf.script_node_up), conf.script_node_up = strdup (val);
301     else if (!strcmp (var, "node-down"))
302     free (conf.script_node_down), conf.script_node_down = strdup (val);
303     else if (!strcmp (var, "pid-file"))
304     free (conf.pidfilename), conf.pidfilename = strdup (val);
305     else if (!strcmp (var, "dns-forw-host"))
306     {
307 pcg 1.30 #if ENABLE_DNS
308 pcg 1.40 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
309 pcg 1.34 #endif
310 pcg 1.40 }
311     else if (!strcmp (var, "dns-forw-port"))
312     {
313 pcg 1.34 #if ENABLE_DNS
314 pcg 1.40 conf.dns_forw_port = atoi (val);
315 pcg 1.28 #endif
316 pcg 1.40 }
317     else if (!strcmp (var, "dns-timeout-factor"))
318     {
319 pcg 1.38 #if ENABLE_DNS
320 pcg 1.40 conf.dns_timeout_factor = atof (val);
321 pcg 1.38 #endif
322 pcg 1.40 }
323     else if (!strcmp (var, "dns-send-interval"))
324     {
325 pcg 1.38 #if ENABLE_DNS
326 pcg 1.40 conf.dns_send_interval = atoi (val);
327 pcg 1.38 #endif
328 pcg 1.40 }
329     else if (!strcmp (var, "dns-overlap-factor"))
330     {
331 pcg 1.38 #if ENABLE_DNS
332 pcg 1.40 conf.dns_overlap_factor = atof (val);
333 pcg 1.38 #endif
334 pcg 1.40 }
335     else if (!strcmp (var, "dns-max-outstanding"))
336     {
337 pcg 1.38 #if ENABLE_DNS
338 pcg 1.40 conf.dns_max_outstanding = atoi (val);
339 pcg 1.38 #endif
340 pcg 1.40 }
341     else if (!strcmp (var, "http-proxy-host"))
342     {
343 pcg 1.12 #if ENABLE_HTTP_PROXY
344 pcg 1.40 free (conf.proxy_host), conf.proxy_host = strdup (val);
345 pcg 1.20 #endif
346 pcg 1.40 }
347     else if (!strcmp (var, "http-proxy-port"))
348     {
349 pcg 1.20 #if ENABLE_HTTP_PROXY
350 pcg 1.40 conf.proxy_port = atoi (val);
351 pcg 1.20 #endif
352 pcg 1.40 }
353     else if (!strcmp (var, "http-proxy-auth"))
354     {
355 pcg 1.20 #if ENABLE_HTTP_PROXY
356 pcg 1.40 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
357 pcg 1.12 #endif
358 pcg 1.40 }
359 pcg 1.1
360 pcg 1.40 /* node-specific, non-defaultable */
361     else if (node != &conf.default_node && !strcmp (var, "hostname"))
362     free (node->hostname), node->hostname = strdup (val);
363    
364     /* node-specific, defaultable */
365     else if (!strcmp (var, "udp-port"))
366     node->udp_port = atoi (val);
367     else if (!strcmp (var, "tcp-port"))
368     node->tcp_port = atoi (val);
369     else if (!strcmp (var, "dns-hostname"))
370     {
371 pcg 1.30 #if ENABLE_DNS
372 pcg 1.40 free (node->dns_hostname), node->dns_hostname = strdup (val);
373 pcg 1.34 #endif
374 pcg 1.40 }
375     else if (!strcmp (var, "dns-port"))
376     {
377 pcg 1.34 #if ENABLE_DNS
378 pcg 1.40 node->dns_port = atoi (val);
379 pcg 1.34 #endif
380 pcg 1.40 }
381     else if (!strcmp (var, "dns-domain"))
382     {
383 pcg 1.34 #if ENABLE_DNS
384 pcg 1.40 free (node->domain), node->domain = strdup (val);
385 pcg 1.28 #endif
386 pcg 1.40 }
387     else if (!strcmp (var, "if-up-data"))
388     free (node->if_up_data), node->if_up_data = strdup (val);
389     else if (!strcmp (var, "router-priority"))
390     node->routerprio = atoi (val);
391     else if (!strcmp (var, "max-retry"))
392     node->max_retry = atoi (val);
393     else if (!strcmp (var, "connect"))
394     {
395     if (!strcmp (val, "ondemand"))
396     node->connectmode = conf_node::C_ONDEMAND;
397     else if (!strcmp (val, "never"))
398     node->connectmode = conf_node::C_NEVER;
399     else if (!strcmp (val, "always"))
400     node->connectmode = conf_node::C_ALWAYS;
401     else if (!strcmp (val, "disabled"))
402     node->connectmode = conf_node::C_DISABLED;
403     else
404     return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
405     }
406     else if (!strcmp (var, "inherit-tos"))
407     parse_bool (node->inherit_tos, "inherit-tos", true, false);
408     else if (!strcmp (var, "compress"))
409     parse_bool (node->compress, "compress", true, false);
410     // all these bool options really really cost a lot of executable size!
411     else if (!strcmp (var, "enable-tcp"))
412     {
413 pcg 1.11 #if ENABLE_TCP
414 pcg 1.40 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
415 pcg 1.13 #endif
416 pcg 1.40 }
417     else if (!strcmp (var, "enable-icmp"))
418     {
419 pcg 1.13 #if ENABLE_ICMP
420 pcg 1.40 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
421 pcg 1.11 #endif
422 pcg 1.40 }
423     else if (!strcmp (var, "enable-dns"))
424     {
425 pcg 1.24 #if ENABLE_DNS
426 pcg 1.40 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
427 pcg 1.24 #endif
428 pcg 1.40 }
429     else if (!strcmp (var, "enable-udp"))
430     {
431     u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
432     }
433     else if (!strcmp (var, "enable-rawip"))
434     {
435     u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
436     }
437    
438     // unknown or misplaced
439     else
440     return _("unknown configuration directive. (ignored)");
441    
442     return 0;
443     }
444    
445     void configuration_parser::parse_argv ()
446     {
447     for (int i = 0; i < argc; ++i)
448     {
449     char *v = argv [i];
450    
451     if (!*v)
452     continue;
453    
454     char *enode = v;
455    
456     while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
457     enode++;
458    
459     if (*enode != '.')
460     enode = 0;
461    
462     char *wnode = node == &conf.default_node
463     ? 0
464     : node->nodename;
465    
466     if ((!wnode && !enode)
467     || (wnode && enode && !strncmp (wnode, v, enode - v)))
468     {
469     const char *warn = parse_line (enode ? enode + 1 : v);
470    
471     if (warn)
472     slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
473    
474     *v = 0;
475     }
476     }
477     }
478    
479     configuration_parser::configuration_parser (configuration &conf,
480     bool need_keys,
481     int argc,
482     char **argv)
483     : conf (conf),need_keys (need_keys), argc (argc), argv (argv)
484     {
485     char *fname;
486     FILE *f;
487    
488     conf.clear ();
489    
490     asprintf (&fname, "%s/gvpe.conf", confbase);
491     f = fopen (fname, "r");
492    
493     if (f)
494     {
495     char line[16384];
496     int lineno = 0;
497     node = &conf.default_node;
498    
499     while (fgets (line, sizeof (line), f))
500     {
501     lineno++;
502    
503     const char *warn = parse_line (line);
504    
505     if (warn)
506     slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
507 pcg 1.1 }
508    
509     fclose (f);
510 pcg 1.40
511     parse_argv ();
512 pcg 1.1 }
513     else
514     {
515     slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
516 pcg 1.22 exit (EXIT_FAILURE);
517 pcg 1.1 }
518    
519     free (fname);
520    
521 pcg 1.40 fname = conf.config_filename (conf.prikeyfile, "hostkey");
522 pcg 1.1
523     f = fopen (fname, "r");
524     if (f)
525     {
526 pcg 1.40 conf.rsa_key = RSA_new ();
527 pcg 1.1
528 pcg 1.40 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
529 pcg 1.1 {
530     ERR_load_RSA_strings (); ERR_load_PEM_strings ();
531     slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
532 pcg 1.22 exit (EXIT_FAILURE);
533 pcg 1.1 }
534    
535 pcg 1.40 require (RSA_blinding_on (conf.rsa_key, 0));
536 pcg 1.1
537     fclose (f);
538     }
539     else
540     {
541     slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
542    
543     if (need_keys)
544 pcg 1.22 exit (EXIT_FAILURE);
545 pcg 1.1 }
546 pcg 1.22
547 pcg 1.23 if (need_keys && ::thisnode
548 pcg 1.40 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
549     if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
550     || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
551 pcg 1.22 {
552     slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
553     exit (EXIT_FAILURE);
554     }
555 pcg 1.1
556     free (fname);
557     }
558    
559     char *configuration::config_filename (const char *name, const char *dflt)
560     {
561     char *fname;
562    
563     asprintf (&fname, name ? name : dflt, ::thisnode);
564    
565     if (!ABSOLUTE_PATH (fname))
566     {
567     char *rname = fname;
568     asprintf (&fname, "%s/%s", confbase, rname);
569     free (rname);
570     }
571    
572     return fname;
573     }
574    
575     void
576     configuration::print ()
577     {
578     printf (_("\nConfiguration\n\n"));
579     printf (_("# of nodes: %d\n"), nodes.size ());
580     printf (_("this node: %s\n"), thisnode ? thisnode->nodename : "<unset>");
581     printf (_("MTU: %d\n"), mtu);
582     printf (_("rekeying interval: %d\n"), rekey);
583     printf (_("keepalive interval: %d\n"), keepalive);
584     printf (_("interface: %s\n"), ifname);
585     printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
586 pcg 1.15 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
587 pcg 1.1 printf ("\n");
588    
589     printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
590     _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
591    
592     for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
593     (*i)->print ();
594    
595     printf ("\n");
596     }
597    
598 pcg 1.12 configuration::configuration ()
599     {
600 pcg 1.27 asprintf (&confbase, "%s/gvpe", CONFDIR);
601 pcg 1.26
602 pcg 1.12 init ();
603     }
604    
605     configuration::~configuration ()
606 pcg 1.1 {
607 pcg 1.12 cleanup ();
608 pcg 1.1 }
609 pcg 1.12
610 pcg 1.1