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

Comparing gvpe/src/conf.C (file contents):
Revision 1.37 by pcg, Wed Mar 23 14:33:34 2005 UTC vs.
Revision 1.56 by root, Sun Mar 6 21:01:36 2011 UTC

…		…
1	/*	1	/*
2	conf.c -- configuration code	2	conf.C -- configuration code
3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>	3	Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4		4
5	This file is part of GVPE.	5	This file is part of GVPE.
6		6
7	GVPE is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	8	under the terms of the GNU General Public License as published by the
9	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
10	(at your option) any later version.	10	option) any later version.
11		11
12	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15	GNU General Public License for more details.	15	Public License for more details.
16		16
17	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License along
18	along with gvpe; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19
		20	Additional permission under GNU GPL version 3 section 7
		21
		22	If you modify this Program, or any covered work, by linking or
		23	combining it with the OpenSSL project's OpenSSL library (or a modified
		24	version of that library), containing parts covered by the terms of the
		25	OpenSSL or SSLeay licenses, the licensors of this Program grant you
		26	additional permission to convey the resulting work. Corresponding
		27	Source for a non-source form of such a combination shall include the
		28	source code for the parts of OpenSSL used as well as that of the
		29	covered work.
20	*/	30	*/
21		31
22	#include "config.h"	32	#include "config.h"
23		33
24	#include <cstdio>	34	#include <cstdio>
47	char *thisnode;	57	char *thisnode;
48	char *identname;	58	char *identname;
49		59
50	struct configuration conf;	60	struct configuration conf;
51		61
		62	u8
52	u8 best_protocol (u8 protset)	63	best_protocol (u8 protset)
53	{	64	{
54	if (protset & PROT_IPv4 ) return PROT_IPv4;	65	if (protset & PROT_IPv4 ) return PROT_IPv4;
55	if (protset & PROT_ICMPv4) return PROT_ICMPv4;	66	if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56	if (protset & PROT_UDPv4 ) return PROT_UDPv4;	67	if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57	if (protset & PROT_TCPv4 ) return PROT_TCPv4;	68	if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58	if (protset & PROT_DNSv4 ) return PROT_DNSv4;	69	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59		70
60	return 0;	71	return 0;
61	}	72	}
62		73
		74	const char *
63	const char *strprotocol (u8 protocol)	75	strprotocol (u8 protocol)
64	{	76	{
65	if (protocol & PROT_IPv4 ) return "rawip";	77	if (protocol & PROT_IPv4 ) return "rawip";
66	if (protocol & PROT_ICMPv4) return "icmp";	78	if (protocol & PROT_ICMPv4) return "icmp";
67	if (protocol & PROT_UDPv4 ) return "udp";	79	if (protocol & PROT_UDPv4 ) return "udp";
68	if (protocol & PROT_TCPv4 ) return "tcp";	80	if (protocol & PROT_TCPv4 ) return "tcp";
69	if (protocol & PROT_DNSv4 ) return "dns";	81	if (protocol & PROT_DNSv4 ) return "dns";
70		82
71	return "<unknown>";	83	return "<unknown>";
72	}	84	}
73		85
74	void	86	static bool
75	conf_node::print ()	87	match_list (const vector<const char > &list, const char str)
76	{	88	{
77	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",	89	for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
78	id,	90	if ((i)[0] == '' && !(*i)[1])
79	id >> 8, id & 0xff,	91	return true;
80	compress ? 'Y' : 'N',	92	else if (!strcmp (*i, str))
81	connectmode == C_ONDEMAND ? "ondemand" :	93	return true;
82	connectmode == C_NEVER ? "never" :	94
83	connectmode == C_ALWAYS ? "always" : "",	95	return false;
84	nodename,	96	}
85	hostname ? hostname : "",	97
86	hostname ? ":" : "",	98	bool
87	hostname ? udp_port : 0	99	conf_node::may_direct (struct conf_node *other)
88	);	100	{
		101	if (match_list (allow_direct, other->nodename))
		102	return true;
		103
		104	if (match_list (deny_direct, other->nodename))
		105	return false;
		106
		107	return true;
89	}	108	}
90		109
91	conf_node::~conf_node ()	110	conf_node::~conf_node ()
92	{	111	{
		112	#if 0
		113	// does not work, because string pointers etc. are shared
		114	// is not called, however
93	if (rsa_key)	115	if (rsa_key)
94	RSA_free (rsa_key);	116	RSA_free (rsa_key);
95		117
96	free (nodename);	118	free (nodename);
97	free (hostname);	119	free (hostname);
		120	free (if_up_data);
98	#if ENABLE_DNS	121	#if ENABLE_DNS
99	free (domain);	122	free (domain);
100	free (dns_hostname);	123	free (dns_hostname);
101	#endif	124	#endif
		125	#endif
102	}	126	}
103		127
		128	void
104	void configuration::init ()	129	configuration::init ()
105	{	130	{
106	memset (this, 0, sizeof (*this));	131	memset (this, 0, sizeof (*this));
107		132
108	mtu = DEFAULT_MTU;	133	mtu = DEFAULT_MTU;
		134	nfmark = 0;
109	rekey = DEFAULT_REKEY;	135	rekey = DEFAULT_REKEY;
110	keepalive = DEFAULT_KEEPALIVE;	136	keepalive = DEFAULT_KEEPALIVE;
111	llevel = L_INFO;	137	llevel = L_INFO;
112	ip_proto = IPPROTO_GRE;	138	ip_proto = IPPROTO_GRE;
113	#if ENABLE_ICMP	139	#if ENABLE_ICMP
…		…
118	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm	144	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119	default_node.connectmode = conf_node::C_ALWAYS;	145	default_node.connectmode = conf_node::C_ALWAYS;
120	default_node.compress = true;	146	default_node.compress = true;
121	default_node.protocols = 0;	147	default_node.protocols = 0;
122	default_node.max_retry = DEFAULT_MAX_RETRY;	148	default_node.max_retry = DEFAULT_MAX_RETRY;
		149	default_node.max_ttl = DEFAULT_MAX_TTL;
		150	default_node.max_queue = DEFAULT_MAX_QUEUE;
		151	default_node.if_up_data = strdup ("");
123		152
124	#if ENABLE_DNS	153	#if ENABLE_DNS
125	default_node.dns_port = 0; // default is 0 == client	154	default_node.dns_port = 0; // default is 0 == client
		155
		156	dns_case_preserving = true;
126	dns_forw_host = strdup ("127.0.0.1");	157	dns_forw_host = strdup ("127.0.0.1");
127	dns_forw_port = 53;	158	dns_forw_port = 53;
		159	dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
		160	dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
		161	dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
		162	dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
128	#endif	163	#endif
129		164
130	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");	165	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
131	}	166	}
132		167
		168	void
133	void configuration::cleanup()	169	configuration::cleanup ()
134	{	170	{
135	if (rsa_key)	171	if (rsa_key)
136	RSA_free (rsa_key);	172	RSA_free (rsa_key);
137		173
138	rsa_key = 0;	174	rsa_key = 0;
139		175
140	free (pidfilename); pidfilename = 0;	176	free (pidfilename); pidfilename = 0;
141	free (ifname); ifname = 0;	177	free (ifname); ifname = 0;
142	#if ENABLE_HTTP_PROXY	178	#if ENABLE_HTTP_PROXY
143	free (proxy_host); proxy_host = 0;	179	free (proxy_host); proxy_host = 0;
144	free (proxy_auth); proxy_auth = 0;	180	free (proxy_auth); proxy_auth = 0;
145	#endif	181	#endif
146	#if ENABLE_DNS	182	#if ENABLE_DNS
147	free (dns_forw_host); dns_forw_host = 0;	183	free (dns_forw_host); dns_forw_host = 0;
148	#endif	184	#endif
		185	free (script_if_up); script_if_up = 0;
		186	free (script_node_up); script_node_up = 0;
		187	free (script_node_change); script_node_change = 0;
		188	free (script_node_down); script_node_down = 0;
149	}	189	}
150		190
151	void	191	void
152	configuration::clear_config ()	192	configuration::clear ()
153	{	193	{
154	for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)	194	for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
155	delete *i;	195	delete *i;
156		196
157	nodes.clear ();	197	nodes.clear ();
158		198
159	cleanup ();	199	cleanup ();
160	init ();	200	init ();
161	}	201	}
		202
		203	//static bool
		204	//is_true (const char *name)
		205	//{
		206	//re
		207	//}
162		208
163	#define parse_bool(target,name,trueval,falseval) do { \	209	#define parse_bool(target,name,trueval,falseval) do { \
164	if (!strcmp (val, "yes")) target = trueval; \	210	if (!strcmp (val, "yes")) target = trueval; \
165	else if (!strcmp (val, "no")) target = falseval; \	211	else if (!strcmp (val, "no")) target = falseval; \
166	else if (!strcmp (val, "true")) target = trueval; \	212	else if (!strcmp (val, "true")) target = trueval; \
167	else if (!strcmp (val, "false")) target = falseval; \	213	else if (!strcmp (val, "false")) target = falseval; \
168	else if (!strcmp (val, "on")) target = trueval; \	214	else if (!strcmp (val, "on")) target = trueval; \
169	else if (!strcmp (val, "off")) target = falseval; \	215	else if (!strcmp (val, "off")) target = falseval; \
170	else \	216	else \
171	slog (L_WARN, \
172	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \	217	return _("illegal boolean value, only 'yes\|true\|on' or 'no\|false\|off' allowed, ignored"); \
173	name, var, fname, lineno); \
174	} while (0)	218	} while (0)
175		219
176	void configuration::read_config (bool need_keys)	220	const char *
		221	configuration_parser::parse_line (char *line)
177	{	222	{
		223	{
		224	char *end = line + strlen (line);
		225
		226	while (*end < ' ' && end >= line)
		227	end--;
		228
		229	*++end = 0;
		230	}
		231
		232	char *tok = line;
		233	const char *var = strtok (tok, "\t =");
		234	tok = 0;
		235
		236	if (!var \|\| !var[0])
		237	return 0; /* no tokens on this line */
		238
		239	if (var[0] == '#')
		240	return 0; /* comment: ignore */
		241
		242	char *val = strtok (NULL, "\t\n\r =");
		243
		244	if (!val \|\| val[0] == '#')
		245	return _("no value given for variable, ignored");
		246
		247	else if (!strcmp (var, "on"))
		248	{
		249	if (::thisnode
		250	&& ((val[0] == '!' && strcmp (val + 1, ::thisnode))
		251	\|\| !strcmp (val, ::thisnode)))
		252	return parse_line (strtok (NULL, "\n\r"));
		253	}
		254
		255	else if (!strcmp (var, "include"))
		256	{
		257	char *fname = conf.config_filename (val);
		258	parse_file (fname);
		259	free (fname);
		260	}
		261
		262	// truly global
		263	else if (!strcmp (var, "loglevel"))
		264	{
		265	loglevel l = string_to_loglevel (val);
		266
		267	if (l == L_NONE)
		268	return _("unknown loglevel, ignored");
		269	}
		270	else if (!strcmp (var, "ip-proto"))
		271	conf.ip_proto = atoi (val);
		272	else if (!strcmp (var, "icmp-type"))
		273	{
		274	#if ENABLE_ICMP
		275	conf.icmp_type = atoi (val);
		276	#endif
		277	}
		278
		279	// per config
		280	else if (!strcmp (var, "node"))
		281	{
		282	parse_argv ();
		283
		284	conf.default_node.id++;
		285	node = new conf_node (conf.default_node);
		286	conf.nodes.push_back (node);
		287	node->nodename = strdup (val);
		288
		289	{
178	char *fname;	290	char *fname;
179	FILE *f;	291	FILE *f;
180		292
181	clear_config ();	293	asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
182		294
183	asprintf (&fname, "%s/gvpe.conf", confbase);
184	f = fopen (fname, "r");	295	f = fopen (fname, "r");
		296	if (f)
		297	{
		298	node->rsa_key = RSA_new ();
185		299
186	if (f)	300	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
		301	{
		302	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
		303	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
		304	exit (EXIT_FAILURE);
		305	}
		306
		307	require (RSA_blinding_on (node->rsa_key, 0));
		308
		309	fclose (f);
		310	}
		311	else
		312	{
		313	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
		314
		315	if (need_keys)
		316	exit (EXIT_FAILURE);
		317	}
		318
		319	free (fname);
		320	}
		321
		322	if (::thisnode && !strcmp (node->nodename, ::thisnode))
		323	conf.thisnode = node;
187	{	324	}
		325	else if (!strcmp (var, "private-key"))
		326	free (conf.prikeyfile), conf.prikeyfile = strdup (val);
		327	else if (!strcmp (var, "ifpersist"))
		328	parse_bool (conf.ifpersist, "ifpersist", true, false);
		329	else if (!strcmp (var, "ifname"))
		330	free (conf.ifname), conf.ifname = strdup (val);
		331	else if (!strcmp (var, "rekey"))
		332	conf.rekey = atoi (val);
		333	else if (!strcmp (var, "keepalive"))
		334	conf.keepalive = atoi (val);
		335	else if (!strcmp (var, "mtu"))
		336	conf.mtu = atoi (val);
		337	else if (!strcmp (var, "nfmark"))
		338	conf.nfmark = atoi (val);
		339	else if (!strcmp (var, "if-up"))
		340	free (conf.script_if_up), conf.script_if_up = strdup (val);
		341	else if (!strcmp (var, "node-up"))
		342	free (conf.script_node_up), conf.script_node_up = strdup (val);
		343	else if (!strcmp (var, "node-change"))
		344	free (conf.script_node_change), conf.script_node_change = strdup (val);
		345	else if (!strcmp (var, "node-down"))
		346	free (conf.script_node_down), conf.script_node_down = strdup (val);
		347	else if (!strcmp (var, "pid-file"))
		348	free (conf.pidfilename), conf.pidfilename = strdup (val);
		349	else if (!strcmp (var, "dns-forw-host"))
		350	{
		351	#if ENABLE_DNS
		352	free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
		353	#endif
		354	}
		355	else if (!strcmp (var, "dns-forw-port"))
		356	{
		357	#if ENABLE_DNS
		358	conf.dns_forw_port = atoi (val);
		359	#endif
		360	}
		361	else if (!strcmp (var, "dns-timeout-factor"))
		362	{
		363	#if ENABLE_DNS
		364	conf.dns_timeout_factor = atof (val);
		365	#endif
		366	}
		367	else if (!strcmp (var, "dns-send-interval"))
		368	{
		369	#if ENABLE_DNS
		370	conf.dns_send_interval = atoi (val);
		371	#endif
		372	}
		373	else if (!strcmp (var, "dns-overlap-factor"))
		374	{
		375	#if ENABLE_DNS
		376	conf.dns_overlap_factor = atof (val);
		377	#endif
		378	}
		379	else if (!strcmp (var, "dns-max-outstanding"))
		380	{
		381	#if ENABLE_DNS
		382	conf.dns_max_outstanding = atoi (val);
		383	#endif
		384	}
		385	else if (!strcmp (var, "dns-case-preserving"))
		386	{
		387	#if ENABLE_DNS
		388	parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
		389	#endif
		390	}
		391	else if (!strcmp (var, "http-proxy-host"))
		392	{
		393	#if ENABLE_HTTP_PROXY
		394	free (conf.proxy_host), conf.proxy_host = strdup (val);
		395	#endif
		396	}
		397	else if (!strcmp (var, "http-proxy-port"))
		398	{
		399	#if ENABLE_HTTP_PROXY
		400	conf.proxy_port = atoi (val);
		401	#endif
		402	}
		403	else if (!strcmp (var, "http-proxy-auth"))
		404	{
		405	#if ENABLE_HTTP_PROXY
		406	conf.proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
		407	#endif
		408	}
		409
		410	/* node-specific, non-defaultable */
		411	else if (node != &conf.default_node && !strcmp (var, "hostname"))
		412	free (node->hostname), node->hostname = strdup (val);
		413
		414	/* node-specific, defaultable */
		415	else if (!strcmp (var, "udp-port"))
		416	node->udp_port = atoi (val);
		417	else if (!strcmp (var, "tcp-port"))
		418	node->tcp_port = atoi (val);
		419	else if (!strcmp (var, "dns-hostname"))
		420	{
		421	#if ENABLE_DNS
		422	free (node->dns_hostname), node->dns_hostname = strdup (val);
		423	#endif
		424	}
		425	else if (!strcmp (var, "dns-port"))
		426	{
		427	#if ENABLE_DNS
		428	node->dns_port = atoi (val);
		429	#endif
		430	}
		431	else if (!strcmp (var, "dns-domain"))
		432	{
		433	#if ENABLE_DNS
		434	free (node->domain), node->domain = strdup (val);
		435	#endif
		436	}
		437	else if (!strcmp (var, "if-up-data"))
		438	free (node->if_up_data), node->if_up_data = strdup (val);
		439	else if (!strcmp (var, "router-priority"))
		440	node->routerprio = atoi (val);
		441	else if (!strcmp (var, "max-retry"))
		442	node->max_retry = atoi (val);
		443	else if (!strcmp (var, "connect"))
		444	{
		445	if (!strcmp (val, "ondemand"))
		446	node->connectmode = conf_node::C_ONDEMAND;
		447	else if (!strcmp (val, "never"))
		448	node->connectmode = conf_node::C_NEVER;
		449	else if (!strcmp (val, "always"))
		450	node->connectmode = conf_node::C_ALWAYS;
		451	else if (!strcmp (val, "disabled"))
		452	node->connectmode = conf_node::C_DISABLED;
		453	else
		454	return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
		455	}
		456	else if (!strcmp (var, "inherit-tos"))
		457	parse_bool (node->inherit_tos, "inherit-tos", true, false);
		458	else if (!strcmp (var, "compress"))
		459	parse_bool (node->compress, "compress", true, false);
		460	// all these bool options really really cost a lot of executable size!
		461	else if (!strcmp (var, "enable-tcp"))
		462	{
		463	#if ENABLE_TCP
		464	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
		465	#endif
		466	}
		467	else if (!strcmp (var, "enable-icmp"))
		468	{
		469	#if ENABLE_ICMP
		470	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
		471	#endif
		472	}
		473	else if (!strcmp (var, "enable-dns"))
		474	{
		475	#if ENABLE_DNS
		476	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
		477	#endif
		478	}
		479	else if (!strcmp (var, "enable-udp"))
		480	{
		481	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
		482	}
		483	else if (!strcmp (var, "enable-rawip"))
		484	{
		485	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
		486	}
		487	else if (!strcmp (var, "allow-direct"))
		488	node->allow_direct.push_back (strdup (val));
		489	else if (!strcmp (var, "deny-direct"))
		490	node->deny_direct.push_back (strdup (val));
		491	else if (!strcmp (var, "max-ttl"))
		492	node->max_ttl = atof (val);
		493	else if (!strcmp (var, "max-queue"))
		494	node->max_queue = atoi (val);
		495
		496	// unknown or misplaced
		497	else
		498	return _("unknown configuration directive - ignored");
		499
		500	return 0;
		501	}
		502
		503	void
		504	conf_node::finalise ()
		505	{
		506	if (max_queue < 1)
		507	{
		508	slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
		509	max_queue = 1;
		510	}
		511
		512	if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
		513	{
		514	//slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
		515	connectmode = C_ALWAYS;
		516	}
		517	}
		518
		519	void
		520	configuration_parser::parse_argv ()
		521	{
		522	for (int i = 0; i < argc; ++i)
		523	{
		524	char *v = argv [i];
		525
		526	if (!*v)
		527	continue;
		528
		529	char *enode = v;
		530
		531	while (enode != '.' && enode > ' ' && enode != '=' && enode)
		532	enode++;
		533
		534	if (*enode != '.')
		535	enode = 0;
		536
		537	char *wnode = node == &conf.default_node
		538	? 0
		539	: node->nodename;
		540
		541	if ((!wnode && !enode)
		542	\|\| (wnode && enode && !strncmp (wnode, v, enode - v)))
		543	{
		544	const char *warn = parse_line (enode ? enode + 1 : v);
		545
		546	if (warn)
		547	slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
		548
		549	*v = 0;
		550	}
		551	}
		552	}
		553
		554	void
		555	configuration_parser::parse_file (const char *fname)
		556	{
		557	if (FILE *f = fopen (fname, "r"))
		558	{
188	char line[16384];	559	char line [2048];
189	int lineno = 0;	560	int lineno = 0;
190	char var, val;
191	conf_node *node = &default_node;
192		561
193	while (fgets (line, sizeof (line), f))	562	while (fgets (line, sizeof (line), f))
194	{	563	{
195	lineno++;	564	lineno++;
196		565
197	{	566	const char *warn = parse_line (line);
198	char *end = line + strlen (line);
199		567
200	while (*end < ' ' && end >= line)	568	if (warn)
201	end--;	569	slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
202
203	*++end = 0;
204	}
205
206	char *tok = line;
207
208	retry:
209	var = strtok (tok, "\t =");
210	tok = 0;
211
212	if (!var \|\| !var[0])
213	continue; /* no tokens on this line */
214
215	if (var[0] == '#')
216	continue; /* comment: ignore */
217
218	val = strtok (NULL, "\t\n\r =");
219
220	if (!val \|\| val[0] == '#')
221	{
222	slog (L_WARN,
223	_("no value for variable `%s', at '%s' line %d, skipping."),
224	var, fname, lineno);
225	continue;
226	}
227
228	if (!strcmp (var, "on"))
229	{
230	if (!::thisnode
231	\|\| (val[0] == '!' && strcmp (val + 1, ::thisnode))
232	\|\| !strcmp (val, ::thisnode))
233	goto retry;
234
235	continue;
236	}
237
238	// truly global
239	if (!strcmp (var, "loglevel"))
240	{
241	loglevel l = string_to_loglevel (val);
242
243	if (l != L_NONE)
244	llevel = l;
245	else
246	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
247	}
248	else if (!strcmp (var, "ip-proto"))
249	ip_proto = atoi (val);
250	else if (!strcmp (var, "icmp-type"))
251	{
252	#if ENABLE_ICMP
253	icmp_type = atoi (val);
254	#endif
255	}
256
257	// per config
258	else if (!strcmp (var, "node"))
259	{
260	default_node.id++;
261
262	node = new conf_node (default_node);
263
264	nodes.push_back (node);
265
266	node->nodename = strdup (val);
267
268	{
269	char *fname;
270	FILE *f;
271
272	asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
273
274	f = fopen (fname, "r");
275	if (f)
276	{
277	node->rsa_key = RSA_new ();
278
279	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
280	{
281	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
282	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
283	exit (EXIT_FAILURE);
284	}
285
286	require (RSA_blinding_on (node->rsa_key, 0));
287
288	fclose (f);
289	}
290	else
291	{
292	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
293
294	if (need_keys)
295	exit (EXIT_FAILURE);
296	}
297
298	free (fname);
299	}
300
301	if (::thisnode && !strcmp (node->nodename, ::thisnode))
302	thisnode = node;
303	}
304	else if (!strcmp (var, "private-key"))
305	free (prikeyfile), prikeyfile = strdup (val);
306	else if (!strcmp (var, "ifpersist"))
307	parse_bool (ifpersist, "ifpersist", true, false);
308	else if (!strcmp (var, "ifname"))
309	free (ifname), ifname = strdup (val);
310	else if (!strcmp (var, "rekey"))
311	rekey = atoi (val);
312	else if (!strcmp (var, "keepalive"))
313	keepalive = atoi (val);
314	else if (!strcmp (var, "mtu"))
315	mtu = atoi (val);
316	else if (!strcmp (var, "if-up"))
317	free (script_if_up), script_if_up = strdup (val);
318	else if (!strcmp (var, "node-up"))
319	free (script_node_up), script_node_up = strdup (val);
320	else if (!strcmp (var, "node-down"))
321	free (script_node_down), script_node_down = strdup (val);
322	else if (!strcmp (var, "pid-file"))
323	free (pidfilename), pidfilename = strdup (val);
324	else if (!strcmp (var, "dns-forw-host"))
325	{
326	#if ENABLE_DNS
327	free (dns_forw_host), dns_forw_host = strdup (val);
328	#endif
329	}
330	else if (!strcmp (var, "dns-forw-port"))
331	{
332	#if ENABLE_DNS
333	dns_forw_port = atoi (val);
334	#endif
335	}
336	else if (!strcmp (var, "http-proxy-host"))
337	{
338	#if ENABLE_HTTP_PROXY
339	free (proxy_host), proxy_host = strdup (val);
340	#endif
341	}
342	else if (!strcmp (var, "http-proxy-port"))
343	{
344	#if ENABLE_HTTP_PROXY
345	proxy_port = atoi (val);
346	#endif
347	}
348	else if (!strcmp (var, "http-proxy-auth"))
349	{
350	#if ENABLE_HTTP_PROXY
351	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
352	#endif
353	}
354
355	/* node-specific, non-defaultable */
356	else if (node != &default_node && !strcmp (var, "hostname"))
357	free (node->hostname), node->hostname = strdup (val);
358
359	/* node-specific, defaultable */
360	else if (!strcmp (var, "udp-port"))
361	node->udp_port = atoi (val);
362	else if (!strcmp (var, "tcp-port"))
363	node->tcp_port = atoi (val);
364	else if (!strcmp (var, "dns-hostname"))
365	{
366	#if ENABLE_DNS
367	free (node->dns_hostname), node->dns_hostname = strdup (val);
368	#endif
369	}
370	else if (!strcmp (var, "dns-port"))
371	{
372	#if ENABLE_DNS
373	node->dns_port = atoi (val);
374	#endif
375	}
376	else if (!strcmp (var, "dns-domain"))
377	{
378	#if ENABLE_DNS
379	free (node->domain), node->domain = strdup (val);
380	#endif
381	}
382	else if (!strcmp (var, "router-priority"))
383	node->routerprio = atoi (val);
384	else if (!strcmp (var, "max-retry"))
385	node->max_retry = atoi (val);
386	else if (!strcmp (var, "connect"))
387	{
388	if (!strcmp (val, "ondemand"))
389	node->connectmode = conf_node::C_ONDEMAND;
390	else if (!strcmp (val, "never"))
391	node->connectmode = conf_node::C_NEVER;
392	else if (!strcmp (val, "always"))
393	node->connectmode = conf_node::C_ALWAYS;
394	else if (!strcmp (val, "disabled"))
395	node->connectmode = conf_node::C_DISABLED;
396	else
397	slog (L_WARN,
398	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
399	var, fname, lineno);
400	}
401	else if (!strcmp (var, "inherit-tos"))
402	parse_bool (node->inherit_tos, "inherit-tos", true, false);
403	else if (!strcmp (var, "compress"))
404	parse_bool (node->compress, "compress", true, false);
405	// all these bool options really really cost a lot of executable size!
406	else if (!strcmp (var, "enable-tcp"))
407	{
408	#if ENABLE_TCP
409	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
410	#endif
411	}
412	else if (!strcmp (var, "enable-icmp"))
413	{
414	#if ENABLE_ICMP
415	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
416	#endif
417	}
418	else if (!strcmp (var, "enable-dns"))
419	{
420	#if ENABLE_DNS
421	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
422	#endif
423	}
424	else if (!strcmp (var, "enable-udp"))
425	{
426	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
427	}
428	else if (!strcmp (var, "enable-rawip"))
429	{
430	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
431	}
432
433	// unknown or misplaced
434	else
435	slog (L_WARN,
436	_("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
437	var, fname, lineno);
438	}	570	}
439		571
440	fclose (f);	572	fclose (f);
		573
		574	parse_argv ();
441	}	575	}
442	else	576	else
443	{	577	{
444	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	578	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
445	exit (EXIT_FAILURE);	579	exit (EXIT_FAILURE);
446	}	580	}
		581	}
447		582
		583	configuration_parser::configuration_parser (configuration &conf,
		584	bool need_keys,
		585	int argc,
		586	char **argv)
		587	: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
		588	{
		589	char *fname;
		590
		591	conf.clear ();
		592	node = &conf.default_node;
		593
		594	asprintf (&fname, "%s/gvpe.conf", confbase);
		595	parse_file (fname);
448	free (fname);	596	free (fname);
449		597
450	fname = config_filename (prikeyfile, "hostkey");	598	fname = conf.config_filename (conf.prikeyfile, "hostkey");
451		599
452	f = fopen (fname, "r");	600	if (FILE *f = fopen (fname, "r"))
453	if (f)
454	{	601	{
455	rsa_key = RSA_new ();	602	conf.rsa_key = RSA_new ();
456		603
457	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	604	if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
458	{	605	{
459	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	606	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
460	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	607	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
461	exit (EXIT_FAILURE);	608	exit (EXIT_FAILURE);
462	}	609	}
463		610
464	require (RSA_blinding_on (rsa_key, 0));	611	require (RSA_blinding_on (conf.rsa_key, 0));
465		612
466	fclose (f);	613	fclose (f);
467	}	614	}
468	else	615	else
469	{	616	{
…		…
471		618
472	if (need_keys)	619	if (need_keys)
473	exit (EXIT_FAILURE);	620	exit (EXIT_FAILURE);
474	}	621	}
475		622
		623	free (fname);
		624
476	if (need_keys && ::thisnode	625	if (need_keys && ::thisnode
477	&& rsa_key && thisnode && thisnode->rsa_key)	626	&& conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
478	if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0	627	if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
479	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)	628	\|\| BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
480	{	629	{
481	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);	630	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
482	exit (EXIT_FAILURE);	631	exit (EXIT_FAILURE);
483	}	632	}
484		633
485	free (fname);	634	for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
		635	(*i)->finalise ();
486	}	636	}
487		637
		638	char *
