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

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

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.25 by pcg, Mon May 10 20:13:09 2004 UTC vs. Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.25 by pcg, Mon May 10 20:13:09 2004 UTC vs.
Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC