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

Comparing gvpe/src/conf.C (file contents):
Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.30 by pcg, Thu Mar 3 07:24:57 2005 UTC

…		…
1	/*	1	/*
2	conf.c -- configuration code	2	conf.c -- configuration code
3	Copyright (C) 1998 Robert van der Meulen	3	Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4	1998-2002 Ivo Timmermans <ivo@o2w.nl>
5	2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6	2000 Cris van Pelt <tribbel@arise.dhs.org>
7	2003 Marc Lehmann <pcg@goof.com>
8		4
9	This program is free software; you can redistribute it and/or modify	5	This program is free software; you can redistribute it and/or modify
10	it under the terms of the GNU General Public License as published by	6	it under the terms of the GNU General Public License as published by
11	the Free Software Foundation; either version 2 of the License, or	7	the Free Software Foundation; either version 2 of the License, or
12	(at your option) any later version.	8	(at your option) any later version.
31	#include <netdb.h>	27	#include <netdb.h>
32	#include <sys/stat.h>	28	#include <sys/stat.h>
33	#include <sys/types.h>	29	#include <sys/types.h>
34	#include <unistd.h>	30	#include <unistd.h>
35		31
		32	#include "netcompat.h"
		33
36	#include <openssl/err.h>	34	#include <openssl/err.h>
37	#include <openssl/pem.h>	35	#include <openssl/pem.h>
38	#include <openssl/rsa.h>	36	#include <openssl/rsa.h>
39	#include <openssl/rand.h>	37	#include <openssl/rand.h>
		38	#include <openssl/bn.h>
40		39
41	#include "gettext.h"	40	#include "gettext.h"
42		41
43	#include "conf.h"	42	#include "conf.h"
44	#include "slog.h"	43	#include "slog.h"
45	#include "util.h"	44	#include "util.h"
46		45
47	char *confbase;	46	char *confbase;
48	char *thisnode;	47	char *thisnode;
49	char *identname;	48	char *identname;
50	char *pidfilename;
51		49
52	struct configuration conf;	50	struct configuration conf;
53		51
54	configuration::configuration ()	52	u8 best_protocol (u8 protset)
55	{	53	{
56	init ();	54	if (protset & PROT_IPv4 ) return PROT_IPv4;
57	}	55	if (protset & PROT_ICMPv4) return PROT_ICMPv4;
		56	if (protset & PROT_UDPv4 ) return PROT_UDPv4;
		57	if (protset & PROT_TCPv4 ) return PROT_TCPv4;
		58	if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58		59
59	configuration::~configuration ()	60	return 0;
		61	}
		62
		63	const char *strprotocol (u8 protocol)
60	{	64	{
61	cleanup ();	65	if (protocol & PROT_IPv4 ) return "rawip";
		66	if (protocol & PROT_ICMPv4) return "icmp";
		67	if (protocol & PROT_UDPv4 ) return "udp";
		68	if (protocol & PROT_TCPv4 ) return "tcp";
		69	if (protocol & PROT_DNSv4 ) return "dns";
		70
		71	return "<unknown>";
		72	}
		73
		74	void
		75	conf_node::print ()
		76	{
		77	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
		78	id,
		79	id >> 8, id & 0xff,
		80	compress ? 'Y' : 'N',
		81	connectmode == C_ONDEMAND ? "ondemand" :
		82	connectmode == C_NEVER ? "never" :
		83	connectmode == C_ALWAYS ? "always" : "",
		84	nodename,
		85	hostname ? hostname : "",
		86	hostname ? ":" : "",
		87	hostname ? udp_port : 0
		88	);
		89	}
		90
		91	conf_node::~conf_node ()
		92	{
		93	if (rsa_key)
		94	RSA_free (rsa_key);
		95
		96	free (nodename);
		97	free (hostname);
		98	#if ENABLE_DNS
		99	free (domain);
		100	free (dns_hostname);
		101	#endif
62	}	102	}
63		103
64	void configuration::init ()	104	void configuration::init ()
65	{	105	{
66	memset (this, 0, sizeof (*this));	106	memset (this, 0, sizeof (*this));
67		107
		108	mtu = DEFAULT_MTU;
68	rekey = DEFAULT_REKEY;	109	rekey = DEFAULT_REKEY;
69	keepalive = DEFAULT_KEEPALIVE;	110	keepalive = DEFAULT_KEEPALIVE;
70	llevel = L_INFO;	111	llevel = L_INFO;
		112	ip_proto = IPPROTO_GRE;
		113	#if ENABLE_ICMP
		114	icmp_type = ICMP_ECHOREPLY;
		115	#endif
71		116
72	default_node.port = DEFAULT_PORT;	117	default_node.udp_port = DEFAULT_UDPPORT;
		118	default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73	default_node.connectmode = conf_node::C_ALWAYS;	119	default_node.connectmode = conf_node::C_ALWAYS;
74	default_node.compress = true;	120	default_node.compress = true;
		121	default_node.protocols = 0;
		122	default_node.max_retry = DEFAULT_MAX_RETRY;
		123
		124	#if ENABLE_DNS
		125	default_node.dns_port = 53;
		126	dns_forw_port = 53;
		127	#endif
		128
		129	conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
75	}	130	}
76		131
77	void configuration::cleanup()	132	void configuration::cleanup()
78	{	133	{
79	if (rsa_key)	134	if (rsa_key)
80	RSA_free (rsa_key);	135	RSA_free (rsa_key);
81		136
82	free (ifname);
83
84	rsa_key = 0;	137	rsa_key = 0;
85	ifname = 0;	138
		139	free (pidfilename); pidfilename = 0;
		140	free (ifname); ifname = 0;
		141	#if ENABLE_HTTP_PROXY
		142	free (proxy_host); proxy_host = 0;
		143	free (proxy_auth); proxy_auth = 0;
		144	#endif
		145	#if ENABLE_DNS
		146	free (dns_forw_host); dns_forw_host = 0;
		147	#endif
86	}	148	}
87		149
88	void	150	void
89	configuration::clear_config ()	151	configuration::clear_config ()
90	{	152	{
…		…
95		157
96	cleanup ();	158	cleanup ();
97	init ();	159	init ();
98	}	160	}
99		161
		162	#define parse_bool(target,name,trueval,falseval) \
		163	if (!strcmp (val, "yes")) target = trueval; \
		164	else if (!strcmp (val, "no")) target = falseval; \
		165	else if (!strcmp (val, "true")) target = trueval; \
		166	else if (!strcmp (val, "false")) target = falseval; \
		167	else if (!strcmp (val, "on")) target = trueval; \
		168	else if (!strcmp (val, "off")) target = falseval; \
		169	else \
		170	slog (L_WARN, \
		171	_("illegal value for '%s', only 'yes\|true\|on' or 'no\|false\|off' allowed, at '%s' line %d"), \
		172	name, var, fname, lineno);
		173
100	void configuration::read_config (bool need_keys)	174	void configuration::read_config (bool need_keys)
101	{	175	{
102	char *fname;	176	char *fname;
103	FILE *f;	177	FILE *f;
104		178
105	clear_config ();	179	clear_config ();
106		180
107	asprintf (&fname, "%s/vped.conf", confbase);	181	asprintf (&fname, "%s/gvpe.conf", confbase);
108	f = fopen (fname, "r");	182	f = fopen (fname, "r");
109		183
110	if (f)	184	if (f)
111	{	185	{
112	char line[16384];	186	char line[16384];
…		…
167	if (l != L_NONE)	241	if (l != L_NONE)
168	llevel = l;	242	llevel = l;
169	else	243	else
170	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);	244	slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171	}	245	}
		246	else if (!strcmp (var, "ip-proto"))
		247	ip_proto = atoi (val);
		248	else if (!strcmp (var, "icmp-type"))
		249	{
		250	#if ENABLE_ICMP
		251	icmp_type = atoi (val);
		252	#endif
		253	}
172		254
173	// per config	255	// per config
174	else if (!strcmp (var, "node"))	256	else if (!strcmp (var, "node"))
175	{	257	{
176	default_node.id++;	258	default_node.id++;
…		…
194		276
195	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))	277	if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196	{	278	{
197	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	279	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
198	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	280	slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199	exit (1);	281	exit (EXIT_FAILURE);
200	}	282	}
201		283
202	RSA_blinding_on (node->rsa_key, 0);	284	require (RSA_blinding_on (node->rsa_key, 0));
203		285
204	fclose (f);	286	fclose (f);
205	}	287	}
206	else	288	else
207	{	289	{
208	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));	290	slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209		291
210	if (need_keys)	292	if (need_keys)
211	exit (1);	293	exit (EXIT_FAILURE);
212	}	294	}
213		295
214	free (fname);	296	free (fname);
215	}	297	}
216		298
217	if (!::thisnode \|\| !strcmp (node->nodename, ::thisnode))	299	if (::thisnode && !strcmp (node->nodename, ::thisnode))
218	thisnode = node;	300	thisnode = node;
219	}	301	}
220	else if (!strcmp (var, "private-key"))	302	else if (!strcmp (var, "private-key"))
221	prikeyfile = strdup (val);	303	free (prikeyfile), prikeyfile = strdup (val);
222	else if (!strcmp (var, "ifpersist"))	304	else if (!strcmp (var, "ifpersist"))
223	{	305	{
224	if (!strcmp (val, "yes"))	306	parse_bool (ifpersist, "ifpersist", true, false);
225	ifpersist = true;
226	else if (!strcmp (val, "no"))
227	ifpersist = false;
228	else
229	slog (L_WARN,
230	_("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231	var, fname, lineno);
232	}	307	}
233	else if (!strcmp (var, "ifname"))	308	else if (!strcmp (var, "ifname"))
234	ifname = strdup (val);	309	free (ifname), ifname = strdup (val);
235	else if (!strcmp (var, "rekey"))	310	else if (!strcmp (var, "rekey"))
236	rekey = atoi (val);	311	rekey = atoi (val);
237	else if (!strcmp (var, "keepalive"))	312	else if (!strcmp (var, "keepalive"))
238	keepalive = atoi (val);	313	keepalive = atoi (val);
239	else if (!strcmp (var, "mtu"))	314	else if (!strcmp (var, "mtu"))
240	mtu = atoi (val);	315	mtu = atoi (val);
241	else if (!strcmp (var, "if-up"))	316	else if (!strcmp (var, "if-up"))
242	script_if_up = strdup (val);	317	free (script_if_up), script_if_up = strdup (val);
243	else if (!strcmp (var, "node-up"))	318	else if (!strcmp (var, "node-up"))
244	script_node_up = strdup (val);	319	free (script_node_up), script_node_up = strdup (val);
245	else if (!strcmp (var, "node-down"))	320	else if (!strcmp (var, "node-down"))
246	script_node_down = strdup (val);	321	free (script_node_down), script_node_down = strdup (val);
		322	else if (!strcmp (var, "pid-file"))
		323	free (pidfilename), pidfilename = strdup (val);
		324	#if ENABLE_DNS
		325	else if (!strcmp (var, "dns-forw-host"))
		326	free (dns_forw_host), dns_forw_host = strdup (val);
		327	else if (!strcmp (var, "dns-forw-port"))
		328	dns_forw_port = atoi (val);
		329	#endif
		330	else if (!strcmp (var, "http-proxy-host"))
		331	{
		332	#if ENABLE_HTTP_PROXY
		333	free (proxy_host), proxy_host = strdup (val);
		334	#endif
		335	}
		336	else if (!strcmp (var, "http-proxy-port"))
		337	{
		338	#if ENABLE_HTTP_PROXY
		339	proxy_port = atoi (val);
		340	#endif
		341	}
		342	else if (!strcmp (var, "http-proxy-auth"))
		343	{
		344	#if ENABLE_HTTP_PROXY
		345	proxy_auth = (char )base64_encode ((const u8 )val, strlen (val));
		346	#endif
		347	}
247		348
248	/* node-specific, non-defaultable */	349	/* node-specific, non-defaultable */
249	else if (node != &default_node && !strcmp (var, "hostname"))	350	else if (node != &default_node && !strcmp (var, "hostname"))
250	{
251	free (node->hostname);
252	node->hostname = strdup (val);	351	free (node->hostname), node->hostname = strdup (val);
253	}
254		352
255	/* node-specific, defaultable */	353	/* node-specific, defaultable */
256	else if (!strcmp (var, "udp-port"))	354	else if (!strcmp (var, "udp-port"))
257	node->port = atoi (val);	355	node->udp_port = atoi (val);
258	else if (!strcmp (var, "port")) //deprecated	356	else if (!strcmp (var, "tcp-port"))
259	node->port = atoi (val);	357	node->tcp_port = atoi (val);
		358	#if ENABLE_DNS
		359	else if (!strcmp (var, "dns-hostname"))
		360	free (node->dns_hostname), node->dns_hostname = strdup (val);
		361	else if (!strcmp (var, "dns-port"))
		362	node->dns_port = atoi (val);
		363	#endif
		364	else if (!strcmp (var, "dns-domain"))
		365	{
		366	#if ENABLE_DNS
		367	free (node->domain), node->domain = strdup (val);
		368	#endif
		369	}
