[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.39 by pcg, Sat Mar 26 03:16:24 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 0
		94	// does not work, because string pointers etc. are shared
		95	// is not called, however
		96	if (rsa_key)
		97	RSA_free (rsa_key);
		98
		99	free (nodename);
		100	free (hostname);
		101	free (if_up_data);
		102	#if ENABLE_DNS
		103	free (domain);
		104	free (dns_hostname);
		105	#endif
		106	#endif
62	}	107	}
63		108
64	void configuration::init ()	109	void configuration::init ()
65	{	110	{
66	memset (this, 0, sizeof (*this));	111	memset (this, 0, sizeof (*this));
67		112
		113	mtu = DEFAULT_MTU;
68	rekey = DEFAULT_REKEY;	114	rekey = DEFAULT_REKEY;
69	keepalive = DEFAULT_KEEPALIVE;	115	keepalive = DEFAULT_KEEPALIVE;
70	llevel = L_INFO;	116	llevel = L_INFO;
		117	ip_proto = IPPROTO_GRE;
		118	#if ENABLE_ICMP
		119	icmp_type = ICMP_ECHOREPLY;
		120	#endif
71		121
72	default_node.port = DEFAULT_PORT;	122	default_node.udp_port = DEFAULT_UDPPORT;
		123	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73	default_node.connectmode = conf_node::C_ALWAYS;	124	default_node.connectmode = conf_node::C_ALWAYS;
74	default_node.compress = true;	125	default_node.compress = true;
		126	default_node.protocols = 0;
		127	default_node.max_retry = DEFAULT_MAX_RETRY;
		128	default_node.if_up_data = strdup ("");
		129
		130	#if ENABLE_DNS
		131	default_node.dns_port = 0; // default is 0 == client
		132
		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	#endif
		140
		141	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
75	}	142	}
76		143
77	void configuration::cleanup()	144	void configuration::cleanup()
78	{	145	{
79	if (rsa_key)	146	if (rsa_key)
80	RSA_free (rsa_key);	147	RSA_free (rsa_key);
81		148
82	free (ifname);
83
84	rsa_key = 0;	149	rsa_key = 0;
85	ifname = 0;	150
		151	free (pidfilename); pidfilename = 0;
		152	free (ifname); ifname = 0;
		153	#if ENABLE_HTTP_PROXY
		154	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	#endif
86	}	160	}
87		161
88	void	162	void
89	configuration::clear_config ()	163	configuration::clear_config ()
90	{	164	{
…		…
95		169
96	cleanup ();	170	cleanup ();
97	init ();	171	init ();
98	}	172	}
99		173
		174	#define parse_bool(target,name,trueval,falseval) do { \
		175	if (!strcmp (val, "yes")) target = trueval; \
		176	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	slog (L_WARN, \
		183	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \
		184	name, var, fname, lineno); \
		185	} while (0)
		186
