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

Comparing gvpe/src/conf.C (file contents):
Revision 1.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.44 by pcg, Thu Aug 7 17:54:26 2008 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-2008 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 it
10	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
11	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
12	(at your option) any later version.	10	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, but
15	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	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 GNU General
17	GNU General Public License for more details.	15	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 along
20	along with this program; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
21	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.
22	*/	30	*/
23		31
24	#include "config.h"	32	#include "config.h"
25		33
26	#include <cstdio>	34	#include <cstdio>
37		45
38	#include <openssl/err.h>	46	#include <openssl/err.h>
39	#include <openssl/pem.h>	47	#include <openssl/pem.h>
40	#include <openssl/rsa.h>	48	#include <openssl/rsa.h>
41	#include <openssl/rand.h>	49	#include <openssl/rand.h>
42		50	#include <openssl/bn.h>
43	#include "gettext.h"
44		51
45	#include "conf.h"	52	#include "conf.h"
46	#include "slog.h"	53	#include "slog.h"
47	#include "util.h"	54	#include "util.h"
48		55
49	char *confbase;	56	char *confbase;
50	char *thisnode;	57	char *thisnode;
51	char *identname;	58	char *identname;
52	char *pidfilename;
53		59
54	struct configuration conf;	60	struct configuration conf;
55		61
56	u8 best_protocol (u8 protset)	62	u8 best_protocol (u8 protset)
57	{	63	{
58	if (protset & PROT_IPv4 ) return PROT_IPv4;	64	if (protset & PROT_IPv4 ) return PROT_IPv4;
59	if (protset & PROT_ICMPv4) return PROT_ICMPv4;	65	if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60	if (protset & PROT_UDPv4 ) return PROT_UDPv4;	66	if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61	if (protset & PROT_TCPv4 ) return PROT_TCPv4;	67	if (protset & PROT_TCPv4 ) return PROT_TCPv4;
		68	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
62		69
63	return 0;	70	return 0;
64	}	71	}
65		72
66	const char *strprotocol (u8 protocol)	73	const char *strprotocol (u8 protocol)
67	{	74	{
68	if (protocol & PROT_IPv4 ) return "rawip";	75	if (protocol & PROT_IPv4 ) return "rawip";
69	if (protocol & PROT_ICMPv4) return "icmp";	76	if (protocol & PROT_ICMPv4) return "icmp";
70	if (protocol & PROT_UDPv4 ) return "udp";	77	if (protocol & PROT_UDPv4 ) return "udp";
71	if (protocol & PROT_TCPv4 ) return "tcp";	78	if (protocol & PROT_TCPv4 ) return "tcp";
		79	if (protocol & PROT_DNSv4 ) return "dns";
72		80
73	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;
74	}	106	}
75		107
76	void	108	void
77	conf_node::print ()	109	conf_node::print ()
78	{	110	{
…		…
90	);	122	);
91	}	123	}
92		124
93	conf_node::~conf_node ()	125	conf_node::~conf_node ()
94	{	126	{
		127	#if 0
		128	// does not work, because string pointers etc. are shared
		129	// is not called, however
95	if (rsa_key)	130	if (rsa_key)
96	RSA_free (rsa_key);	131	RSA_free (rsa_key);
97		132
98	free (nodename);	133	free (nodename);
99	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
100	}	141	}
101		142
102	void configuration::init ()	143	void configuration::init ()
103	{	144	{
104	memset (this, 0, sizeof (*this));	145	memset (this, 0, sizeof (*this));
105		146
		147	mtu = DEFAULT_MTU;
106	rekey = DEFAULT_REKEY;	148	rekey = DEFAULT_REKEY;
107	keepalive = DEFAULT_KEEPALIVE;	149	keepalive = DEFAULT_KEEPALIVE;
108	llevel = L_INFO;	150	llevel = L_INFO;
109	ip_proto = IPPROTO_GRE;	151	ip_proto = IPPROTO_GRE;
110	#if ENABLE_ICMP	152	#if ENABLE_ICMP
111	icmp_type = ICMP_ECHOREPLY;	153	icmp_type = ICMP_ECHOREPLY;
112	#endif	154	#endif
113		155
114	default_node.udp_port = DEFAULT_UDPPORT;	156	default_node.udp_port = DEFAULT_UDPPORT;
115	default_node.tcp_port = DEFAULT_UDPPORT;	157	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116	default_node.connectmode = conf_node::C_ALWAYS;	158	default_node.connectmode = conf_node::C_ALWAYS;
117	default_node.compress = true;	159	default_node.compress = true;
118	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 ("");
		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
		177	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119	}	178	}
