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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.13 by pcg, Sun Apr 13 16:53:36 2003 UTC vs. Revision 1.57 by root, Tue Feb 8 23:13:48 2011 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.13 by pcg, Sun Apr 13 16:53:36 2003 UTC vs.
Revision 1.57 by root, Tue Feb 8 23:13:48 2011 UTC