[ViewVC] Diff of: cvs/gvpe/src/conf.C

Comparing gvpe/src/conf.C (file contents):
Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.32 by pcg, Sat Mar 5 15:48:54 2005 UTC

…		…
1	/*	1	/*
2	conf.c -- configuration code	2	conf.c -- configuration code
3	Copyright (C) 1998 Robert van der Meulen	3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4	1998-2002 Ivo Timmermans <ivo@o2w.nl>
5	2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6	2000 Cris van Pelt <tribbel@arise.dhs.org>
7	2003 Marc Lehmann <pcg@goof.com>
8		4
		5	This file is part of GVPE.
		6
9	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
10	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
11	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
12	(at your option) any later version.	10	(at your option) any later version.
13		11
14	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
15	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
16	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17	GNU General Public License for more details.	15	GNU General Public License for more details.
18		16
19	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
20	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
21	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22	*/	20	*/
23		21
24	#include "config.h"	22	#include "config.h"
25		23
31	#include <netdb.h>	29	#include <netdb.h>
32	#include <sys/stat.h>	30	#include <sys/stat.h>
33	#include <sys/types.h>	31	#include <sys/types.h>
34	#include <unistd.h>	32	#include <unistd.h>
35		33
		34	#include "netcompat.h"
		35
36	#include <openssl/err.h>	36	#include <openssl/err.h>
37	#include <openssl/pem.h>	37	#include <openssl/pem.h>
38	#include <openssl/rsa.h>	38	#include <openssl/rsa.h>
39	#include <openssl/rand.h>	39	#include <openssl/rand.h>
		40	#include <openssl/bn.h>
40		41
41	#include "gettext.h"	42	#include "gettext.h"
42		43
43	#include "conf.h"	44	#include "conf.h"
44	#include "slog.h"	45	#include "slog.h"
45	#include "util.h"	46	#include "util.h"
46		47
47	char *confbase;	48	char *confbase;
48	char *thisnode;	49	char *thisnode;
49	char *identname;	50	char *identname;
50	char *pidfilename;
51		51
52	struct configuration conf;	52	struct configuration conf;
53		53
54	configuration::configuration ()	54	u8 best_protocol (u8 protset)
55	{	55	{
56	init ();	56	if (protset & PROT_IPv4 ) return PROT_IPv4;
57	}	57	if (protset & PROT_ICMPv4) return PROT_ICMPv4;
		58	if (protset & PROT_UDPv4 ) return PROT_UDPv4;
		59	if (protset & PROT_TCPv4 ) return PROT_TCPv4;
		60	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58		61
59	configuration::~configuration ()	62	return 0;
		63	}
		64
		65	const char *strprotocol (u8 protocol)
