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