[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.35 by pcg, Fri Mar 18 01:53:05 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		40	#include <openssl/bn.h>
41	#include "gettext.h"
42		41
43	#include "conf.h"	42	#include "conf.h"
44	#include "slog.h"	43	#include "slog.h"
45	#include "util.h"	44	#include "util.h"
46		45
47	char *confbase;	46	char *confbase;
48	char *thisnode;	47	char *thisnode;
49	char *identname;	48	char *identname;
50	char *pidfilename;
51		49
52	struct configuration conf;	50	struct configuration conf;
53		51
54	configuration::configuration ()	52	u8 best_protocol (u8 protset)
55	{	53	{
56	init ();	54	if (protset & PROT_IPv4 ) return PROT_IPv4;
57	}	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	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58		59
59	configuration::~configuration ()	60	return 0;
		61	}
		62
		63	const char *strprotocol (u8 protocol)
60	{	64	{
61	cleanup ();	65	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	if (protocol & PROT_DNSv4 ) return "dns";
		70
		71	return "<unknown>";
		72	}
		73
		74	void
		75	conf_node::print ()
		76	{
		77	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	}
		90
		91	conf_node::~conf_node ()
		92	{
		93	if (rsa_key)
		94	RSA_free (rsa_key);
		95
		96	free (nodename);
		97	free (hostname);
		98	#if ENABLE_DNS
		99	free (domain);
		100	free (dns_hostname);
		101	#endif
62	}	102	}
63		103
64	void configuration::init ()	104	void configuration::init ()
65	{	105	{
66	memset (this, 0, sizeof (*this));	106	memset (this, 0, sizeof (*this));
67		107
		108	mtu = DEFAULT_MTU;
68	rekey = DEFAULT_REKEY;	109	rekey = DEFAULT_REKEY;
69	keepalive = DEFAULT_KEEPALIVE;	110	keepalive = DEFAULT_KEEPALIVE;
70	llevel = L_INFO;	111	llevel = L_INFO;
		112	ip_proto = IPPROTO_GRE;
		113	#if ENABLE_ICMP
		114	icmp_type = ICMP_ECHOREPLY;
		115	#endif
71		116
72	default_node.port = DEFAULT_PORT;	117	default_node.udp_port = DEFAULT_UDPPORT;
		118	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73	default_node.connectmode = conf_node::C_ALWAYS;	119	default_node.connectmode = conf_node::C_ALWAYS;
74	default_node.compress = true;	120	default_node.compress = true;
		121	default_node.protocols = 0;
		122	default_node.max_retry = DEFAULT_MAX_RETRY;
		123
		124	#if ENABLE_DNS
		125	default_node.dns_port = 0; // default is 0 == client
		126	dns_forw_host = strdup ("127.0.0.1");
		127	dns_forw_port = 53;
		128	#endif
		129
		130	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
75	}	131	}
76		132
77	void configuration::cleanup()	133	void configuration::cleanup()
78	{	134	{
79	if (rsa_key)	135	if (rsa_key)
80	RSA_free (rsa_key);	136	RSA_free (rsa_key);
81		137
82	free (ifname);
83
84	rsa_key = 0;	138	rsa_key = 0;
85	ifname = 0;	139
		140	free (pidfilename); pidfilename = 0;
		141	free (ifname); ifname = 0;
		142	#if ENABLE_HTTP_PROXY
		143	free (proxy_host); proxy_host = 0;
		144	free (proxy_auth); proxy_auth = 0;
		145	#endif
		146	#if ENABLE_DNS
		147	free (dns_forw_host); dns_forw_host = 0;
		148	#endif
86	}	149	}
87		150
88	void	151	void
89	configuration::clear_config ()	152	configuration::clear_config ()
90	{	153	{
…		…
95		158
96	cleanup ();	159	cleanup ();
97	init ();	160	init ();
98	}	161	}
99		162
		163	#define parse_bool(target,name,trueval,falseval) \
		164	if (!strcmp (val, "yes")) target = trueval; \
		165	else if (!strcmp (val, "no")) target = falseval; \
		166	else if (!strcmp (val, "true")) target = trueval; \
		167	else if (!strcmp (val, "false")) target = falseval; \
		168	else if (!strcmp (val, "on")) target = trueval; \
		169	else if (!strcmp (val, "off")) target = falseval; \
		170	else \
		171	slog (L_WARN, \
		172	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \
		173	name, var, fname, lineno);
		174
100	void configuration::read_config (bool need_keys)	175	void configuration::read_config (bool need_keys)
101	{	176	{
102	char *fname;	177	char *fname;
103	FILE *f;	178	FILE *f;
104		179
105	clear_config ();	180	clear_config ();
106		181
107	asprintf (&fname, "%s/vped.conf", confbase);	182	asprintf (&fname, "%s/gvpe.conf", confbase);
108	f = fopen (fname, "r");	183	f = fopen (fname, "r");
109		184
110	if (f)	185	if (f)
111	{	186	{
112	char line[16384];	187	char line[16384];
…		…
167	if (l != L_NONE)	242	if (l != L_NONE)
168	llevel = l;	243	llevel = l;
169	else	244	else
170	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);	245	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171	}	246	}
		247	else if (!strcmp (var, "ip-proto"))
		248	ip_proto = atoi (val);
		249	else if (!strcmp (var, "icmp-type"))
		250	{
		251	#if ENABLE_ICMP
		252	icmp_type = atoi (val);
		253	#endif
		254	}
172		255
173	// per config	256	// per config
174	else if (!strcmp (var, "node"))	257	else if (!strcmp (var, "node"))
175	{	258	{
176	default_node.id++;	259	default_node.id++;
…		…
194		277
195	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))	278	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196	{	279	{
197	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	280	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));	281	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199	exit (1);	282	exit (EXIT_FAILURE);
200	}	283	}
201		284
202	RSA_blinding_on (node->rsa_key, 0);	285	require (RSA_blinding_on (node->rsa_key, 0));
203		286
204	fclose (f);	287	fclose (f);
205	}	288	}
206	else	289	else
207	{	290	{
208	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));	291	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209		292
210	if (need_keys)	293	if (need_keys)
211	exit (1);	294	exit (EXIT_FAILURE);
212	}	295	}
213		296
214	free (fname);	297	free (fname);
215	}	298	}
216		299
217	if (!::thisnode \|\| !strcmp (node->nodename, ::thisnode))	300	if (::thisnode && !strcmp (node->nodename, ::thisnode))
218	thisnode = node;	301	thisnode = node;
219	}	302	}
220	else if (!strcmp (var, "private-key"))	303	else if (!strcmp (var, "private-key"))
221	prikeyfile = strdup (val);	304	free (prikeyfile), prikeyfile = strdup (val);
222	else if (!strcmp (var, "ifpersist"))	305	else if (!strcmp (var, "ifpersist"))
223	{	306	{
224	if (!strcmp (val, "yes"))	307	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	}	308	}
233	else if (!strcmp (var, "ifname"))	309	else if (!strcmp (var, "ifname"))
234	ifname = strdup (val);	310	free (ifname), ifname = strdup (val);
235	else if (!strcmp (var, "rekey"))	311	else if (!strcmp (var, "rekey"))
236	rekey = atoi (val);	312	rekey = atoi (val);
237	else if (!strcmp (var, "keepalive"))	313	else if (!strcmp (var, "keepalive"))
238	keepalive = atoi (val);	314	keepalive = atoi (val);
239	else if (!strcmp (var, "mtu"))	315	else if (!strcmp (var, "mtu"))
240	mtu = atoi (val);	316	mtu = atoi (val);
241	else if (!strcmp (var, "if-up"))	317	else if (!strcmp (var, "if-up"))
242	script_if_up = strdup (val);	318	free (script_if_up), script_if_up = strdup (val);
243	else if (!strcmp (var, "node-up"))	319	else if (!strcmp (var, "node-up"))
244	script_node_up = strdup (val);	320	free (script_node_up), script_node_up = strdup (val);
245	else if (!strcmp (var, "node-down"))	321	else if (!strcmp (var, "node-down"))
246	script_node_down = strdup (val);	322	free (script_node_down), script_node_down = strdup (val);
		323	else if (!strcmp (var, "pid-file"))
		324	free (pidfilename), pidfilename = strdup (val);
		325	else if (!strcmp (var, "dns-forw-host"))
		326	{
		327	#if ENABLE_DNS
		328	free (dns_forw_host), dns_forw_host = strdup (val);
		329	#endif
		330	}
		331	else if (!strcmp (var, "dns-forw-port"))
		332	{
		333	#if ENABLE_DNS
		334	dns_forw_port = atoi (val);
		335	#endif
		336	}
		337	else if (!strcmp (var, "http-proxy-host"))
		338	{
		339	#if ENABLE_HTTP_PROXY
		340	free (proxy_host), proxy_host = strdup (val);
		341	#endif
		342	}
		343	else if (!strcmp (var, "http-proxy-port"))
		344	{
		345	#if ENABLE_HTTP_PROXY
		346	proxy_port = atoi (val);
		347	#endif
		348	}
		349	else if (!strcmp (var, "http-proxy-auth"))
		350	{
		351	#if ENABLE_HTTP_PROXY
		352	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
		353	#endif
		354	}
