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

Comparing gvpe/src/conf.C (file contents):
Revision 1.21 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.42 by pcg, Mon Dec 5 12:58:08 2005 UTC

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

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.21 by pcg, Sat Jan 17 01:18:36 2004 UTC vs. Revision 1.42 by pcg, Mon Dec 5 12:58:08 2005 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.21 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.42 by pcg, Mon Dec 5 12:58:08 2005 UTC