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

Comparing gvpe/src/conf.C (file contents):
Revision 1.35 by pcg, Fri Mar 18 01:53:05 2005 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-2005 Marc Lehmann <gvpe@schmorp.de>	3	Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4		4
5	This file is part of GVPE.	5	This file is part of GVPE.
6		6
7	GVPE is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify it
8	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
9	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
10	(at your option) any later version.	10	option) any later version.
11		11
12	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
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15	GNU General Public License for more details.	15	Public License for more details.
16		16
17	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
18	along with gvpe; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
19	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.
20	*/	30	*/
21		31
22	#include "config.h"	32	#include "config.h"
23		33
24	#include <cstdio>	34	#include <cstdio>
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);
98	#if ENABLE_DNS	136	#if ENABLE_DNS
99	free (domain);	137	free (domain);
100	free (dns_hostname);	138	free (dns_hostname);
		139	#endif
101	#endif	140	#endif
102	}	141	}
103		142
104	void configuration::init ()	143	void configuration::init ()
105	{	144	{
…		…
118	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm	157	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119	default_node.connectmode = conf_node::C_ALWAYS;	158	default_node.connectmode = conf_node::C_ALWAYS;
120	default_node.compress = true;	159	default_node.compress = true;
121	default_node.protocols = 0;	160	default_node.protocols = 0;
122	default_node.max_retry = DEFAULT_MAX_RETRY;	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 ("");
123		165
124	#if ENABLE_DNS	166	#if ENABLE_DNS
125	default_node.dns_port = 0; // default is 0 == client	167	default_node.dns_port = 0; // default is 0 == client
		168
126	dns_forw_host = strdup ("127.0.0.1");	169	dns_forw_host = strdup ("127.0.0.1");
127	dns_forw_port = 53;	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;
128	#endif	175	#endif
129		176
130	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");	177	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
131	}	178	}
132		179
…		…
147	free (dns_forw_host); dns_forw_host = 0;	194	free (dns_forw_host); dns_forw_host = 0;
148	#endif	195	#endif
149	}	196	}
150		197
151	void	198	void
152	configuration::clear_config ()	199	configuration::clear ()
153	{	200	{
154	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)
155	delete *i;	202	delete *i;
156		203
157	nodes.clear ();	204	nodes.clear ();
158		205
159	cleanup ();	206	cleanup ();
160	init ();	207	init ();
161	}	208	}
162		209
163	#define parse_bool(target,name,trueval,falseval) \	210	#define parse_bool(target,name,trueval,falseval) do { \
164	if (!strcmp (val, "yes")) target = trueval; \	211	if (!strcmp (val, "yes")) target = trueval; \
165	else if (!strcmp (val, "no")) target = falseval; \	212	else if (!strcmp (val, "no")) target = falseval; \
166	else if (!strcmp (val, "true")) target = trueval; \	213	else if (!strcmp (val, "true")) target = trueval; \
167	else if (!strcmp (val, "false")) target = falseval; \	214	else if (!strcmp (val, "false")) target = falseval; \
168	else if (!strcmp (val, "on")) target = trueval; \	215	else if (!strcmp (val, "on")) target = trueval; \
169	else if (!strcmp (val, "off")) target = falseval; \	216	else if (!strcmp (val, "off")) target = falseval; \
170	else \	217	else \
171	slog (L_WARN, \	218	return _("illegal boolean value, only 'yes\|true\|on' or 'no\|false\|off' allowed. (ignored)"); \
172	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \	219	} while (0)
173	name, var, fname, lineno);
174		220
175	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)
176	{	533	{
177	char *fname;	534	char *fname;
178	FILE *f;	535	FILE *f;
179		536
180	clear_config ();	537	conf.clear ();
181		538
182	asprintf (&fname, "%s/gvpe.conf", confbase);	539	asprintf (&fname, "%s/gvpe.conf", confbase);
183	f = fopen (fname, "r");	540	f = fopen (fname, "r");
184		541
185	if (f)	542	if (f)
186	{	543	{
187	char line[16384];	544	char line[16384];
188	int lineno = 0;	545	int lineno = 0;
189	char var, val;	546	node = &conf.default_node;
190	conf_node *node = &default_node;
191		547
192	while (fgets (line, sizeof (line), f))	548	while (fgets (line, sizeof (line), f))
193	{	549	{
194	lineno++;	550	lineno++;
195		551
196	{	552	const char *warn = parse_line (line);
197	char *end = line + strlen (line);
198		553
199	while (*end < ' ' && end >= line)	554	if (warn)
200	end--;	555	slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
201
202	*++end = 0;
203	}
204
205	char *tok = line;
206
207	retry:
208	var = strtok (tok, "\t =");
209	tok = 0;
210
211	if (!var \|\| !var[0])
212	continue; /* no tokens on this line */
213
214	if (var[0] == '#')
215	continue; /* comment: ignore */
216
217	val = strtok (NULL, "\t\n\r =");
218
219	if (!val \|\| val[0] == '#')
220	{
221	slog (L_WARN,
222	_("no value for variable `%s', at '%s' line %d"),
223	var, fname, lineno);
224	break;
225	}
226
227	if (!strcmp (var, "on"))
228	{
229	if (!::thisnode
230	\|\| (val[0] == '!' && strcmp (val + 1, ::thisnode))
231	\|\| !strcmp (val, ::thisnode))
232	goto retry;
233
234	continue;
235	}
236
237	// truly global
238	if (!strcmp (var, "loglevel"))
239	{
240	loglevel l = string_to_loglevel (val);
241
242	if (l != L_NONE)
243	llevel = l;
244	else
245	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
246	}
247	else if (!strcmp (var, "ip-proto"))
248	ip_proto = atoi (val);
249	else if (!strcmp (var, "icmp-type"))
250	{
251	#if ENABLE_ICMP
252	icmp_type = atoi (val);
253	#endif
254	}
255
256	// per config
257	else if (!strcmp (var, "node"))
258	{
259	default_node.id++;
260
261	node = new conf_node (default_node);
262
263	nodes.push_back (node);
264
265	node->nodename = strdup (val);
266
267	{
268	char *fname;
269	FILE *f;
270
271	asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
272
273	f = fopen (fname, "r");
274	if (f)
275	{
276	node->rsa_key = RSA_new ();
277
278	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
279	{
280	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
281	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
282	exit (EXIT_FAILURE);
283	}
284
285	require (RSA_blinding_on (node->rsa_key, 0));
286
287	fclose (f);
288	}
289	else
290	{
291	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
292
293	if (need_keys)
294	exit (EXIT_FAILURE);
295	}
296
297	free (fname);
298	}
299
300	if (::thisnode && !strcmp (node->nodename, ::thisnode))
301	thisnode = node;
302	}
303	else if (!strcmp (var, "private-key"))
304	free (prikeyfile), prikeyfile = strdup (val);
305	else if (!strcmp (var, "ifpersist"))
306	{
307	parse_bool (ifpersist, "ifpersist", true, false);
308	}
309	else if (!strcmp (var, "ifname"))
310	free (ifname), ifname = strdup (val);
311	else if (!strcmp (var, "rekey"))
312	rekey = atoi (val);
313	else if (!strcmp (var, "keepalive"))
314	keepalive = atoi (val);
315	else if (!strcmp (var, "mtu"))
316	mtu = atoi (val);
317	else if (!strcmp (var, "if-up"))
318	free (script_if_up), script_if_up = strdup (val);
319	else if (!strcmp (var, "node-up"))
320	free (script_node_up), script_node_up = strdup (val);
321	else if (!strcmp (var, "node-down"))
322	free (script_node_down), script_node_down = strdup (val);
323	else if (!strcmp (var, "pid-file"))
324	free (pidfilename), pidfilename = strdup (val);
325	else if (!strcmp (var, "dns-forw-host"))
326	{
327	#if ENABLE_DNS
328	free (dns_forw_host), dns_forw_host = strdup (val);
329	#endif
330	}
331	else if (!strcmp (var, "dns-forw-port"))
332	{
333	#if ENABLE_DNS
334	dns_forw_port = atoi (val);
335	#endif
336	}
337	else if (!strcmp (var, "http-proxy-host"))
338	{
339	#if ENABLE_HTTP_PROXY
340	free (proxy_host), proxy_host = strdup (val);
341	#endif
342	}
343	else if (!strcmp (var, "http-proxy-port"))
344	{
345	#if ENABLE_HTTP_PROXY
346	proxy_port = atoi (val);
347	#endif
348	}
349	else if (!strcmp (var, "http-proxy-auth"))
350	{
351	#if ENABLE_HTTP_PROXY
352	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
353	#endif
354	}
355
356	/* node-specific, non-defaultable */
357	else if (node != &default_node && !strcmp (var, "hostname"))
358	free (node->hostname), node->hostname = strdup (val);
359
360	/* node-specific, defaultable */
361	else if (!strcmp (var, "udp-port"))
362	node->udp_port = atoi (val);
363	else if (!strcmp (var, "tcp-port"))
364	node->tcp_port = atoi (val);
365	else if (!strcmp (var, "dns-hostname"))
366	{
367	#if ENABLE_DNS
368	free (node->dns_hostname), node->dns_hostname = strdup (val);
369	#endif
370	}
371	else if (!strcmp (var, "dns-port"))
372	{
373	#if ENABLE_DNS
374	node->dns_port = atoi (val);
375	#endif
376	}
377	else if (!strcmp (var, "dns-domain"))
378	{
379	#if ENABLE_DNS
380	free (node->domain), node->domain = strdup (val);
381	#endif
382	}
383	else if (!strcmp (var, "router-priority"))
384	node->routerprio = atoi (val);
385	else if (!strcmp (var, "max-retry"))
386	node->max_retry = atoi (val);
387	else if (!strcmp (var, "connect"))
388	{
389	if (!strcmp (val, "ondemand"))
390	node->connectmode = conf_node::C_ONDEMAND;
391	else if (!strcmp (val, "never"))
392	node->connectmode = conf_node::C_NEVER;
393	else if (!strcmp (val, "always"))
394	node->connectmode = conf_node::C_ALWAYS;
395	else if (!strcmp (val, "disabled"))
396	node->connectmode = conf_node::C_DISABLED;
397	else
398	slog (L_WARN,
399	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
400	var, fname, lineno);
401	}
402	else if (!strcmp (var, "inherit-tos"))
403	{
404	parse_bool (node->inherit_tos, "inherit-tos", true, false);
405	}
406	else if (!strcmp (var, "compress"))
407	{
408	parse_bool (node->compress, "compress", true, false);
409	}
410	// all these bool options really really cost a lot of executable size!
411	else if (!strcmp (var, "enable-tcp"))
412	{
413	#if ENABLE_TCP
414	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
415	#endif
416	}
417	else if (!strcmp (var, "enable-icmp"))
418	{
419	#if ENABLE_ICMP
420	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
421	#endif
422	}
423	else if (!strcmp (var, "enable-dns"))
424	{
425	#if ENABLE_DNS
426	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
427	#endif
428	}
429	else if (!strcmp (var, "enable-udp"))
430	{
431	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
432	}
433	else if (!strcmp (var, "enable-rawip"))
434	{
435	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
436	}
437
438	// unknown or misplaced
439	else
440	slog (L_WARN,
441	_("unknown or misplaced variable `%s', at '%s' line %d"),
442	var, fname, lineno);
443	}	556	}
444		557
445	fclose (f);	558	fclose (f);
		559
		560	parse_argv ();
446	}	561	}
447	else	562	else
448	{	563	{
449	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));
450	exit (EXIT_FAILURE);	565	exit (EXIT_FAILURE);
451	}	566	}
452		567
453	free (fname);	568	free (fname);
454		569
455	fname = config_filename (prikeyfile, "hostkey");	570	fname = conf.config_filename (conf.prikeyfile, "hostkey");
456		571
457	f = fopen (fname, "r");	572	f = fopen (fname, "r");
458	if (f)	573	if (f)
459	{	574	{
460	rsa_key = RSA_new ();	575	conf.rsa_key = RSA_new ();
461		576
462	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	577	if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
463	{	578	{
464	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	579	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
465	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));
466	exit (EXIT_FAILURE);	581	exit (EXIT_FAILURE);
467	}	582	}
468		583
469	require (RSA_blinding_on (rsa_key, 0));	584	require (RSA_blinding_on (conf.rsa_key, 0));
470		585
471	fclose (f);	586	fclose (f);
472	}	587	}
473	else	588	else
474	{	589	{
…		…
477	if (need_keys)	592	if (need_keys)
478	exit (EXIT_FAILURE);	593	exit (EXIT_FAILURE);
479	}	594	}
480		595
481	if (need_keys && ::thisnode	596	if (need_keys && ::thisnode
482	&& rsa_key && thisnode && thisnode->rsa_key)	597	&& conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
483	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
484	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)	599	\|\| BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
485	{	600	{
486	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);
487	exit (EXIT_FAILURE);	602	exit (EXIT_FAILURE);
488	}	603	}
489		604

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.35 by pcg, Fri Mar 18 01:53:05 2005 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.35 by pcg, Fri Mar 18 01:53:05 2005 UTC vs.
Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC