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

Comparing gvpe/src/conf.C (file contents):
Revision 1.23 by pcg, Thu Jan 29 19:30:08 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;
47	char *thisnode;	57	char *thisnode;
48	char *identname;	58	char *identname;
49	char *pidfilename;
50		59
51	struct configuration conf;	60	struct configuration conf;
52		61
53	u8 best_protocol (u8 protset)	62	u8 best_protocol (u8 protset)
54	{	63	{
55	if (protset & PROT_IPv4 ) return PROT_IPv4;	64	if (protset & PROT_IPv4 ) return PROT_IPv4;
56	if (protset & PROT_ICMPv4) return PROT_ICMPv4;	65	if (protset & PROT_ICMPv4) return PROT_ICMPv4;
57	if (protset & PROT_UDPv4 ) return PROT_UDPv4;	66	if (protset & PROT_UDPv4 ) return PROT_UDPv4;
58	if (protset & PROT_TCPv4 ) return PROT_TCPv4;	67	if (protset & PROT_TCPv4 ) return PROT_TCPv4;
		68	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59		69
60	return 0;	70	return 0;
61	}	71	}
62		72
63	const char *strprotocol (u8 protocol)	73	const char *strprotocol (u8 protocol)
64	{	74	{
65	if (protocol & PROT_IPv4 ) return "rawip";	75	if (protocol & PROT_IPv4 ) return "rawip";
66	if (protocol & PROT_ICMPv4) return "icmp";	76	if (protocol & PROT_ICMPv4) return "icmp";
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";
		79	if (protocol & PROT_DNSv4 ) return "dns";
69		80
70	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;
71	}	106	}
72		107
73	void	108	void
74	conf_node::print ()	109	conf_node::print ()
75	{	110	{
…		…
87	);	122	);
88	}	123	}
89		124
90	conf_node::~conf_node ()	125	conf_node::~conf_node ()
91	{	126	{
		127	#if 0
		128	// does not work, because string pointers etc. are shared
		129	// is not called, however
92	if (rsa_key)	130	if (rsa_key)
93	RSA_free (rsa_key);	131	RSA_free (rsa_key);
94		132
95	free (nodename);	133	free (nodename);
96	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
97	}	141	}
98		142
99	void configuration::init ()	143	void configuration::init ()
100	{	144	{
101	memset (this, 0, sizeof (*this));	145	memset (this, 0, sizeof (*this));
…		…
108	#if ENABLE_ICMP	152	#if ENABLE_ICMP
109	icmp_type = ICMP_ECHOREPLY;	153	icmp_type = ICMP_ECHOREPLY;
110	#endif	154	#endif
111		155
112	default_node.udp_port = DEFAULT_UDPPORT;	156	default_node.udp_port = DEFAULT_UDPPORT;
113	default_node.tcp_port = DEFAULT_UDPPORT;	157	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114	default_node.connectmode = conf_node::C_ALWAYS;	158	default_node.connectmode = conf_node::C_ALWAYS;
115	default_node.compress = true;	159	default_node.compress = true;
116	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");
117	}	178	}
118		179
119	void configuration::cleanup()	180	void configuration::cleanup()
120	{	181	{
121	if (rsa_key)	182	if (rsa_key)
122	RSA_free (rsa_key);	183	RSA_free (rsa_key);
123		184
124	rsa_key = 0;	185	rsa_key = 0;
125		186
		187	free (pidfilename); pidfilename = 0;
126	free (ifname); ifname = 0;	188	free (ifname); ifname = 0;
127	#if ENABLE_HTTP_PROXY	189	#if ENABLE_HTTP_PROXY
128	free (proxy_host); proxy_host = 0;	190	free (proxy_host); proxy_host = 0;
129	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;
130	#endif	195	#endif
131	}	196	}
132		197
133	void	198	void
134	configuration::clear_config ()	199	configuration::clear ()
135	{	200	{
136	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)
137	delete *i;	202	delete *i;
138		203
139	nodes.clear ();	204	nodes.clear ();
140		205
141	cleanup ();	206	cleanup ();
142	init ();	207	init ();
143	}	208	}
144		209
145	#define parse_bool(target,name,trueval,falseval) \	210	#define parse_bool(target,name,trueval,falseval) do { \
146	if (!strcmp (val, "yes")) target = trueval; \	211	if (!strcmp (val, "yes")) target = trueval; \
147	else if (!strcmp (val, "no")) target = falseval; \	212	else if (!strcmp (val, "no")) target = falseval; \
148	else if (!strcmp (val, "true")) target = trueval; \	213	else if (!strcmp (val, "true")) target = trueval; \
149	else if (!strcmp (val, "false")) target = falseval; \	214	else if (!strcmp (val, "false")) target = falseval; \
150	else if (!strcmp (val, "on")) target = trueval; \	215	else if (!strcmp (val, "on")) target = trueval; \
151	else if (!strcmp (val, "off")) target = falseval; \	216	else if (!strcmp (val, "off")) target = falseval; \
152	else \	217	else \
153	slog (L_WARN, \	218	return _("illegal boolean value, only 'yes\|true\|on' or 'no\|false\|off' allowed. (ignored)"); \
154	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \	219	} while (0)
155	name, var, fname, lineno);
156		220
157	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)
158	{	533	{
159	char *fname;	534	char *fname;
160	FILE *f;	535	FILE *f;
161		536
162	clear_config ();	537	conf.clear ();
163		538
164	asprintf (&fname, "%s/vped.conf", confbase);	539	asprintf (&fname, "%s/gvpe.conf", confbase);
165	f = fopen (fname, "r");	540	f = fopen (fname, "r");
166		541
167	if (f)	542	if (f)
168	{	543	{
169	char line[16384];	544	char line[16384];
170	int lineno = 0;	545	int lineno = 0;
171	char var, val;	546	node = &conf.default_node;
172	conf_node *node = &default_node;
173		547
174	while (fgets (line, sizeof (line), f))	548	while (fgets (line, sizeof (line), f))
175	{	549	{
176	lineno++;	550	lineno++;
177		551
178	{	552	const char *warn = parse_line (line);
179	char *end = line + strlen (line);
180		553
181	while (*end < ' ' && end >= line)	554	if (warn)
182	end--;	555	slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
183
184	*++end = 0;
185	}
186
187	char *tok = line;
188
189	retry:
190	var = strtok (tok, "\t =");
191	tok = 0;
192
193	if (!var \|\| !var[0])
194	continue; /* no tokens on this line */
195
196	if (var[0] == '#')
197	continue; /* comment: ignore */
198
199	val = strtok (NULL, "\t\n\r =");
200
201	if (!val \|\| val[0] == '#')
202	{
203	slog (L_WARN,
204	_("no value for variable `%s', at '%s' line %d"),
205	var, fname, lineno);
206	break;
207	}
208
209	if (!strcmp (var, "on"))
210	{
211	if (!::thisnode
212	\|\| (val[0] == '!' && strcmp (val + 1, ::thisnode))
213	\|\| !strcmp (val, ::thisnode))
214	goto retry;
215
216	continue;
217	}
218
219	// truly global
220	if (!strcmp (var, "loglevel"))
221	{
222	loglevel l = string_to_loglevel (val);
223
224	if (l != L_NONE)
225	llevel = l;
226	else
227	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
228	}
229	else if (!strcmp (var, "ip-proto"))
230	ip_proto = atoi (val);
231	else if (!strcmp (var, "icmp-type"))
232	{
233	#if ENABLE_ICMP
234	icmp_type = atoi (val);
235	#endif
236	}
237
238	// per config
239	else if (!strcmp (var, "node"))
240	{
241	default_node.id++;
242
243	node = new conf_node (default_node);
244
245	nodes.push_back (node);
246
247	node->nodename = strdup (val);
248
249	{
250	char *fname;
251	FILE *f;
252
253	asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254
255	f = fopen (fname, "r");
256	if (f)
257	{
258	node->rsa_key = RSA_new ();
259
260	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261	{
262	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264	exit (EXIT_FAILURE);
265	}
266
267	require (RSA_blinding_on (node->rsa_key, 0));
268
269	fclose (f);
270	}
271	else
272	{
273	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274
275	if (need_keys)
276	exit (EXIT_FAILURE);
277	}
278
279	free (fname);
280	}
281
282	if (::thisnode && !strcmp (node->nodename, ::thisnode))
283	thisnode = node;
284	}
285	else if (!strcmp (var, "private-key"))
286	prikeyfile = strdup (val);
287	else if (!strcmp (var, "ifpersist"))
288	{
289	parse_bool (ifpersist, "ifpersist", true, false);
290	}
291	else if (!strcmp (var, "ifname"))
292	ifname = strdup (val);
293	else if (!strcmp (var, "rekey"))
294	rekey = atoi (val);
295	else if (!strcmp (var, "keepalive"))
296	keepalive = atoi (val);
297	else if (!strcmp (var, "mtu"))
298	mtu = atoi (val);
299	else if (!strcmp (var, "if-up"))
300	script_if_up = strdup (val);
301	else if (!strcmp (var, "node-up"))
302	script_node_up = strdup (val);
303	else if (!strcmp (var, "node-down"))
304	script_node_down = strdup (val);
305	else if (!strcmp (var, "http-proxy-host"))
306	{
307	#if ENABLE_HTTP_PROXY
308	proxy_host = strdup (val);
309	#endif
310	}
311	else if (!strcmp (var, "http-proxy-port"))
312	{
313	#if ENABLE_HTTP_PROXY
314	proxy_port = atoi (val);
315	#endif
316	}
317	else if (!strcmp (var, "http-proxy-auth"))
318	{
319	#if ENABLE_HTTP_PROXY
320	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
321	#endif
322	}
323
324	/* node-specific, non-defaultable */
325	else if (node != &default_node && !strcmp (var, "hostname"))
326	{
327	free (node->hostname);
328	node->hostname = strdup (val);
329	}
330
331	/* node-specific, defaultable */
332	else if (!strcmp (var, "udp-port"))
333	node->udp_port = atoi (val);
334	else if (!strcmp (var, "tcp-port"))
335	node->tcp_port = atoi (val);
336	else if (!strcmp (var, "router-priority"))
337	node->routerprio = atoi (val);
338	else if (!strcmp (var, "connect"))
339	{
340	if (!strcmp (val, "ondemand"))
341	node->connectmode = conf_node::C_ONDEMAND;
342	else if (!strcmp (val, "never"))
343	node->connectmode = conf_node::C_NEVER;
344	else if (!strcmp (val, "always"))
345	node->connectmode = conf_node::C_ALWAYS;
346	else if (!strcmp (val, "disabled"))
347	node->connectmode = conf_node::C_DISABLED;
348	else
349	slog (L_WARN,
350	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
351	var, fname, lineno);
352	}
353	else if (!strcmp (var, "inherit-tos"))
354	{
355	parse_bool (node->inherit_tos, "inherit-tos", true, false);
356	}
357	else if (!strcmp (var, "compress"))
358	{
359	parse_bool (node->compress, "compress", true, false);
360	}
361	// all these bool options really really cost a lot of executable size!
362	else if (!strcmp (var, "enable-tcp"))
363	{
364	#if ENABLE_TCP
365	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
366	#endif
367	}
368	else if (!strcmp (var, "enable-icmp"))
369	{
370	#if ENABLE_ICMP
371	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
372	#endif
373	}
374	else if (!strcmp (var, "enable-udp"))
375	{
376	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
377	}
378	else if (!strcmp (var, "enable-rawip"))
379	{
380	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
381	}
382
383	// unknown or misplaced
384	else
385	slog (L_WARN,
386	_("unknown or misplaced variable `%s', at '%s' line %d"),
387	var, fname, lineno);
388	}	556	}
389		557
390	fclose (f);	558	fclose (f);
		559
		560	parse_argv ();
391	}	561	}
392	else	562	else
393	{	563	{
394	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));
395	exit (EXIT_FAILURE);	565	exit (EXIT_FAILURE);
396	}	566	}
397		567
398	free (fname);	568	free (fname);
399		569
400	fname = config_filename (prikeyfile, "hostkey");	570	fname = conf.config_filename (conf.prikeyfile, "hostkey");
401		571
402	f = fopen (fname, "r");	572	f = fopen (fname, "r");
403	if (f)	573	if (f)
404	{	574	{
405	rsa_key = RSA_new ();	575	conf.rsa_key = RSA_new ();
406		576
407	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	577	if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
408	{	578	{
409	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	579	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
410	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));
411	exit (EXIT_FAILURE);	581	exit (EXIT_FAILURE);
412	}	582	}
413		583
414	require (RSA_blinding_on (rsa_key, 0));	584	require (RSA_blinding_on (conf.rsa_key, 0));
415		585
416	fclose (f);	586	fclose (f);
417	}	587	}
418	else	588	else
419	{	589	{
…		…
422	if (need_keys)	592	if (need_keys)
423	exit (EXIT_FAILURE);	593	exit (EXIT_FAILURE);
424	}	594	}
425		595
426	if (need_keys && ::thisnode	596	if (need_keys && ::thisnode
427	&& rsa_key && thisnode && thisnode->rsa_key)	597	&& conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
428	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
429	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)	599	\|\| BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
430	{	600	{
431	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);
432	exit (EXIT_FAILURE);	602	exit (EXIT_FAILURE);
433	}	603	}
434		604
…		…
474	printf ("\n");	644	printf ("\n");
475	}	645	}
476		646
477	configuration::configuration ()	647	configuration::configuration ()
478	{	648	{
		649	asprintf (&confbase, "%s/gvpe", CONFDIR);
		650
479	init ();	651	init ();
480	}	652	}
481		653
482	configuration::~configuration ()	654	configuration::~configuration ()
483	{	655	{

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.23 by pcg, Thu Jan 29 19:30:08 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.23 by pcg, Thu Jan 29 19:30:08 2004 UTC vs.
Revision 1.45 by pcg, Fri Aug 8 16:48:00 2008 UTC