247		355
248	/* node-specific, non-defaultable */	356	/* node-specific, non-defaultable */
249	else if (node != &default_node && !strcmp (var, "hostname"))	357	else if (node != &default_node && !strcmp (var, "hostname"))
250	{
251	free (node->hostname);
252	node->hostname = strdup (val);	358	free (node->hostname), node->hostname = strdup (val);
253	}
254		359
255	/* node-specific, defaultable */	360	/* node-specific, defaultable */
256	else if (!strcmp (var, "udp-port"))	361	else if (!strcmp (var, "udp-port"))
257	node->port = atoi (val);	362	node->udp_port = atoi (val);
258	else if (!strcmp (var, "port")) //deprecated	363	else if (!strcmp (var, "tcp-port"))
259	node->port = atoi (val);	364	node->tcp_port = atoi (val);
		365	else if (!strcmp (var, "dns-hostname"))
		366	{
		367	#if ENABLE_DNS
		368	free (node->dns_hostname), node->dns_hostname = strdup (val);
		369	#endif
		370	}
		371	else if (!strcmp (var, "dns-port"))
		372	{
		373	#if ENABLE_DNS
		374	node->dns_port = atoi (val);
		375	#endif
		376	}
		377	else if (!strcmp (var, "dns-domain"))
		378	{
		379	#if ENABLE_DNS
		380	free (node->domain), node->domain = strdup (val);
		381	#endif
		382	}
260	else if (!strcmp (var, "router-priority"))	383	else if (!strcmp (var, "router-priority"))
261	node->routerprio = atoi (val);	384	node->routerprio = atoi (val);
		385	else if (!strcmp (var, "max-retry"))
		386	node->max_retry = atoi (val);
262	else if (!strcmp (var, "connect"))	387	else if (!strcmp (var, "connect"))
263	{	388	{
264	if (!strcmp (val, "ondemand"))	389	if (!strcmp (val, "ondemand"))
265	node->connectmode = conf_node::C_ONDEMAND;	390	node->connectmode = conf_node::C_ONDEMAND;
266	else if (!strcmp (val, "never"))	391	else if (!strcmp (val, "never"))
…		…
269	node->connectmode = conf_node::C_ALWAYS;	394	node->connectmode = conf_node::C_ALWAYS;
270	else if (!strcmp (val, "disabled"))	395	else if (!strcmp (val, "disabled"))
271	node->connectmode = conf_node::C_DISABLED;	396	node->connectmode = conf_node::C_DISABLED;
272	else	397	else
273	slog (L_WARN,	398	slog (L_WARN,
274	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),	399	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275	var, fname, lineno);	400	var, fname, lineno);
276	}	401	}
277	else if (!strcmp (var, "inherit-tos"))	402	else if (!strcmp (var, "inherit-tos"))
278	{	403	{
279	if (!strcmp (val, "yes"))	404	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	405	}
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"))	406	else if (!strcmp (var, "compress"))
290	{	407	{
291	if (!strcmp (val, "yes"))	408	parse_bool (node->compress, "compress", true, false);
292	node->compress = true;	409	}
		410	// all these bool options really really cost a lot of executable size!
		411	else if (!strcmp (var, "enable-tcp"))
		412	{
		413	#if ENABLE_TCP
		414	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
		415	#endif
		416	}
		417	else if (!strcmp (var, "enable-icmp"))
		418	{
		419	#if ENABLE_ICMP
		420	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
		421	#endif
		422	}
293	else if (!strcmp (val, "no"))	423	else if (!strcmp (var, "enable-dns"))
294	node->compress = false;
295	else	424	{
296	slog (L_WARN,	425	#if ENABLE_DNS
297	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),	426	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
298	var, fname, lineno);	427	#endif
		428	}
		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;
299	}	436	}
300		437
301	// unknown or misplaced	438	// unknown or misplaced
302	else	439	else
303	{
304	slog (L_WARN,	440	slog (L_WARN,
305	_("unknown or misplaced variable `%s', at '%s' line %d"),	441	_("unknown or misplaced variable `%s', at '%s' line %d"),
306	var, fname, lineno);	442	var, fname, lineno);
307	}
308	}	443	}
309		444
310	fclose (f);	445	fclose (f);
311	}	446	}
312	else	447	else
313	{	448	{
314	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	449	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
315	exit (1);	450	exit (EXIT_FAILURE);
316	}	451	}
317		452
318	free (fname);	453	free (fname);
319		454
320	fname = config_filename (prikeyfile, "hostkey");	455	fname = config_filename (prikeyfile, "hostkey");
…		…
326		461
327	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	462	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
328	{	463	{
329	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	464	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));	465	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
331	exit (1);	466	exit (EXIT_FAILURE);
332	}	467	}
333		468
334	RSA_blinding_on (rsa_key, 0);	469	require (RSA_blinding_on (rsa_key, 0));
335		470
336	fclose (f);	471	fclose (f);
337	}	472	}
338	else	473	else
339	{	474	{
340	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));	475	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341		476
342	if (need_keys)	477	if (need_keys)
343	exit (1);	478	exit (EXIT_FAILURE);
344	}	479	}
		480
		481	if (need_keys && ::thisnode
		482	&& rsa_key && thisnode && thisnode->rsa_key)
		483	if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
		484	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
		485	{
		486	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
		487	exit (EXIT_FAILURE);
		488	}