60	{	66	{
61	cleanup ();	67	if (protocol & PROT_IPv4 ) return "rawip";
		68	if (protocol & PROT_ICMPv4) return "icmp";
		69	if (protocol & PROT_UDPv4 ) return "udp";
		70	if (protocol & PROT_TCPv4 ) return "tcp";
		71	if (protocol & PROT_DNSv4 ) return "dns";
		72
		73	return "<unknown>";
		74	}
		75
		76	void
		77	conf_node::print ()
		78	{
		79	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
		80	id,
		81	id >> 8, id & 0xff,
		82	compress ? 'Y' : 'N',
		83	connectmode == C_ONDEMAND ? "ondemand" :
		84	connectmode == C_NEVER ? "never" :
		85	connectmode == C_ALWAYS ? "always" : "",
		86	nodename,
		87	hostname ? hostname : "",
		88	hostname ? ":" : "",
		89	hostname ? udp_port : 0
		90	);
		91	}
		92
		93	conf_node::~conf_node ()
		94	{
		95	if (rsa_key)
		96	RSA_free (rsa_key);
		97
		98	free (nodename);
		99	free (hostname);
		100	#if ENABLE_DNS
		101	free (domain);
		102	free (dns_hostname);
		103	#endif
62	}	104	}
63		105
64	void configuration::init ()	106	void configuration::init ()
65	{	107	{
66	memset (this, 0, sizeof (*this));	108	memset (this, 0, sizeof (*this));
67		109
		110	mtu = DEFAULT_MTU;
68	rekey = DEFAULT_REKEY;	111	rekey = DEFAULT_REKEY;
69	keepalive = DEFAULT_KEEPALIVE;	112	keepalive = DEFAULT_KEEPALIVE;
70	llevel = L_INFO;	113	llevel = L_INFO;
		114	ip_proto = IPPROTO_GRE;
		115	#if ENABLE_ICMP
		116	icmp_type = ICMP_ECHOREPLY;
		117	#endif
71		118
72	default_node.port = DEFAULT_PORT;	119	default_node.udp_port = DEFAULT_UDPPORT;
		120	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73	default_node.connectmode = conf_node::C_ALWAYS;	121	default_node.connectmode = conf_node::C_ALWAYS;
74	default_node.compress = true;	122	default_node.compress = true;
		123	default_node.protocols = 0;
		124	default_node.max_retry = DEFAULT_MAX_RETRY;
		125
		126	#if ENABLE_DNS
		127	default_node.dns_port = 0; // default is 0 == client
		128	dns_forw_port = 53;
		129	#endif
		130
		131	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
75	}	132	}
76		133
77	void configuration::cleanup()	134	void configuration::cleanup()
78	{	135	{
79	if (rsa_key)	136	if (rsa_key)
80	RSA_free (rsa_key);	137	RSA_free (rsa_key);
81		138
82	free (ifname);
83
84	rsa_key = 0;	139	rsa_key = 0;
85	ifname = 0;	140
		141	free (pidfilename); pidfilename = 0;
		142	free (ifname); ifname = 0;
		143	#if ENABLE_HTTP_PROXY
		144	free (proxy_host); proxy_host = 0;
		145	free (proxy_auth); proxy_auth = 0;
		146	#endif
		147	#if ENABLE_DNS
		148	free (dns_forw_host); dns_forw_host = 0;
		149	#endif
86	}	150	}
87		151
88	void	152	void
89	configuration::clear_config ()	153	configuration::clear_config ()
90	{	154	{
…		…
95		159
96	cleanup ();	160	cleanup ();
97	init ();	161	init ();
98	}	162	}
99		163
		164	#define parse_bool(target,name,trueval,falseval) \
		165	if (!strcmp (val, "yes")) target = trueval; \
		166	else if (!strcmp (val, "no")) target = falseval; \
		167	else if (!strcmp (val, "true")) target = trueval; \
		168	else if (!strcmp (val, "false")) target = falseval; \
		169	else if (!strcmp (val, "on")) target = trueval; \
		170	else if (!strcmp (val, "off")) target = falseval; \
		171	else \
		172	slog (L_WARN, \
		173	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \
		174	name, var, fname, lineno);
		175
