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

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

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.39 by pcg, Sat Mar 26 03:16:24 2005 UTC vs. Revision 1.59 by root, Tue Dec 4 10:29:43 2012 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.39 by pcg, Sat Mar 26 03:16:24 2005 UTC vs.
Revision 1.59 by root, Tue Dec 4 10:29:43 2012 UTC