345		489
346	free (fname);	490	free (fname);
347	}	491	}
348		492
349	char configuration::config_filename (const char name, const char *dflt)	493	char configuration::config_filename (const char name, const char *dflt)
…		…
371	printf (_("MTU: %d\n"), mtu);	515	printf (_("MTU: %d\n"), mtu);
372	printf (_("rekeying interval: %d\n"), rekey);	516	printf (_("rekeying interval: %d\n"), rekey);
373	printf (_("keepalive interval: %d\n"), keepalive);	517	printf (_("keepalive interval: %d\n"), keepalive);
374	printf (_("interface: %s\n"), ifname);	518	printf (_("interface: %s\n"), ifname);
375	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");	519	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1);	520	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377	printf ("\n");	521	printf ("\n");
378		522
379	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",	523	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));	524	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381		525
…		…
383	(*i)->print ();	527	(*i)->print ();
384		528
385	printf ("\n");	529	printf ("\n");
386	}	530	}
387		531
388	void	532	configuration::configuration ()
389	conf_node::print ()
390	{	533	{
391	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",	534	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		535
		536	init ();
		537	}
		538
		539	configuration::~configuration ()
		540	{
		541	cleanup ();
		542	}
		543
		544

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.35 by pcg, Fri Mar 18 01:53:05 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.35 by pcg, Fri Mar 18 01:53:05 2005 UTC