100	void configuration::read_config (bool need_keys)	176	void configuration::read_config (bool need_keys)
101	{	177	{
102	char *fname;	178	char *fname;
103	FILE *f;	179	FILE *f;
104		180
105	clear_config ();	181	clear_config ();
106		182
107	asprintf (&fname, "%s/vped.conf", confbase);	183	asprintf (&fname, "%s/gvpe.conf", confbase);
108	f = fopen (fname, "r");	184	f = fopen (fname, "r");
109		185
110	if (f)	186	if (f)
111	{	187	{
112	char line[16384];	188	char line[16384];
…		…
167	if (l != L_NONE)	243	if (l != L_NONE)
168	llevel = l;	244	llevel = l;
169	else	245	else
170	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);	246	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171	}	247	}
		248	else if (!strcmp (var, "ip-proto"))
		249	ip_proto = atoi (val);
		250	else if (!strcmp (var, "icmp-type"))
		251	{
		252	#if ENABLE_ICMP
		253	icmp_type = atoi (val);
		254	#endif
		255	}
172		256
173	// per config	257	// per config
174	else if (!strcmp (var, "node"))	258	else if (!strcmp (var, "node"))
175	{	259	{
176	default_node.id++;	260	default_node.id++;
…		…
194		278
195	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))	279	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196	{	280	{
197	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	281	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
198	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	282	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199	exit (1);	283	exit (EXIT_FAILURE);
200	}	284	}
201		285
202	RSA_blinding_on (node->rsa_key, 0);	286	require (RSA_blinding_on (node->rsa_key, 0));
203		287
204	fclose (f);	288	fclose (f);
205	}	289	}
206	else	290	else
207	{	291	{
208	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));	292	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209		293
210	if (need_keys)	294	if (need_keys)
211	exit (1);	295	exit (EXIT_FAILURE);
212	}	296	}
213		297
214	free (fname);	298	free (fname);
215	}	299	}
216		300
217	if (!::thisnode \|\| !strcmp (node->nodename, ::thisnode))	301	if (::thisnode && !strcmp (node->nodename, ::thisnode))
218	thisnode = node;	302	thisnode = node;
219	}	303	}
220	else if (!strcmp (var, "private-key"))	304	else if (!strcmp (var, "private-key"))
221	prikeyfile = strdup (val);	305	free (prikeyfile), prikeyfile = strdup (val);
222	else if (!strcmp (var, "ifpersist"))	306	else if (!strcmp (var, "ifpersist"))
223	{	307	{
224	if (!strcmp (val, "yes"))	308	parse_bool (ifpersist, "ifpersist", true, false);
225	ifpersist = true;
226	else if (!strcmp (val, "no"))
227	ifpersist = false;
228	else
229	slog (L_WARN,
230	_("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231	var, fname, lineno);
232	}	309	}
233	else if (!strcmp (var, "ifname"))	310	else if (!strcmp (var, "ifname"))
234	ifname = strdup (val);	311	free (ifname), ifname = strdup (val);
235	else if (!strcmp (var, "rekey"))	312	else if (!strcmp (var, "rekey"))
236	rekey = atoi (val);	313	rekey = atoi (val);
237	else if (!strcmp (var, "keepalive"))	314	else if (!strcmp (var, "keepalive"))
238	keepalive = atoi (val);	315	keepalive = atoi (val);
239	else if (!strcmp (var, "mtu"))	316	else if (!strcmp (var, "mtu"))
240	mtu = atoi (val);	317	mtu = atoi (val);
241	else if (!strcmp (var, "if-up"))	318	else if (!strcmp (var, "if-up"))
242	script_if_up = strdup (val);	319	free (script_if_up), script_if_up = strdup (val);
243	else if (!strcmp (var, "node-up"))	320	else if (!strcmp (var, "node-up"))
244	script_node_up = strdup (val);	321	free (script_node_up), script_node_up = strdup (val);
245	else if (!strcmp (var, "node-down"))	322	else if (!strcmp (var, "node-down"))
246	script_node_down = strdup (val);	323	free (script_node_down), script_node_down = strdup (val);
		324	else if (!strcmp (var, "pid-file"))
		325	free (pidfilename), pidfilename = strdup (val);
		326	#if ENABLE_DNS
		327	else if (!strcmp (var, "dns-forw-host"))
		328	free (dns_forw_host), dns_forw_host = strdup (val);
		329	else if (!strcmp (var, "dns-forw-port"))
		330	dns_forw_port = atoi (val);
		331	#endif
		332	else if (!strcmp (var, "http-proxy-host"))
		333	{
		334	#if ENABLE_HTTP_PROXY
		335	free (proxy_host), proxy_host = strdup (val);
		336	#endif
		337	}
		338	else if (!strcmp (var, "http-proxy-port"))
		339	{
		340	#if ENABLE_HTTP_PROXY
		341	proxy_port = atoi (val);
		342	#endif
		343	}
		344	else if (!strcmp (var, "http-proxy-auth"))
		345	{
		346	#if ENABLE_HTTP_PROXY
		347	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
		348	#endif
		349	}
247		350
248	/* node-specific, non-defaultable */	351	/* node-specific, non-defaultable */
249	else if (node != &default_node && !strcmp (var, "hostname"))	352	else if (node != &default_node && !strcmp (var, "hostname"))
250	{
251	free (node->hostname);
252	node->hostname = strdup (val);	353	free (node->hostname), node->hostname = strdup (val);
253	}
254		354
255	/* node-specific, defaultable */	355	/* node-specific, defaultable */
256	else if (!strcmp (var, "udp-port"))	356	else if (!strcmp (var, "udp-port"))
257	node->port = atoi (val);	357	node->udp_port = atoi (val);
258	else if (!strcmp (var, "port")) //deprecated	358	else if (!strcmp (var, "tcp-port"))
259	node->port = atoi (val);	359	node->tcp_port = atoi (val);
		360	#if ENABLE_DNS
		361	else if (!strcmp (var, "dns-hostname"))
		362	free (node->dns_hostname), node->dns_hostname = strdup (val);
		363	else if (!strcmp (var, "dns-port"))
		364	node->dns_port = atoi (val);
		365	#endif
		366	else if (!strcmp (var, "dns-domain"))
		367	{
		368	#if ENABLE_DNS
		369	free (node->domain), node->domain = strdup (val);
		370	#endif
		371	}
260	else if (!strcmp (var, "router-priority"))	372	else if (!strcmp (var, "router-priority"))
261	node->routerprio = atoi (val);	373	node->routerprio = atoi (val);
		374	else if (!strcmp (var, "max-retry"))
		375	node->max_retry = atoi (val);
262	else if (!strcmp (var, "connect"))	376	else if (!strcmp (var, "connect"))
263	{	377	{
264	if (!strcmp (val, "ondemand"))	378	if (!strcmp (val, "ondemand"))
265	node->connectmode = conf_node::C_ONDEMAND;	379	node->connectmode = conf_node::C_ONDEMAND;
266	else if (!strcmp (val, "never"))	380	else if (!strcmp (val, "never"))
…		…
269	node->connectmode = conf_node::C_ALWAYS;	383	node->connectmode = conf_node::C_ALWAYS;
270	else if (!strcmp (val, "disabled"))	384	else if (!strcmp (val, "disabled"))
271	node->connectmode = conf_node::C_DISABLED;	385	node->connectmode = conf_node::C_DISABLED;
272	else	386	else
273	slog (L_WARN,	387	slog (L_WARN,
274	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),	388	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275	var, fname, lineno);	389	var, fname, lineno);
276	}	390	}
277	else if (!strcmp (var, "inherit-tos"))	391	else if (!strcmp (var, "inherit-tos"))
278	{	392	{
279	if (!strcmp (val, "yes"))	393	parse_bool (node->inherit_tos, "inherit-tos", true, false);
280	node->inherit_tos = true;
281	else if (!strcmp (val, "no"))
282	node->inherit_tos = false;
283	else	394	}
284	slog (L_WARN,
285	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286	var, fname, lineno);
287	}
288
289	else if (!strcmp (var, "compress"))	395	else if (!strcmp (var, "compress"))
290	{	396	{
291	if (!strcmp (val, "yes"))	397	parse_bool (node->compress, "compress", true, false);
292	node->compress = true;	398	}
		399	// all these bool options really really cost a lot of executable size!
		400	else if (!strcmp (var, "enable-tcp"))
		401	{
		402	#if ENABLE_TCP
		403	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
		404	#endif
		405	}
		406	else if (!strcmp (var, "enable-icmp"))
		407	{
		408	#if ENABLE_ICMP
		409	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
		410	#endif
		411	}
293	else if (!strcmp (val, "no"))	412	else if (!strcmp (var, "enable-dns"))
294	node->compress = false;
295	else	413	{
296	slog (L_WARN,	414	#if ENABLE_DNS
297	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),	415	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
298	var, fname, lineno);	416	#endif
		417	}
		418	else if (!strcmp (var, "enable-udp"))
		419	{
		420	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
		421	}
		422	else if (!strcmp (var, "enable-rawip"))
		423	{
		424	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
299	}	425	}
300		426
301	// unknown or misplaced	427	// unknown or misplaced
302	else	428	else
303	{
304	slog (L_WARN,	429	slog (L_WARN,
305	_("unknown or misplaced variable `%s', at '%s' line %d"),	430	_("unknown or misplaced variable `%s', at '%s' line %d"),
306	var, fname, lineno);	431	var, fname, lineno);
307	}
308	}	432	}
309		433
310	fclose (f);	434	fclose (f);
311	}	435	}
312	else	436	else
313	{	437	{
314	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	438	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
315	exit (1);	439	exit (EXIT_FAILURE);
316	}	440	}
317		441
318	free (fname);	442	free (fname);
319		443
320	fname = config_filename (prikeyfile, "hostkey");	444	fname = config_filename (prikeyfile, "hostkey");
…		…
326		450
327	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	451	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
328	{	452	{
329	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	453	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
330	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	454	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
331	exit (1);	455	exit (EXIT_FAILURE);
332	}	456	}
333		457
334	RSA_blinding_on (rsa_key, 0);	458	require (RSA_blinding_on (rsa_key, 0));
335		459
336	fclose (f);	460	fclose (f);
337	}	461	}
338	else	462	else
339	{	463	{
340	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));	464	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341		465
342	if (need_keys)	466	if (need_keys)
343	exit (1);	467	exit (EXIT_FAILURE);
344	}	468	}
		469
		470	if (need_keys && ::thisnode
		471	&& rsa_key && thisnode && thisnode->rsa_key)
		472	if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
		473	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
		474	{
		475	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
		476	exit (EXIT_FAILURE);
		477	}