260	else if (!strcmp (var, "router-priority"))	370	else if (!strcmp (var, "router-priority"))
261	node->routerprio = atoi (val);	371	node->routerprio = atoi (val);
		372	else if (!strcmp (var, "max-retry"))
		373	node->max_retry = atoi (val);
262	else if (!strcmp (var, "connect"))	374	else if (!strcmp (var, "connect"))
263	{	375	{
264	if (!strcmp (val, "ondemand"))	376	if (!strcmp (val, "ondemand"))
265	node->connectmode = conf_node::C_ONDEMAND;	377	node->connectmode = conf_node::C_ONDEMAND;
266	else if (!strcmp (val, "never"))	378	else if (!strcmp (val, "never"))
…		…
269	node->connectmode = conf_node::C_ALWAYS;	381	node->connectmode = conf_node::C_ALWAYS;
270	else if (!strcmp (val, "disabled"))	382	else if (!strcmp (val, "disabled"))
271	node->connectmode = conf_node::C_DISABLED;	383	node->connectmode = conf_node::C_DISABLED;
272	else	384	else
273	slog (L_WARN,	385	slog (L_WARN,
274	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),	386	_("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275	var, fname, lineno);	387	var, fname, lineno);
276	}	388	}
277	else if (!strcmp (var, "inherit-tos"))	389	else if (!strcmp (var, "inherit-tos"))
278	{	390	{
279	if (!strcmp (val, "yes"))	391	parse_bool (node->inherit_tos, "inherit-tos", true, false);
280	node->inherit_tos = true;
281	else if (!strcmp (val, "no"))
282	node->inherit_tos = false;
283	else	392	}
284	slog (L_WARN,
285	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286	var, fname, lineno);
287	}
288
289	else if (!strcmp (var, "compress"))	393	else if (!strcmp (var, "compress"))
290	{	394	{
291	if (!strcmp (val, "yes"))	395	parse_bool (node->compress, "compress", true, false);
292	node->compress = true;	396	}
		397	// all these bool options really really cost a lot of executable size!
		398	else if (!strcmp (var, "enable-tcp"))
		399	{
		400	#if ENABLE_TCP
		401	u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) \| v;
		402	#endif
		403	}
		404	else if (!strcmp (var, "enable-icmp"))
		405	{
		406	#if ENABLE_ICMP
		407	u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) \| v;
		408	#endif
		409	}
293	else if (!strcmp (val, "no"))	410	else if (!strcmp (var, "enable-dns"))
294	node->compress = false;
295	else	411	{
296	slog (L_WARN,	412	#if ENABLE_DNS
297	_("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),	413	u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) \| v;
298	var, fname, lineno);	414	#endif
		415	}
		416	else if (!strcmp (var, "enable-udp"))
		417	{
		418	u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) \| v;
		419	}
		420	else if (!strcmp (var, "enable-rawip"))
		421	{
		422	u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) \| v;
299	}	423	}
300		424
301	// unknown or misplaced	425	// unknown or misplaced
302	else	426	else
303	{
304	slog (L_WARN,	427	slog (L_WARN,
305	_("unknown or misplaced variable `%s', at '%s' line %d"),	428	_("unknown or misplaced variable `%s', at '%s' line %d"),
306	var, fname, lineno);	429	var, fname, lineno);
307	}
308	}	430	}
309		431
310	fclose (f);	432	fclose (f);
311	}	433	}
312	else	434	else
313	{	435	{
314	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));	436	slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
315	exit (1);	437	exit (EXIT_FAILURE);
316	}	438	}
317		439
318	free (fname);	440	free (fname);
319		441
320	fname = config_filename (prikeyfile, "hostkey");	442	fname = config_filename (prikeyfile, "hostkey");
…		…
326		448
327	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))	449	if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
328	{	450	{
329	ERR_load_RSA_strings (); ERR_load_PEM_strings ();	451	ERR_load_RSA_strings (); ERR_load_PEM_strings ();
330	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));	452	slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
331	exit (1);	453	exit (EXIT_FAILURE);
332	}	454	}
333		455
334	RSA_blinding_on (rsa_key, 0);	456	require (RSA_blinding_on (rsa_key, 0));
335		457
336	fclose (f);	458	fclose (f);
337	}	459	}
338	else	460	else
339	{	461	{
340	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));	462	slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341		463
342	if (need_keys)	464	if (need_keys)
343	exit (1);	465	exit (EXIT_FAILURE);
344	}	466	}
		467
		468	if (need_keys && ::thisnode
		469	&& rsa_key && thisnode && thisnode->rsa_key)
		470	if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
		471	\|\| BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
		472	{
		473	slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
		474	exit (EXIT_FAILURE);
		475	}