100	void configuration::read_config (bool need_keys)	187	void configuration::read_config (bool need_keys)
101	{	188	{
102	char *fname;	189	char *fname;
103	FILE *f;	190	FILE *f;
104		191
105	clear_config ();	192	clear_config ();
106		193
107	asprintf (&fname, "%s/vped.conf", confbase);	194	asprintf (&fname, "%s/gvpe.conf", confbase);
108	f = fopen (fname, "r");	195	f = fopen (fname, "r");
109		196
110	if (f)	197	if (f)
111	{	198	{
112	char line[16384];	199	char line[16384];
…		…
142	val = strtok (NULL, "\t\n\r =");	229	val = strtok (NULL, "\t\n\r =");
143		230
144	if (!val \|\| val[0] == '#')	231	if (!val \|\| val[0] == '#')
145	{	232	{
146	slog (L_WARN,	233	slog (L_WARN,
147	_("no value for variable `%s', at '%s' line %d"),	234	_("no value for variable `%s', at '%s' line %d, skipping."),
148	var, fname, lineno);	235	var, fname, lineno);
149	break;	236	continue;
150	}	237	}
151		238
152	if (!strcmp (var, "on"))	239	if (!strcmp (var, "on"))
153	{	240	{
154	if (!::thisnode	241	if (!::thisnode
…		…
167	if (l != L_NONE)	254	if (l != L_NONE)
168	llevel = l;	255	llevel = l;
169	else	256	else
170	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);	257	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171	}	258	}
		259	else if (!strcmp (var, "ip-proto"))
		260	ip_proto = atoi (val);
		261	else if (!strcmp (var, "icmp-type"))
		262	{
		263	#if ENABLE_ICMP
		264	icmp_type = atoi (val);
		265	#endif
		266	}
172		267
173	// per config	268	// per config
174	else if (!strcmp (var, "node"))	269	else if (!strcmp (var, "node"))
175	{	270	{
176	default_node.id++;	271	default_node.id++;
…		…
194		289
195	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))	290	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196	{	291	{
197	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	292	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));	293	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199	exit (1);	294	exit (EXIT_FAILURE);
200	}	295	}
201		296
202	RSA_blinding_on (node->rsa_key, 0);	297	require (RSA_blinding_on (node->rsa_key, 0));
203		298
204	fclose (f);	299	fclose (f);
205	}	300	}
206	else	301	else
207	{	302	{
208	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));	303	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209		304
210	if (need_keys)	305	if (need_keys)
211	exit (1);	306	exit (EXIT_FAILURE);
212	}	307	}
213		308
214	free (fname);	309	free (fname);
215	}	310	}
216		311
217	if (!::thisnode \|\| !strcmp (node->nodename, ::thisnode))	312	if (::thisnode && !strcmp (node->nodename, ::thisnode))
218	thisnode = node;	313	thisnode = node;
219	}	314	}
220	else if (!strcmp (var, "private-key"))	315	else if (!strcmp (var, "private-key"))
221	prikeyfile = strdup (val);	316	free (prikeyfile), prikeyfile = strdup (val);
222	else if (!strcmp (var, "ifpersist"))	317	else if (!strcmp (var, "ifpersist"))
223	{	318	parse_bool (ifpersist, "ifpersist", true, false);
224	if (!strcmp (val, "yes"))
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	}
233	else if (!strcmp (var, "ifname"))	319	else if (!strcmp (var, "ifname"))
234	ifname = strdup (val);	320	free (ifname), ifname = strdup (val);
235	else if (!strcmp (var, "rekey"))	321	else if (!strcmp (var, "rekey"))
236	rekey = atoi (val);	322	rekey = atoi (val);
237	else if (!strcmp (var, "keepalive"))	323	else if (!strcmp (var, "keepalive"))
238	keepalive = atoi (val);	324	keepalive = atoi (val);
239	else if (!strcmp (var, "mtu"))	325	else if (!strcmp (var, "mtu"))
240	mtu = atoi (val);	326	mtu = atoi (val);
241	else if (!strcmp (var, "if-up"))	327	else if (!strcmp (var, "if-up"))
242	script_if_up = strdup (val);	328	free (script_if_up), script_if_up = strdup (val);
243	else if (!strcmp (var, "node-up"))	329	else if (!strcmp (var, "node-up"))
244	script_node_up = strdup (val);	330	free (script_node_up), script_node_up = strdup (val);
245	else if (!strcmp (var, "node-down"))	331	else if (!strcmp (var, "node-down"))
246	script_node_down = strdup (val);	332	free (script_node_down), script_node_down = strdup (val);
		333	else if (!strcmp (var, "pid-file"))
		334	free (pidfilename), pidfilename = strdup (val);
		335	else if (!strcmp (var, "dns-forw-host"))
		336	{
		337	#if ENABLE_DNS
		338	free (dns_forw_host), dns_forw_host = strdup (val);
		339	#endif
		340	}
		341	else if (!strcmp (var, "dns-forw-port"))
		342	{
		343	#if ENABLE_DNS
		344	dns_forw_port = atoi (val);
		345	#endif
		346	}
		347	else if (!strcmp (var, "dns-timeout-factor"))
		348	{
		349	#if ENABLE_DNS
		350	dns_timeout_factor = atof (val);
		351	#endif
		352	}
		353	else if (!strcmp (var, "dns-send-interval"))
		354	{
		355	#if ENABLE_DNS
		356	dns_send_interval = atoi (val);
		357	#endif
		358	}
		359	else if (!strcmp (var, "dns-overlap-factor"))
		360	{
		361	#if ENABLE_DNS
		362	dns_overlap_factor = atof (val);
		363	#endif
		364	}
		365	else if (!strcmp (var, "dns-max-outstanding"))
		366	{
		367	#if ENABLE_DNS
		368	dns_max_outstanding = atoi (val);
		369	#endif
		370	}
		371	else if (!strcmp (var, "http-proxy-host"))
		372	{
		373	#if ENABLE_HTTP_PROXY
		374	free (proxy_host), proxy_host = strdup (val);
		375	#endif
		376	}
		377	else if (!strcmp (var, "http-proxy-port"))
		378	{
		379	#if ENABLE_HTTP_PROXY
		380	proxy_port = atoi (val);
		381	#endif
		382	}
		383	else if (!strcmp (var, "http-proxy-auth"))
		384	{
		385	#if ENABLE_HTTP_PROXY
		386	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
		387	#endif
		388	}