488	char configuration::config_filename (const char name, const char *dflt)	639	configuration::config_filename (const char name, const char dflt)
489	{	640	{
490	char *fname;	641	char *fname;
491		642
492	asprintf (&fname, name ? name : dflt, ::thisnode);	643	asprintf (&fname, name ? name : dflt, ::thisnode);
493		644
…		…
497	asprintf (&fname, "%s/%s", confbase, rname);	648	asprintf (&fname, "%s/%s", confbase, rname);
498	free (rname);	649	free (rname);
499	}	650	}
500		651
501	return fname;	652	return fname;
		653	}
		654
		655	void
		656	conf_node::print ()
		657	{
		658	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
		659	id,
		660	id >> 8, id & 0xff,
		661	compress ? 'Y' : 'N',
		662	connectmode == C_ONDEMAND ? "ondemand"
		663	: connectmode == C_NEVER ? "never"
		664	: connectmode == C_ALWAYS ? "always"
		665	: connectmode == C_DISABLED ? "disabled"
		666	: "",
		667	nodename,
		668	protocols,
		669	hostname ? hostname : "",
		670	hostname ? ":" : "",
		671	hostname ? udp_port : 0
		672	);
502	}	673	}
503		674
504	void	675	void
505	configuration::print ()	676	configuration::print ()
506	{	677	{
…		…
513	printf (_("interface: %s\n"), ifname);	684	printf (_("interface: %s\n"), ifname);
514	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");	685	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
515	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);	686	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
516	printf ("\n");	687	printf ("\n");
517		688
518	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",	689	printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
519	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));	690	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
520		691
521	for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)	692	for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
522	(*i)->print ();	693	(*i)->print ();
523		694
524	printf ("\n");	695	printf ("\n");
…		…
534	configuration::~configuration ()	705	configuration::~configuration ()
535	{	706	{
536	cleanup ();	707	cleanup ();
537	}	708	}
538		709
539

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.37 by pcg, Wed Mar 23 14:33:34 2005 UTC vs. Revision 1.56 by root, Sun Mar 6 21:01:36 2011 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.37 by pcg, Wed Mar 23 14:33:34 2005 UTC vs.
Revision 1.56 by root, Sun Mar 6 21:01:36 2011 UTC