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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs. Revision 1.54 by pcg, Mon Mar 23 15:22:00 2009 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.54 by pcg, Mon Mar 23 15:22:00 2009 UTC