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

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.43 by pcg, Thu Aug 7 16:34:21 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.43 by pcg, Thu Aug 7 16:34:21 2008 UTC