345		476
346	free (fname);	477	free (fname);
347	}	478	}
348		479
349	char configuration::config_filename (const char name, const char *dflt)	480	char configuration::config_filename (const char name, const char *dflt)
…		…
371	printf (_("MTU: %d\n"), mtu);	502	printf (_("MTU: %d\n"), mtu);
372	printf (_("rekeying interval: %d\n"), rekey);	503	printf (_("rekeying interval: %d\n"), rekey);
373	printf (_("keepalive interval: %d\n"), keepalive);	504	printf (_("keepalive interval: %d\n"), keepalive);
374	printf (_("interface: %s\n"), ifname);	505	printf (_("interface: %s\n"), ifname);
375	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");	506	printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1);	507	printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377	printf ("\n");	508	printf ("\n");
378		509
379	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",	510	printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));	511	_("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381		512
…		…
383	(*i)->print ();	514	(*i)->print ();
384		515
385	printf ("\n");	516	printf ("\n");
386	}	517	}
387		518
388	void	519	configuration::configuration ()
389	conf_node::print ()
390	{	520	{
391	printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",	521	asprintf (&confbase, "%s/gvpe", CONFDIR);
392	id,
393	id >> 8, id & 0xff,
394	compress ? 'Y' : 'N',
395	connectmode == C_ONDEMAND ? "ondemand" :
396	connectmode == C_NEVER ? "never" :
397	connectmode == C_ALWAYS ? "always" : "",
398	nodename,
399	hostname ? hostname : "",
400	hostname ? ":" : "",
401	hostname ? port : 0
402	);
403	}
404		522
		523	init ();
		524	}
		525
		526	configuration::~configuration ()
		527	{
		528	cleanup ();
		529	}
		530
		531

Diff Legend

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

Comparing gvpe/src/conf.C (file contents): Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs. Revision 1.30 by pcg, Thu Mar 3 07:24:57 2005 UTC

Diff Legend

Comparing gvpe/src/conf.C (file contents):
Revision 1.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.30 by pcg, Thu Mar 3 07:24:57 2005 UTC