247		389
248	/* node-specific, non-defaultable */	390	/* node-specific, non-defaultable */
249	else if (node != &default_node && !strcmp (var, "hostname"))	391	else if (node != &default_node && !strcmp (var, "hostname"))
250	{
251	free (node->hostname);
252	node->hostname = strdup (val);	392	free (node->hostname), node->hostname = strdup (val);
253	}
254		393
255	/* node-specific, defaultable */	394	/* node-specific, defaultable */
256	else if (!strcmp (var, "udp-port"))	395	else if (!strcmp (var, "udp-port"))
257	node->port = atoi (val);	396	node->udp_port = atoi (val);
258	else if (!strcmp (var, "port")) //deprecated	397	else if (!strcmp (var, "tcp-port"))
259	node->port = atoi (val);	398	node->tcp_port = atoi (val);
		399	else if (!strcmp (var, "dns-hostname"))
		400	{
		401	#if ENABLE_DNS
		402	free (node->dns_hostname), node->dns_hostname = strdup (val);
		403	#endif
		404	}
		405	else if (!strcmp (var, "dns-port"))
		406	{
		407	#if ENABLE_DNS
		408	node->dns_port = atoi (val);
		409	#endif
		410	}
		411	else if (!strcmp (var, "dns-domain"))
		412	{
		413	#if ENABLE_DNS
		414	free (node->domain), node->domain = strdup (val);
		415	#endif
		416	}
		417	else if (!strcmp (var, "if-up-data"))
		418	free (node->if_up_data), node->if_up_data = strdup (val);
260	else if (!strcmp (var, "router-priority"))	419	else if (!strcmp (var, "router-priority"))
261	node->routerprio = atoi (val);	420	node->routerprio = atoi (val);
		421	else if (!strcmp (var, "max-retry"))
		422	node->max_retry = atoi (val);
