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

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

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.34 by pcg, Thu Mar 17 23:59:37 2005 UTC vs. Revision 1.57 by root, Sat Dec 17 22:05:34 2011 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.34 by pcg, Thu Mar 17 23:59:37 2005 UTC vs.
Revision 1.57 by root, Sat Dec 17 22:05:34 2011 UTC