120		179
121	void configuration::cleanup()	180	void configuration::cleanup()
122	{	181	{
123	if (rsa_key)	182	if (rsa_key)
124	RSA_free (rsa_key);	183	RSA_free (rsa_key);
125		184
126	rsa_key = 0;	185	rsa_key = 0;
127		186
		187	free (pidfilename); pidfilename = 0;
128	free (ifname); ifname = 0;	188	free (ifname); ifname = 0;
129	#if ENABLE_HTTP_PROXY	189	#if ENABLE_HTTP_PROXY
130	free (proxy_host); proxy_host = 0;	190	free (proxy_host); proxy_host = 0;
131	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;
132	#endif	195	#endif
133	}	196	}
134		197
135	void	198	void
136	configuration::clear_config ()	199	configuration::clear ()
137	{	200	{
138	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)
139	delete *i;	202	delete *i;
140		203
141	nodes.clear ();	204	nodes.clear ();
142		205
143	cleanup ();	206	cleanup ();
144	init ();	207	init ();
145	}	208	}
146		209
147	#define parse_bool(target,name,trueval,falseval) \	210	#define parse_bool(target,name,trueval,falseval) do { \
148	if (!strcmp (val, "yes")) target = trueval; \	211	if (!strcmp (val, "yes")) target = trueval; \
149	else if (!strcmp (val, "no")) target = falseval; \	212	else if (!strcmp (val, "no")) target = falseval; \
150	else if (!strcmp (val, "true")) target = trueval; \	213	else if (!strcmp (val, "true")) target = trueval; \
151	else if (!strcmp (val, "false")) target = falseval; \	214	else if (!strcmp (val, "false")) target = falseval; \
152	else if (!strcmp (val, "on")) target = trueval; \	215	else if (!strcmp (val, "on")) target = trueval; \
153	else if (!strcmp (val, "off")) target = falseval; \	216	else if (!strcmp (val, "off")) target = falseval; \
154	else \	217	else \
155	slog (L_WARN, \	218	return _("illegal boolean value, only 'yes\|true\|on' or 'no\|false\|off' allowed. (ignored)"); \
156	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \	219	} while (0)
157	name, var, fname, lineno);
158		220
159	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	node->max_queue = atoi (val);
		481
		482	// unknown or misplaced
		483	else
		484	return _("unknown configuration directive. (ignored)");
		485
		486	return 0;
		487	}
		488
		489	void configuration_parser::parse_argv ()
		490	{
		491	for (int i = 0; i < argc; ++i)
		492	{
		493	char *v = argv [i];
		494
		495	if (!*v)
		496	continue;
		497
		498	char *enode = v;
		499
		500	while (enode != '.' && enode > ' ' && enode != '=' && enode)
		501	enode++;
		502
		503	if (*enode != '.')
		504	enode = 0;
		505
		506	char *wnode = node == &conf.default_node
		507	? 0
		508	: node->nodename;
		509
		510	if ((!wnode && !enode)
		511	\|\| (wnode && enode && !strncmp (wnode, v, enode - v)))
		512	{
		513	const char *warn = parse_line (enode ? enode + 1 : v);
		514
		515	if (warn)
		516	slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
		517
		518	*v = 0;
		519	}
		520	}
		521	}
		522
		523	configuration_parser::configuration_parser (configuration &conf,
		524	bool need_keys,
		525	int argc,
		526	char **argv)
		527	: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
