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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.66 by root, Thu Jul 18 13:35:16 2013 UTC

…		…
1	/*	1	/*
2	vpn.C -- handle the protocol, encryption, handshaking etc.	2	vpn.C -- handle the protocol, encryption, handshaking etc.
3	Copyright (C) 2003 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify it
6	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
7	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
8	(at your option) any later version.	10	option) any later version.
9		11
10	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
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13	GNU General Public License for more details.	15	Public License for more details.
14		16
15	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
16	along with this program; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
17	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.
18	*/	30	*/
19		31
20	#include "config.h"	32	#include "config.h"
21		33
22	#include <list>	34	#include <list>
23		35
		36	#include <cstdio>
		37	#include <cstring>
24	#include <cstdlib>	38	#include <cstdlib>
25	#include <cstring>
26	#include <cstdio>
27		39
28	#include <sys/types.h>	40	#include <sys/types.h>
29	#include <sys/socket.h>	41	#include <sys/socket.h>
30	#include <sys/wait.h>	42	#include <sys/wait.h>
		43	#include <sys/stat.h>
31	#include <errno.h>	44	#include <errno.h>
32	#include <time.h>	45	#include <time.h>
33	#include <unistd.h>	46	#include <unistd.h>
34	#include <fcntl.h>	47	#include <fcntl.h>
35	#include <sys/socket.h>	48	#include <sys/socket.h>
40		53
41	#include "connection.h"	54	#include "connection.h"
42	#include "util.h"	55	#include "util.h"
43	#include "vpn.h"	56	#include "vpn.h"
44		57
		58	using namespace std;
		59
45	vpn network; // THE vpn (bad design...)	60	vpn network; // THE vpn (bad design...)
46		61
47	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
48		63
49	const char *vpn::script_if_up ()	64	static void inline
		65	set_tos (int fd, int &tos_prev, int tos)
		66	{
		67	#if defined(SOL_IP) && defined(IP_TOS)
		68	if (tos_prev == tos)
		69	return;
		70
		71	tos_prev = tos;
		72	setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		73	#endif
		74	}
		75
		76	void
		77	vpn::script_init_env ()
50	{	78	{
51	// the tunnel device mtu should be the physical mtu - overhead	79	// the tunnel device mtu should be the physical mtu - overhead
52	// the tricky part is rounding to the cipher key blocksize	80	// the tricky part is rounding to the cipher key blocksize
53	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	81	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	82	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	83	mtu -= mtu % BLOCK_SIZE (CIPHER); // round
56	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	84	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57		85
58	char *env;	86	char *env;
59	asprintf (&env, "CONFBASE=%s", confbase);	87	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60	putenv (env);
61	asprintf (&env, "NODENAME=%s", THISNODE->nodename);
62	putenv (env);
63	asprintf (&env, "NODEID=%d", THISNODE->id);
64	putenv (env);
65	asprintf (&env, "IFNAME=%s", tap->interface ());	88	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
66	putenv (env);	89	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
		90	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67	asprintf (&env, "MTU=%d", mtu);	91	asprintf (&env, "MTU=%d", mtu); putenv (env);
68	putenv (env);	92	asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	93	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
71	THISNODE->id & 0xff);
72	putenv (env);
73		94
74	return ::conf.script_if_up ? ::conf.script_if_up : "if-up";	95	conns [THISNODE->id - 1]->script_init_env ("");
		96
		97	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		98	{
		99	char ext[16];
		100	snprintf (ext, 16, "_%d", (*c)->conf->id);
		101	(*c)->script_init_env (ext);
		102	}
		103	}
		104
		105	inline const char *
		106	vpn::script_if_init ()
		107	{
		108	script_init_env ();
		109
		110	return tap->if_up ();
		111	}
		112
		113	inline const char *
		114	vpn::script_if_up ()
		115	{
		116	script_init_env ();
		117
		118	return conf.config_filename (::conf.script_if_up, "if-up");
		119	}
		120
		121	int
		122	vpn::setup_socket (u8 prot, int family, int type, int proto)
		123	{
		124	int fd = socket (family, type, proto);
		125
		126	if (fd < 0)
		127	{
		128	slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
		129	return fd;
		130	}
		131
		132	fcntl (fd, F_SETFL, O_NONBLOCK);
		133	fcntl (fd, F_SETFD, FD_CLOEXEC);
		134
		135	#ifdef SO_MARK
		136	if (::conf.nfmark)
		137	if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
		138	slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
		139	#endif
		140
		141	return fd;
75	}	142	}
76		143
77	int	144	int
78	vpn::setup ()	145	vpn::setup ()
79	{	146	{
		147	int success = 0;
		148
		149	ipv4_tos = -1;
80	ipv4_fd = -1;	150	ipv4_fd = -1;
81		151
82	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)	152	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
83	{	153	{
84	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);	154	ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
85		155
86	if (ipv4_fd < 0)	156	if (ipv4_fd < 0)
87	return -1;	157	return -1;
88
89	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
90		158
91	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)	159	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
92	// this I really consider a linux bug. I am neither connected	160	// this I really consider a linux bug. I am neither connected
93	// nor do I fragment myself. Linux still sets DF and doesn't	161	// nor do I fragment myself. Linux still sets DF and doesn't
94	// fragment for me sometimes.	162	// fragment for me sometimes.
…		…
100		168
101	sockinfo si (THISNODE, PROT_IPv4);	169	sockinfo si (THISNODE, PROT_IPv4);
102		170
103	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	171	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104	{	172	{
105	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));	173	slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
106	exit (1);	174	return -1;
107	}	175	}
108		176
109	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	177	ipv4_ev_watcher.start (ipv4_fd, EV_READ);
		178	++success;
110	}	179	}
		180	else
		181	THISNODE->protocols &= ~PROT_IPv4;
111		182
		183	udpv4_tos = -1;
112	udpv4_fd = -1;	184	udpv4_fd = -1;
113		185
114	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	186	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
115	{	187	{
116	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	188	udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
117		189
118	if (udpv4_fd < 0)	190	if (udpv4_fd < 0)
119	return -1;	191	return -1;
120
121	fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
122		192
123	// standard daemon practise...	193	// standard daemon practise...
124	{	194	{
125	int oval = 1;	195	int oval = 1;
126	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	196	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
…		…
138		208
139	sockinfo si (THISNODE, PROT_UDPv4);	209	sockinfo si (THISNODE, PROT_UDPv4);
140		210
141	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	211	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142	{	212	{
143	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	213	slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
144	exit (1);	214	return -1;
145	}	215	}
146		216
147	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	217	udpv4_ev_watcher.start (udpv4_fd, EV_READ);
		218	++success;
148	}	219	}
		220	else
		221	THISNODE->protocols &= ~PROT_UDPv4;
149		222
		223	icmpv4_tos = -1;
150	icmpv4_fd = -1;	224	icmpv4_fd = -1;
151		225
152	#if ENABLE_ICMP	226	#if ENABLE_ICMP
153	if (THISNODE->protocols & PROT_ICMPv4)	227	if (THISNODE->protocols & PROT_ICMPv4)
154	{	228	{
155	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);	229	icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
156		230
157	if (icmpv4_fd < 0)	231	if (icmpv4_fd < 0)
158	return -1;	232	return -1;
159
160	fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
161		233
162	#ifdef ICMP_FILTER	234	#ifdef ICMP_FILTER
163	{	235	{
164	icmp_filter oval;	236	icmp_filter oval;
165	oval.data = 0xffffffff;	237	oval.data = 0xffffffff;
…		…
174	// this I really consider a linux bug. I am neither connected	246	// this I really consider a linux bug. I am neither connected
175	// nor do I fragment myself. Linux still sets DF and doesn't	247	// nor do I fragment myself. Linux still sets DF and doesn't
176	// fragment for me sometimes.	248	// fragment for me sometimes.
177	{	249	{
178	int oval = IP_PMTUDISC_DONT;	250	int oval = IP_PMTUDISC_DONT;
179	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	251	setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
180	}	252	}
181	#endif	253	#endif
182		254
183	sockinfo si (THISNODE, PROT_ICMPv4);	255	sockinfo si (THISNODE, PROT_ICMPv4);
184		256
185	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	257	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186	{	258	{
187	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));	259	slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
188	exit (1);	260	return -1;
189	}	261	}
190		262
191	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	263	icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
		264	++success;
192	}	265	}
193	#endif	266	#endif
194		267
195	tcpv4_fd = -1;	268	tcpv4_fd = -1;
196		269
197	#if ENABLE_TCP	270	#if ENABLE_TCP
198	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)	271	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
199	{	272	{
200	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);	273	tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
201		274
202	if (tcpv4_fd < 0)	275	if (tcpv4_fd < 0)
203	return -1;	276	return -1;
204		277
205	fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
206
207	// standard daemon practise...	278	// standard daemon practise...
208	{	279	{
209	int oval = 1;	280	int oval = 1;
210	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	281	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
211	}	282	}
212		283
213	sockinfo si (THISNODE, PROT_TCPv4);	284	sockinfo si (THISNODE, PROT_TCPv4);
214		285
215	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	286	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
216	{	287	{
217	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));	288	slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
218	exit (1);	289	return -1;
219	}	290	}
220		291
221	if (listen (tcpv4_fd, 5))	292	if (listen (tcpv4_fd, 5))
222	{	293	{
223	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));	294	slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
224	exit (1);	295	return -1;
		296	}
		297
		298	tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
		299	++success;
		300	}
		301	else
		302	THISNODE->protocols &= ~PROT_TCPv4;
		303	#endif
		304
		305	dnsv4_tos = -1;
		306	dnsv4_fd = -1;
		307
		308	#if ENABLE_DNS
		309	if (THISNODE->protocols & PROT_DNSv4)
		310	{
		311	dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		312
		313	dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
		314
		315	if (dnsv4_fd < 0)
		316	return -1;
		317
		318	# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
		319	// this I really consider a linux bug. I am neither connected
		320	// nor do I fragment myself. Linux still sets DF and doesn't
		321	// fragment for me sometimes.
		322	{
		323	int oval = IP_PMTUDISC_DONT;
		324	setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
225	}	325	}
226
227	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
228	}
229	#endif	326	# endif
		327
		328	// standard daemon practise...
		329	{
		330	int oval = 1;
		331	setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
		332	}
		333
		334	sockinfo si (THISNODE->dns_hostname,
		335	THISNODE->dns_hostname ? THISNODE->dns_port : 0,
		336	PROT_DNSv4);
		337
		338	if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
		339	{
		340	slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
		341	return -1;
		342	}
		343
		344	dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
		345	++success;
		346	}
		347	#endif
		348
		349	/////////////////////////////////////////////////////////////////////////////
		350
		351	if (!success)
		352	{
		353	slog (L_ERR, _("no protocols enabled."));
		354	return -1;
		355	}
		356
		357	reconnect_all ();
		358
		359	/////////////////////////////////////////////////////////////////////////////
230		360
231	tap = new tap_device ();	361	tap = new tap_device ();
232	if (!tap) //D this, of course, never catches	362	if (!tap) //D this, of course, never catches
233	{	363	{
234	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	364	slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
235	exit (1);	365	return -1;
236	}	366	}
237		367
238	run_script (run_script_cb (this, &vpn::script_if_up), true);	368	fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
239		369
		370	run_script_cb cb;
		371	cb.set<vpn, &vpn::script_if_init> (this);
		372
		373	if (tap->if_up () &&
		374	!run_script (cb, true))
		375	{
		376	slog (L_ERR, _("interface initialization command '%s' failed."),
		377	tap->if_up ());
		378	return -1;
		379	}
		380
		381	cb.set<vpn, &vpn::script_if_up> (this);
		382	if (!run_script (cb, true))
		383	{
		384	slog (L_ERR, _("if-up command execution failed."));
		385	return -1;
		386	}
		387
240	tap_ev_watcher.start (tap->fd, POLLIN);	388	tap_ev_watcher.start (tap->fd, EV_READ);
241
242	reconnect_all ();
243		389
244	return 0;	390	return 0;
245	}	391	}
246		392
247	// send a vpn packet out to other hosts
248	bool	393	bool
249	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)	394	vpn::drop_privileges ()
250	{	395	{
251	switch (si.prot)	396	if (::conf.change_root)
		397	{
		398	if (!strcmp (::conf.change_root, "/"))
		399	{
		400	char dir [L_tmpnam];
		401	if (!tmpnam (dir))
		402	{
		403	slog (L_CRIT, _("unable to create anonymous root path."));
		404	return false;
		405	}
		406
		407	if (mkdir (dir, 0700))
		408	{
		409	slog (L_CRIT, _("unable to crate anonymous root directory."));
		410	return false;
		411	}
		412
		413	if (chdir (dir))
		414	{
		415	slog (L_CRIT, _("unable to change to anonymous root directory."));
		416	return false;
		417	}
		418
		419	if (rmdir (dir))
		420	slog (L_ERR, _("unable to remove anonymous root directory, continuing."));
		421	}
		422	else
		423	{
		424	if (chdir (::conf.change_root))
		425	{
		426	slog (L_CRIT, _("%s: unable to change to specified root directory."), ::conf.change_root);
		427	return false;
		428	}
		429	}
		430
		431	if (chroot ("."))
		432	{
		433	slog (L_CRIT, _("unable to set new root directory."));
		434	return false;
		435	}
		436
		437	if (chdir ("/"))
		438	{
		439	slog (L_CRIT, _("unable to set cwd to new root directory."));
		440	return false;
		441	}
		442	}
		443
		444	if (::conf.change_gid)
		445	if (setgid (::conf.change_gid))
252	{	446	{
253	case PROT_IPv4:	447	slog (L_CRIT, _("unable to change group id to %d."), ::conf.change_gid);
254	return send_ipv4_packet (pkt, si, tos);
255
256	case PROT_UDPv4:
257	return send_udpv4_packet (pkt, si, tos);
258
259	#if ENABLE_TCP
260	case PROT_TCPv4:
261	return send_tcpv4_packet (pkt, si, tos);
262	#endif
263
264	#if ENABLE_ICMP
265	case PROT_ICMPv4:
266	return send_icmpv4_packet (pkt, si, tos);
267	#endif
268
269	default:
270	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
271	return false;	448	return false;
272	}	449	}
		450
		451	if (::conf.change_uid)
		452	if (setuid (::conf.change_uid))
		453	{
		454	slog (L_CRIT, _("unable to change user id to %d."), ::conf.change_uid);
		455	return false;
		456	}
		457
		458	return true;
273	}	459	}
274		460
275	bool	461	bool
276	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	462	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
277	{	463	{
278	#if defined(SOL_IP) && defined(IP_TOS)	464	set_tos (ipv4_fd, ipv4_tos, tos);
279	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
280	#endif
281	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	465	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
282		466
283	return true;	467	return true;
284	}	468	}
285		469
…		…
308		492
309	#if ENABLE_ICMP	493	#if ENABLE_ICMP
310	bool	494	bool
311	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	495	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
312	{	496	{
313	#if defined(SOL_IP) && defined(IP_TOS)
314	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
315	#endif
316
317	pkt->unshift_hdr (4);	497	pkt->unshift_hdr (4);
318		498
319	icmp_header hdr = (icmp_header )&((*pkt)[0]);	499	icmp_header hdr = (icmp_header )&((*pkt)[0]);
320	hdr->type = ::conf.icmp_type;	500	hdr->type = ::conf.icmp_type;
321	hdr->code = 255;	501	hdr->code = 255;
322	hdr->checksum = 0;	502	hdr->checksum = 0;
323	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);	503	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
324		504
		505	set_tos (icmpv4_fd, icmpv4_tos, tos);
325	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	506	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
326		507
327	return true;	508	return true;
328	}	509	}
329	#endif	510	#endif
330		511
331	bool	512	bool
332	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	513	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
333	{	514	{
334	#if defined(SOL_IP) && defined(IP_TOS)	515	set_tos (udpv4_fd, udpv4_tos, tos);
335	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
336	#endif
337	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	516	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
338		517
339	return true;	518	return true;
340	}	519	}
341		520
…		…
352	{	531	{
353	// broadcast, this is ugly, but due to the security policy	532	// broadcast, this is ugly, but due to the security policy
354	// we have to connect to all hosts...	533	// we have to connect to all hosts...
355	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	534	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
356	if ((*c)->conf != THISNODE)	535	if ((*c)->conf != THISNODE)
357	(*c)->inject_data_packet (pkt, true);	536	(*c)->inject_data_packet (pkt);
358	}	537	}
359	}	538	}
360		539
361	void	540	void
362	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	541	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
363	{	542	{
364	unsigned int src = pkt->src ();	543	unsigned int src = pkt->src ();
365	unsigned int dst = pkt->dst ();	544	unsigned int dst = pkt->dst ();
366		545
367	slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"),	546	slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
368	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);	547	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
369		548
370	if (src == 0 \|\| src > conns.size ()	549	if (src == 0 \|\| src > conns.size ()
371	\|\| dst > conns.size ()	550	\|\| dst > conns.size ()
372	\|\| pkt->typ () >= vpn_packet::PT_MAX)	551	\|\| pkt->typ () >= vpn_packet::PT_MAX)
373	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),	552	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
374	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
375	else if (dst > conns.size ())
376	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
377	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	553	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
378	else	554	else
379	{	555	{
380	connection *c = conns[src - 1];	556	connection *c = conns[src - 1];
381		557
382	if (dst == 0)	558	if (dst == 0)
383	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	559	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
384	c->conf->nodename, (const char *)rsi);	560	c->conf->nodename, (const char *)rsi);
385	else if (dst != THISNODE->id)	561	else if (dst != THISNODE->id)
386	{	562	{
387	if (THISNODE->routerprio)	563	if (THISNODE->routerprio)
388	// the tos setting gets lost here. who cares.	564	// the tos setting gets lost here. who cares.
389	conns[dst - 1]->inject_vpn_packet (pkt);	565	conns[dst - 1]->inject_vpn_packet (pkt);
390	else	566	else
391	slog (L_WARN,	567	slog (L_WARN,
392	_("%s(%s): forwarding request (=> %s), but we are no router"),	568	_("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
393	c->conf->nodename, (const char *)rsi,	569	c->conf->nodename, (const char *)rsi,
394	conns[dst - 1]->conf->nodename);	570	conns[dst - 1]->conf->nodename);
395	}	571	}
396	else	572	else
397	c->recv_vpn_packet (pkt, rsi);	573	c->recv_vpn_packet (pkt, rsi);
398	}	574	}
399	}	575	}
400		576
401	void	577	bool
		578	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		579	{
		580	switch (si.prot)
		581	{
		582	case PROT_IPv4:
		583	return send_ipv4_packet (pkt, si, tos);
		584
		585	case PROT_UDPv4:
		586	return send_udpv4_packet (pkt, si, tos);
		587
		588	#if ENABLE_TCP
		589	case PROT_TCPv4:
		590	return send_tcpv4_packet (pkt, si, tos);
		591	#endif
		592	#if ENABLE_ICMP
		593	case PROT_ICMPv4:
		594	return send_icmpv4_packet (pkt, si, tos);
		595	#endif
		596	#if ENABLE_DNS
		597	case PROT_DNSv4:
		598	return send_dnsv4_packet (pkt, si, tos);
		599	#endif
		600	default:
		601	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
		602	}
		603
		604	return false;
		605	}
		606
		607	inline void
402	vpn::ipv4_ev (io_watcher &w, short revents)	608	vpn::ipv4_ev (ev::io &w, int revents)
403	{	609	{
404	if (revents & (POLLIN \| POLLERR))	610	if (revents & EV_READ)
405	{	611	{
406	vpn_packet *pkt = new vpn_packet;	612	vpn_packet *pkt = new vpn_packet;
407	struct sockaddr_in sa;	613	struct sockaddr_in sa;
408	socklen_t sa_len = sizeof (sa);	614	socklen_t sa_len = sizeof (sa);
409	int len;	615	int len;
…		…
414		620
415	if (len > 0)	621	if (len > 0)
416	{	622	{
417	pkt->len = len;	623	pkt->len = len;
418		624
419	// raw sockets deliver the ipv4, but don't expect it on sends	625	// raw sockets deliver the ipv4 header, but don't expect it on sends
420	// this is slow, but...	626	pkt->skip_hdr (pkt->ipv4_hdr_len ());
421	pkt->skip_hdr (IP_OVERHEAD);
422		627
423	recv_vpn_packet (pkt, si);	628	recv_vpn_packet (pkt, si);
424	}	629	}
425	else	630	else
426	{	631	{
427	// probably ECONNRESET or somesuch	632	// probably ECONNRESET or somesuch
428	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	633	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
429	}	634	}
430		635
431	delete pkt;	636	delete pkt;
432	}	637	}
433	else if (revents & POLLHUP)
434	{
435	// this cannot ;) happen on udp sockets
436	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
437	exit (1);
438	}
439	else	638	else
440	{	639	{
441	slog (L_ERR,	640	slog (L_ERR,
442	_("FATAL: unknown revents %08x in socket, terminating\n"),	641	_("FATAL: unknown revents %08x in socket, exiting.\n"),
443	revents);	642	revents);
444	exit (1);	643	exit (EXIT_FAILURE);
445	}	644	}
446	}	645	}
447		646
448	#if ENABLE_ICMP	647	#if ENABLE_ICMP
449	void	648	inline void
450	vpn::icmpv4_ev (io_watcher &w, short revents)	649	vpn::icmpv4_ev (ev::io &w, int revents)
451	{	650	{
452	if (revents & (POLLIN \| POLLERR))	651	if (revents & EV_READ)
453	{	652	{
454	vpn_packet *pkt = new vpn_packet;	653	vpn_packet *pkt = new vpn_packet;
455	struct sockaddr_in sa;	654	struct sockaddr_in sa;
456	socklen_t sa_len = sizeof (sa);	655	socklen_t sa_len = sizeof (sa);
457	int len;	656	int len;
…		…
469	if (hdr->type == ::conf.icmp_type	668	if (hdr->type == ::conf.icmp_type
470	&& hdr->code == 255)	669	&& hdr->code == 255)
471	{	670	{
472	// raw sockets deliver the ipv4, but don't expect it on sends	671	// raw sockets deliver the ipv4, but don't expect it on sends
473	// this is slow, but...	672	// this is slow, but...
474	pkt->skip_hdr (ICMP_OVERHEAD);	673	pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
475		674
476	recv_vpn_packet (pkt, si);	675	recv_vpn_packet (pkt, si);
477	}	676	}
478	}	677	}
479	else	678	else
480	{	679	{
481	// probably ECONNRESET or somesuch	680	// probably ECONNRESET or somesuch
482	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	681	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
483	}	682	}
484		683
485	delete pkt;	684	delete pkt;
486	}	685	}
487	else if (revents & POLLHUP)
488	{
489	// this cannot ;) happen on udp sockets
490	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
491	exit (1);
492	}
493	else	686	else
494	{	687	{
495	slog (L_ERR,	688	slog (L_ERR,
496	_("FATAL: unknown revents %08x in socket, terminating\n"),	689	_("FATAL: unknown revents %08x in socket, exiting.\n"),
497	revents);	690	revents);
498	exit (1);	691	exit (EXIT_FAILURE);
499	}	692	}
500	}	693	}
501	#endif	694	#endif
502		695
503	void	696	inline void
504	vpn::udpv4_ev (io_watcher &w, short revents)	697	vpn::udpv4_ev (ev::io &w, int revents)
505	{	698	{
506	if (revents & (POLLIN \| POLLERR))	699	if (revents & EV_READ)
507	{	700	{
508	vpn_packet *pkt = new vpn_packet;	701	vpn_packet *pkt = new vpn_packet;
509	struct sockaddr_in sa;	702	struct sockaddr_in sa;
510	socklen_t sa_len = sizeof (sa);	703	socklen_t sa_len = sizeof (sa);
511	int len;	704	int len;
…		…
521	recv_vpn_packet (pkt, si);	714	recv_vpn_packet (pkt, si);
522	}	715	}
523	else	716	else
524	{	717	{
525	// probably ECONNRESET or somesuch	718	// probably ECONNRESET or somesuch
526	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	719	slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
527	}	720	}
528		721
529	delete pkt;	722	delete pkt;
530	}	723	}
531	else if (revents & POLLHUP)
532	{
533	// this cannot ;) happen on udp sockets
534	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
535	exit (1);
536	}
537	else	724	else
538	{	725	{
539	slog (L_ERR,	726	slog (L_ERR,
540	_("FATAL: unknown revents %08x in socket, terminating\n"),	727	_("FATAL: unknown revents %08x in socket, exiting.\n"),
541	revents);	728	revents);
542	exit (1);	729	exit (EXIT_FAILURE);
543	}	730	}
544	}	731	}
545		732
546	void	733	inline void
547	vpn::tap_ev (io_watcher &w, short revents)	734	vpn::tap_ev (ev::io &w, int revents)
548	{	735	{
549	if (revents & POLLIN)	736	if (revents & EV_READ)
550	{	737	{
551	/* process data */	738	/* process data */
552	tap_packet *pkt;	739	tap_packet *pkt;
553		740
554	pkt = tap->recv ();	741	pkt = tap->recv ();
…		…
561	int dst = mac2id (pkt->dst);	748	int dst = mac2id (pkt->dst);
562	int src = mac2id (pkt->src);	749	int src = mac2id (pkt->src);
563		750
564	if (src != THISNODE->id)	751	if (src != THISNODE->id)
565	{	752	{
566	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));	753	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
567	exit (1);	754	exit (EXIT_FAILURE);
568	}	755	}
569		756
570	if (dst == THISNODE->id)	757	if (dst == THISNODE->id)
571	{	758	{
572	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));	759	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
573	exit (1);	760	exit (EXIT_FAILURE);
574	}	761	}
575		762
576	if (dst > conns.size ())	763	if (dst > conns.size ())
577	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);	764	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
578	else	765	else
579	inject_data_packet (pkt, dst);	766	inject_data_packet (pkt, dst);
580	}	767	}
581		768
582	delete pkt;	769	delete pkt;
583	}	770	}
584	else if (revents & (POLLHUP \| POLLERR))
585	{
586	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
587	exit (1);
588	}
589	else	771	else
590	abort ();	772	abort ();
591	}	773	}
592		774
593	void	775	inline void
594	vpn::event_cb (time_watcher &w)	776	vpn::event_cb (ev::timer &w, int)
595	{	777	{
596	if (events)	778	if (events)
597	{	779	{
598	if (events & EVENT_SHUTDOWN)	780	if (events & EVENT_SHUTDOWN)
599	{	781	{
600	slog (L_INFO, _("preparing shutdown..."));	782	slog (L_INFO, _("preparing shutdown..."));
601		783
602	shutdown_all ();	784	shutdown_all ();
603
604	remove_pid (pidfilename);	785	remove_pid (conf.pidfilename);
605
606	slog (L_INFO, _("terminating"));	786	slog (L_INFO, _("exiting."));
607		787	exit (EXIT_SUCCESS);
608	exit (0);
609	}	788	}
610		789
611	if (events & EVENT_RECONNECT)	790	if (events & EVENT_RECONNECT)
612	{	791	{
613	slog (L_INFO, _("forced reconnect"));	792	slog (L_INFO, _("forced reconnect."));
614		793
615	reconnect_all ();	794	reconnect_all ();
616	}	795	}
617		796
618	events = 0;	797	events = 0;
619	}	798	}
620
621	w.at = TSTAMP_CANCEL;
622	}	799	}
623		800
624	void	801	void
625	vpn::shutdown_all ()	802	vpn::shutdown_all ()
626	{	803	{
…		…
636		813
637	conns.clear ();	814	conns.clear ();
638		815
639	connection_init ();	816	connection_init ();
640		817
641	for (configuration::node_vector::iterator i = conf.nodes.begin ();	818	for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
642	i != conf.nodes.end (); ++i)	819	conns.push_back (new connection (this, *i));
643	{
644	connection *conn = new connection (this);
645		820
646	conn->conf = *i;	821	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
647	conns.push_back (conn);
648
649	conn->establish_connection ();	822	(*c)->establish_connection ();
650	}
651	}	823	}
652		824
653	connection *vpn::find_router ()	825	bool
		826	vpn::can_direct (conf_node src, conf_node dst) const
654	{	827	{
655	u32 prio = 1;	828	return src != dst
		829	&& src->may_direct (dst)
		830	&& dst->may_direct (src)
		831	&& (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
		832	\|\| (src->protocols & dst->connectable_protocols ()));
		833	}
		834
		835	// only works for indirect and routed connections: find a router
		836	// from THISNODE to dst
		837	connection *
		838	vpn::find_router_for (const connection *dst)
		839	{
656	connection *router = 0;	840	connection *router = 0;
657		841
		842	// first try to find a router with a direct connection, route there
		843	// regardless of any other considerations.
		844	{
		845	u32 prio = 1;
		846
		847	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
		848	{
		849	connection c = i;
		850
		851	if (c->conf->routerprio > prio
		852	&& c->conf != THISNODE
		853	&& can_direct (c->conf, dst->conf)
		854	&& c->ictx && c->octx)
		855	{
		856	prio = c->conf->routerprio;
		857	router = c;
		858	}
		859	}
		860	}
		861
		862	if (router)
		863	return router;
		864
		865	// second try find the router with the highest priority, higher than ours
		866	{
		867	u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
		868
		869	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
		870	{
		871	connection c = i;
		872
		873	if (c->conf->routerprio > prio
		874	&& c != dst
		875	&& c->conf != THISNODE
		876	&& c->ictx && c->octx)
		877	{
		878	prio = c->conf->routerprio;
		879	router = c;
		880	}
		881	}
		882	}
		883
		884	return router;
		885	}
		886
		887	void
		888	vpn::connection_established (connection *c)
		889	{
658	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	890	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
659	{	891	{
660	connection c = i;	892	connection o = i;
661		893
662	if (c->conf->routerprio > prio	894	if (!o->is_direct
663	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use	895	&& o->si.valid ()
664	&& c->ictx && c->octx	896	&& c->si != o->si
665	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode	897	&& c == find_router_for (o))
666	{
667	prio = c->conf->routerprio;
668	router = c;
669	}	898	{
		899	slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
		900	o->conf->nodename, c->conf->nodename);
		901	o->rekey ();
		902	}
670	}	903	}
671
672	return router;
673	}	904	}
674		905
		906	void
675	void vpn::send_connect_request (int id)	907	vpn::send_connect_request (connection *c)
676	{	908	{
677	connection *c = find_router ();	909	connection *r = find_router_for (c);
678		910
679	if (c)	911	if (r)
		912	{
		913	slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
		914	c->conf->nodename, r->conf->nodename);
680	c->send_connect_request (id);	915	r->send_connect_request (c->conf->id);
		916	}
681	else	917	else
682	// no router found, aggressively connect to all routers	918	slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
683	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	919	c->conf->nodename);
684	if ((i)->conf->routerprio && (i)->conf != THISNODE)
685	(*i)->establish_connection ();
686	}	920	}
687		921
688	void	922	void
689	connection::dump_status ()	923	connection::dump_status ()
690	{	924	{
691	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);	925	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
692	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),	926	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
693	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);	927	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
694	slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),	928	slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
695	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);	929	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
696	slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
697	(long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
698	}	930	}
699		931
700	void	932	void
701	vpn::dump_status ()	933	vpn::dump_status ()
702	{	934	{
703	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);	935	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
704		936
705	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	937	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
706	(*c)->dump_status ();	938	(*c)->dump_status ();
707		939
708	slog (L_NOTICE, _("END status dump"));	940	slog (L_NOTICE, _("END status dump"));
709	}	941	}
710		942
711	vpn::vpn (void)	943	vpn::vpn (void)
		944	{
712	: event (this, &vpn::event_cb)	945	event .set<vpn, &vpn::event_cb > (this);
713	, udpv4_ev_watcher (this, &vpn::udpv4_ev)	946	udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
714	, ipv4_ev_watcher (this, &vpn::ipv4_ev)	947	ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
715	#if ENABLE_TCP	948	#if ENABLE_TCP
716	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	949	tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
717	#endif	950	#endif
718	#if ENABLE_ICMP	951	#if ENABLE_ICMP
719	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	952	icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
720	#endif	953	#endif
721	, tap_ev_watcher (this, &vpn::tap_ev)	954	#if ENABLE_DNS
722	{	955	dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
		956	#endif
		957	tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
723	}	958	}
724		959
725	vpn::~vpn ()	960	vpn::~vpn ()
726	{	961	{
727	}	962	}

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs. Revision 1.66 by root, Thu Jul 18 13:35:16 2013 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.66 by root, Thu Jul 18 13:35:16 2013 UTC