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

Comparing gvpe/src/conf.C (file contents):
Revision 1.18 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.49 by pcg, Sun Aug 10 22:18:58 2008 UTC

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

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.18 by pcg, Thu Oct 16 02:41:21 2003 UTC vs. Revision 1.49 by pcg, Sun Aug 10 22:18:58 2008 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.18 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.49 by pcg, Sun Aug 10 22:18:58 2008 UTC