262	else if (!strcmp (var, "connect"))	423	else if (!strcmp (var, "connect"))
263	{	424	{
264	if (!strcmp (val, "ondemand"))	425	if (!strcmp (val, "ondemand"))
265	node->connectmode = conf_node::C_ONDEMAND;	426	node->connectmode = conf_node::C_ONDEMAND;
266	else if (!strcmp (val, "never"))	427	else if (!strcmp (val, "never"))
…		…
269	node->connectmode = conf_node::C_ALWAYS;	430	node->connectmode = conf_node::C_ALWAYS;
270	else if (!strcmp (val, "disabled"))	431	else if (!strcmp (val, "disabled"))
271	node->connectmode = conf_node::C_DISABLED;	432	node->connectmode = conf_node::C_DISABLED;
272	else	433	else
273	slog (L_WARN,	434	slog (L_WARN,
274	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),	435	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
275	var, fname, lineno);	436	var, fname, lineno);
276	}	437	}
277	else if (!strcmp (var, "inherit-tos"))	438	else if (!strcmp (var, "inherit-tos"))
278	{	439	parse_bool (node->inherit_tos, "inherit-tos", true, false);
279	if (!strcmp (val, "yes"))
280	node->inherit_tos = true;
281	else if (!strcmp (val, "no"))
282	node->inherit_tos = false;
283	else
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"))	440	else if (!strcmp (var, "compress"))
		441	parse_bool (node->compress, "compress", true, false);
		442	// all these bool options really really cost a lot of executable size!
		443	else if (!strcmp (var, "enable-tcp"))
		444	{
		445	#if ENABLE_TCP
		446	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
		447	#endif
290	{	448	}
291	if (!strcmp (val, "yes"))	449	else if (!strcmp (var, "enable-icmp"))
292	node->compress = true;	450	{
		451	#if ENABLE_ICMP
		452	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
		453	#endif
		454	}
293	else if (!strcmp (val, "no"))	455	else if (!strcmp (var, "enable-dns"))
294	node->compress = false;
295	else	456	{
296	slog (L_WARN,	457	#if ENABLE_DNS
297	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),	458	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
298	var, fname, lineno);	459	#endif
		460	}
		461	else if (!strcmp (var, "enable-udp"))
		462	{
		463	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
		464	}
		465	else if (!strcmp (var, "enable-rawip"))
		466	{
		467	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
299	}	468	}
300		469
301	// unknown or misplaced	470	// unknown or misplaced
302	else	471	else
303	{
304	slog (L_WARN,	472	slog (L_WARN,
305	_("unknown or misplaced variable `%s', at '%s' line %d"),	473	_("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
306	var, fname, lineno);	474	var, fname, lineno);
307	}
308	}	475	}
309		476
310	fclose (f);	477	fclose (f);
311	}	478	}
312	else	479	else
313	{	480	{
314	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	481	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
315	exit (1);	482	exit (EXIT_FAILURE);
316	}	483	}
317		484
318	free (fname);	485	free (fname);
319		486
320	fname = config_filename (prikeyfile, "hostkey");	487	fname = config_filename (prikeyfile, "hostkey");
…		…
326		493
327	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	494	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
328	{	495	{
329	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	496	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));	497	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
331	exit (1);	498	exit (EXIT_FAILURE);
332	}	499	}
333		500
334	RSA_blinding_on (rsa_key, 0);	501	require (RSA_blinding_on (rsa_key, 0));
335		502
336	fclose (f);	503	fclose (f);
337	}	504	}
338	else	505	else
339	{	506	{
340	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));	507	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341		508
342	if (need_keys)	509	if (need_keys)
343	exit (1);	510	exit (EXIT_FAILURE);
344	}	511	}
		512
		513	if (need_keys && ::thisnode
		514	&& rsa_key && thisnode && thisnode->rsa_key)
		515	if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
		516	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
		517	{
		518	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
		519	exit (EXIT_FAILURE);
		520	}
345		521
346	free (fname);	522	free (fname);
347	}	523	}
348		524
349	char configuration::config_filename (const char name, const char *dflt)	525	char configuration::config_filename (const char name, const char *dflt)
…		…
371	printf (_("MTU: %d\n"), mtu);	547	printf (_("MTU: %d\n"), mtu);
372	printf (_("rekeying interval: %d\n"), rekey);	548	printf (_("rekeying interval: %d\n"), rekey);
373	printf (_("keepalive interval: %d\n"), keepalive);	549	printf (_("keepalive interval: %d\n"), keepalive);
374	printf (_("interface: %s\n"), ifname);	550	printf (_("interface: %s\n"), ifname);
375	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");	551	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1);	552	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377	printf ("\n");	553	printf ("\n");
378		554
379	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",	555	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));	556	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381		557
…		…
383	(*i)->print ();	559	(*i)->print ();
384		560
385	printf ("\n");	561	printf ("\n");
386	}	562	}
387		563
388	void	564	configuration::configuration ()
389	conf_node::print ()
390	{	565	{
391	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",	566	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		567
		568	init ();
		569	}
		570
		571	configuration::~configuration ()
		572	{
		573	cleanup ();
		574	}
		575
		576

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.39 by pcg, Sat Mar 26 03:16:24 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.39 by pcg, Sat Mar 26 03:16:24 2005 UTC