345		478
346	free (fname);	479	free (fname);
347	}	480	}
348		481
349	char configuration::config_filename (const char name, const char *dflt)	482	char configuration::config_filename (const char name, const char *dflt)
…		…
371	printf (_("MTU: %d\n"), mtu);	504	printf (_("MTU: %d\n"), mtu);
372	printf (_("rekeying interval: %d\n"), rekey);	505	printf (_("rekeying interval: %d\n"), rekey);
373	printf (_("keepalive interval: %d\n"), keepalive);	506	printf (_("keepalive interval: %d\n"), keepalive);
374	printf (_("interface: %s\n"), ifname);	507	printf (_("interface: %s\n"), ifname);
375	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");	508	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1);	509	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377	printf ("\n");	510	printf ("\n");
378		511
379	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",	512	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));	513	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381		514
…		…
383	(*i)->print ();	516	(*i)->print ();
384		517
385	printf ("\n");	518	printf ("\n");
386	}	519	}
387		520
388	void	521	configuration::configuration ()
389	conf_node::print ()
390	{	522	{
391	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",	523	asprintf (&confbase, "%s/gvpe", CONFDIR);
392	id,
393	id >> 8, id & 0xff,
394	compress ? 'Y' : 'N',
395	connectmode == C_ONDEMAND ? "ondemand" :
396	connectmode == C_NEVER ? "never" :
397	connectmode == C_ALWAYS ? "always" : "",
398	nodename,
399	hostname ? hostname : "",
400	hostname ? ":" : "",
401	hostname ? port : 0
402	);
403	}
404		524
		525	init ();
		526	}
		527
		528	configuration::~configuration ()
		529	{
		530	cleanup ();
		531	}
		532
		533

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs. Revision 1.32 by pcg, Sat Mar 5 15:48:54 2005 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.32 by pcg, Sat Mar 5 15:48:54 2005 UTC