160	{	528	{
161	char *fname;	529	char *fname;
162	FILE *f;	530	FILE *f;
163		531
164	clear_config ();	532	conf.clear ();
165		533
166	asprintf (&fname, "%s/vped.conf", confbase);	534	asprintf (&fname, "%s/gvpe.conf", confbase);
167	f = fopen (fname, "r");	535	f = fopen (fname, "r");
168		536
169	if (f)	537	if (f)
170	{	538	{
171	char line[16384];	539	char line[16384];
172	int lineno = 0;	540	int lineno = 0;
173	char var, val;	541	node = &conf.default_node;
174	conf_node *node = &default_node;
175		542
176	while (fgets (line, sizeof (line), f))	543	while (fgets (line, sizeof (line), f))
177	{	544	{
178	lineno++;	545	lineno++;
179		546
180	{	547	const char *warn = parse_line (line);
181	char *end = line + strlen (line);
182		548
183	while (*end < ' ' && end >= line)	549	if (warn)
184	end--;	550	slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
185
186	*++end = 0;
187	}
188
189	char *tok = line;
190
191	retry:
192	var = strtok (tok, "\t =");
193	tok = 0;
194
195	if (!var \|\| !var[0])
196	continue; /* no tokens on this line */
197
198	if (var[0] == '#')
199	continue; /* comment: ignore */
200
201	val = strtok (NULL, "\t\n\r =");
202
203	if (!val \|\| val[0] == '#')
204	{
205	slog (L_WARN,
206	_("no value for variable `%s', at '%s' line %d"),
207	var, fname, lineno);
208	break;
209	}
210
211	if (!strcmp (var, "on"))
212	{
213	if (!::thisnode
214	\|\| (val[0] == '!' && strcmp (val + 1, ::thisnode))
215	\|\| !strcmp (val, ::thisnode))
216	goto retry;
217
218	continue;
219	}
220
221	// truly global
222	if (!strcmp (var, "loglevel"))
223	{
224	loglevel l = string_to_loglevel (val);
225
226	if (l != L_NONE)
227	llevel = l;
228	else
229	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230	}
231	else if (!strcmp (var, "ip-proto"))
232	ip_proto = atoi (val);
233	#if ENABLE_ICMP
234	//TODO: error message
235	else if (!strcmp (var, "icmp-type"))
236	icmp_type = atoi (val);
237	#endif
238
239	// per config
240	else if (!strcmp (var, "node"))
241	{
242	default_node.id++;
243
244	node = new conf_node (default_node);
245
246	nodes.push_back (node);
247
248	node->nodename = strdup (val);
249
250	{
251	char *fname;
252	FILE *f;
253
254	asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
255
256	f = fopen (fname, "r");
257	if (f)
258	{
259	node->rsa_key = RSA_new ();
260
261	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262	{
263	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
264	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265	exit (1);
266	}
267
268	RSA_blinding_on (node->rsa_key, 0);
269
270	fclose (f);
271	}
272	else
273	{
274	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275
276	if (need_keys)
277	exit (1);
278	}
279
280	free (fname);
281	}
282
283	if (!::thisnode \|\| !strcmp (node->nodename, ::thisnode))
284	thisnode = node;
285	}
286	else if (!strcmp (var, "private-key"))
287	prikeyfile = strdup (val);
288	else if (!strcmp (var, "ifpersist"))
289	{
290	parse_bool (ifpersist, "ifpersist", true, false);
291	}
292	else if (!strcmp (var, "ifname"))
293	ifname = strdup (val);
294	else if (!strcmp (var, "rekey"))
295	rekey = atoi (val);
296	else if (!strcmp (var, "keepalive"))
297	keepalive = atoi (val);
298	else if (!strcmp (var, "mtu"))
299	mtu = atoi (val);
300	else if (!strcmp (var, "if-up"))
301	script_if_up = strdup (val);
302	else if (!strcmp (var, "node-up"))
303	script_node_up = strdup (val);
304	else if (!strcmp (var, "node-down"))
305	script_node_down = strdup (val);
306	#if ENABLE_HTTP_PROXY
307	else if (!strcmp (var, "http-proxy-host"))
308	proxy_host = strdup (val);
309	else if (!strcmp (var, "http-proxy-port"))
310	proxy_port = atoi (val);
311	else if (!strcmp (var, "http-proxy-auth"))
312	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
313	#endif
314
315	/* node-specific, non-defaultable */
316	else if (node != &default_node && !strcmp (var, "hostname"))
317	{
318	free (node->hostname);
319	node->hostname = strdup (val);
320	}
321
322	/* node-specific, defaultable */
323	else if (!strcmp (var, "udp-port"))
324	node->udp_port = atoi (val);
325	else if (!strcmp (var, "tcp-port"))
326	node->tcp_port = atoi (val);
327	else if (!strcmp (var, "router-priority"))
328	node->routerprio = atoi (val);
329	else if (!strcmp (var, "connect"))
330	{
331	if (!strcmp (val, "ondemand"))
332	node->connectmode = conf_node::C_ONDEMAND;
333	else if (!strcmp (val, "never"))
334	node->connectmode = conf_node::C_NEVER;
335	else if (!strcmp (val, "always"))
336	node->connectmode = conf_node::C_ALWAYS;
337	else if (!strcmp (val, "disabled"))
338	node->connectmode = conf_node::C_DISABLED;
339	else
340	slog (L_WARN,
341	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
342	var, fname, lineno);
343	}
344	else if (!strcmp (var, "inherit-tos"))
345	{
346	parse_bool (node->inherit_tos, "inherit-tos", true, false);
347	}
348	else if (!strcmp (var, "compress"))
349	{
350	parse_bool (node->compress, "compress", true, false);
351	}
352	// all these bool options really really cost a lot of executable size!
353	else if (!strcmp (var, "enable-tcp"))
354	{
355	#if ENABLE_TCP
356	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
357	#endif
358	}
359	else if (!strcmp (var, "enable-icmp"))
360	{
361	#if ENABLE_ICMP
362	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
363	#endif
364	}
365	else if (!strcmp (var, "enable-udp"))
366	{
367	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
368	}
369	else if (!strcmp (var, "enable-rawip"))
370	{
371	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
372	}
373
374	// unknown or misplaced
375	else
376	slog (L_WARN,
377	_("unknown or misplaced variable `%s', at '%s' line %d"),
378	var, fname, lineno);
379	}	551	}
380		552
381	fclose (f);	553	fclose (f);
		554
		555	parse_argv ();
382	}	556	}
383	else	557	else
384	{	558	{
385	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	559	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386	exit (1);	560	exit (EXIT_FAILURE);
387	}	561	}
388		562
389	free (fname);	563	free (fname);
390		564
391	fname = config_filename (prikeyfile, "hostkey");	565	fname = conf.config_filename (conf.prikeyfile, "hostkey");
392		566
393	f = fopen (fname, "r");	567	f = fopen (fname, "r");
394	if (f)	568	if (f)
395	{	569	{
396	rsa_key = RSA_new ();	570	conf.rsa_key = RSA_new ();
397		571
398	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	572	if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
399	{	573	{
400	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	574	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
401	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	575	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402	exit (1);	576	exit (EXIT_FAILURE);
403	}	577	}
404		578
405	RSA_blinding_on (rsa_key, 0);	579	require (RSA_blinding_on (conf.rsa_key, 0));
406		580
407	fclose (f);	581	fclose (f);
408	}	582	}
409	else	583	else
410	{	584	{
411	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));	585	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412		586
413	if (need_keys)	587	if (need_keys)
414	exit (1);	588	exit (EXIT_FAILURE);
		589	}
		590
		591	if (need_keys && ::thisnode
		592	&& conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
		593	if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
		594	\|\| BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
		595	{
		596	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
		597	exit (EXIT_FAILURE);
415	}	598	}
416		599
417	free (fname);	600	free (fname);
418	}	601	}
419		602
420	char configuration::config_filename (const char name, const char *dflt)	603	char configuration::config_filename (const char name, const char *dflt)
…		…
456	printf ("\n");	639	printf ("\n");
457	}	640	}
458		641
459	configuration::configuration ()	642	configuration::configuration ()
460	{	643	{
		644	asprintf (&confbase, "%s/gvpe", CONFDIR);
		645
461	init ();	646	init ();
462	}	647	}
463		648
464	configuration::~configuration ()	649	configuration::~configuration ()
465	{	650	{

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs. Revision 1.44 by pcg, Thu Aug 7 17:54:26 2008 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.44 by pcg, Thu Aug 7 17:54:26 2008 UTC