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

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.38 by pcg, Wed Mar 23 17:03:58 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.38 by pcg, Wed Mar 23 17:03:58 2005 UTC