[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.63 by root, Tue Jan 17 21:38:11 2012 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,2010,2011 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		195
119	fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
120
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		280
203	fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
204
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);
209	}	285	}
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 ())
349	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
350	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
351	else	489	else
352	{	490	{
353	connection *c = conns[src - 1];	491	connection *c = conns[src - 1];
354		492
355	if (dst == 0)	493	if (dst == 0)
356	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	494	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
357	c->conf->nodename, (const char *)rsi);	495	c->conf->nodename, (const char *)rsi);
358	else if (dst != 0 && dst != THISNODE->id)	496	else if (dst != THISNODE->id)
359	{	497	{
360	if (THISNODE->routerprio)	498	if (THISNODE->routerprio)
361	// the tos setting gets lost here. who cares.	499	// the tos setting gets lost here. who cares.
362	conns[dst - 1]->inject_vpn_packet (pkt);	500	conns[dst - 1]->inject_vpn_packet (pkt);
363	else	501	else
364	slog (L_WARN,	502	slog (L_WARN,
365	_("%s(%s): forwarding request (=> %s), but we are no router"),	503	_("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
366	c->conf->nodename, (const char *)rsi,	504	c->conf->nodename, (const char *)rsi,
367	conns[dst - 1]->conf->nodename);	505	conns[dst - 1]->conf->nodename);
368	}	506	}
369	else	507	else
370	c->recv_vpn_packet (pkt, rsi);	508	c->recv_vpn_packet (pkt, rsi);
371	}	509	}
372	}	510	}
373		511
374	void	512	bool
		513	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		514	{
		515	switch (si.prot)
		516	{
		517	case PROT_IPv4:
		518	return send_ipv4_packet (pkt, si, tos);
		519
		520	case PROT_UDPv4:
		521	return send_udpv4_packet (pkt, si, tos);
		522
		523	#if ENABLE_TCP
		524	case PROT_TCPv4:
		525	return send_tcpv4_packet (pkt, si, tos);
		526	#endif
		527	#if ENABLE_ICMP
		528	case PROT_ICMPv4:
		529	return send_icmpv4_packet (pkt, si, tos);
		530	#endif
		531	#if ENABLE_DNS
		532	case PROT_DNSv4:
		533	return send_dnsv4_packet (pkt, si, tos);
		534	#endif
		535	default:
		536	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
		537	}
		538
		539	return false;
		540	}
		541
		542	inline void
375	vpn::ipv4_ev (io_watcher &w, short revents)	543	vpn::ipv4_ev (ev::io &w, int revents)
376	{	544	{
377	if (revents & (POLLIN \| POLLERR))	545	if (revents & EV_READ)
378	{	546	{
379	vpn_packet *pkt = new vpn_packet;	547	vpn_packet *pkt = new vpn_packet;
380	struct sockaddr_in sa;	548	struct sockaddr_in sa;
381	socklen_t sa_len = sizeof (sa);	549	socklen_t sa_len = sizeof (sa);
382	int len;	550	int len;
…		…
387		555
388	if (len > 0)	556	if (len > 0)
389	{	557	{
390	pkt->len = len;	558	pkt->len = len;
391		559
392	// raw sockets deliver the ipv4, but don't expect it on sends	560	// raw sockets deliver the ipv4 header, but don't expect it on sends
393	// this is slow, but...	561	pkt->skip_hdr (pkt->ipv4_hdr_len ());
394	pkt->skip_hdr (IP_OVERHEAD);
395		562
396	recv_vpn_packet (pkt, si);	563	recv_vpn_packet (pkt, si);
397	}	564	}
398	else	565	else
399	{	566	{
400	// probably ECONNRESET or somesuch	567	// probably ECONNRESET or somesuch
401	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	568	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
402	}	569	}
403		570
404	delete pkt;	571	delete pkt;
405	}	572	}
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	573	else
413	{	574	{
414	slog (L_ERR,	575	slog (L_ERR,
415	_("FATAL: unknown revents %08x in socket, terminating\n"),	576	_("FATAL: unknown revents %08x in socket, exiting.\n"),
416	revents);	577	revents);
417	exit (1);	578	exit (EXIT_FAILURE);
418	}	579	}
419	}	580	}
420		581
421	#if ENABLE_ICMP	582	#if ENABLE_ICMP
422	void	583	inline void
423	vpn::icmpv4_ev (io_watcher &w, short revents)	584	vpn::icmpv4_ev (ev::io &w, int revents)
424	{	585	{
425	if (revents & (POLLIN \| POLLERR))	586	if (revents & EV_READ)
426	{	587	{
427	vpn_packet *pkt = new vpn_packet;	588	vpn_packet *pkt = new vpn_packet;
428	struct sockaddr_in sa;	589	struct sockaddr_in sa;
429	socklen_t sa_len = sizeof (sa);	590	socklen_t sa_len = sizeof (sa);
430	int len;	591	int len;
…		…
435		596
436	if (len > 0)	597	if (len > 0)
437	{	598	{
438	pkt->len = len;	599	pkt->len = len;
439		600
440	icmphdr hdr = (icmphdr )&((*pkt)[IP_OVERHEAD]);	601	icmp_header hdr = (icmp_header )&((*pkt)[IP_OVERHEAD]);
441		602
442	if (hdr->type == ::conf.icmp_type	603	if (hdr->type == ::conf.icmp_type
443	&& hdr->code == 255)	604	&& hdr->code == 255)
444	{	605	{
445	// raw sockets deliver the ipv4, but don't expect it on sends	606	// raw sockets deliver the ipv4, but don't expect it on sends
446	// this is slow, but...	607	// this is slow, but...
447	pkt->skip_hdr (ICMP_OVERHEAD);	608	pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
448		609
449	recv_vpn_packet (pkt, si);	610	recv_vpn_packet (pkt, si);
450	}	611	}
451	}	612	}
452	else	613	else
453	{	614	{
454	// probably ECONNRESET or somesuch	615	// probably ECONNRESET or somesuch
455	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	616	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
456	}	617	}
457		618
458	delete pkt;	619	delete pkt;
459	}	620	}
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	621	else
467	{	622	{
468	slog (L_ERR,	623	slog (L_ERR,
469	_("FATAL: unknown revents %08x in socket, terminating\n"),	624	_("FATAL: unknown revents %08x in socket, exiting.\n"),
470	revents);	625	revents);
471	exit (1);	626	exit (EXIT_FAILURE);
472	}	627	}
473	}	628	}
474	#endif	629	#endif
475		630
476	void	631	inline void
477	vpn::udpv4_ev (io_watcher &w, short revents)	632	vpn::udpv4_ev (ev::io &w, int revents)
478	{	633	{
479	if (revents & (POLLIN \| POLLERR))	634	if (revents & EV_READ)
480	{	635	{
481	vpn_packet *pkt = new vpn_packet;	636	vpn_packet *pkt = new vpn_packet;
482	struct sockaddr_in sa;	637	struct sockaddr_in sa;
483	socklen_t sa_len = sizeof (sa);	638	socklen_t sa_len = sizeof (sa);
484	int len;	639	int len;
…		…
494	recv_vpn_packet (pkt, si);	649	recv_vpn_packet (pkt, si);
495	}	650	}
496	else	651	else
497	{	652	{
498	// probably ECONNRESET or somesuch	653	// probably ECONNRESET or somesuch
499	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	654	slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
500	}	655	}
501		656
502	delete pkt;	657	delete pkt;
503	}	658	}
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	659	else
511	{	660	{
512	slog (L_ERR,	661	slog (L_ERR,
513	_("FATAL: unknown revents %08x in socket, terminating\n"),	662	_("FATAL: unknown revents %08x in socket, exiting.\n"),
514	revents);	663	revents);
515	exit (1);	664	exit (EXIT_FAILURE);
516	}	665	}
517	}	666	}
518		667
519	void	668	inline void
520	vpn::tap_ev (io_watcher &w, short revents)	669	vpn::tap_ev (ev::io &w, int revents)
521	{	670	{
522	if (revents & POLLIN)	671	if (revents & EV_READ)
523	{	672	{
524	/* process data */	673	/* process data */
525	tap_packet *pkt;	674	tap_packet *pkt;
526		675
527	pkt = tap->recv ();	676	pkt = tap->recv ();
528		677
		678	if (!pkt)
		679	return;
		680
		681	if (pkt->len > 14)
		682	{
529	int dst = mac2id (pkt->dst);	683	int dst = mac2id (pkt->dst);
530	int src = mac2id (pkt->src);	684	int src = mac2id (pkt->src);
531		685
532	if (src != THISNODE->id)	686	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	{	687	{
550	// unicast	688	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
551	if (dst != THISNODE->id)	689	exit (EXIT_FAILURE);
552	conns[dst - 1]->inject_data_packet (pkt);
553	}	690	}
		691
		692	if (dst == THISNODE->id)
		693	{
		694	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
		695	exit (EXIT_FAILURE);
		696	}
		697
		698	if (dst > conns.size ())
		699	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
554	else	700	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);	701	inject_data_packet (pkt, dst);
561	}
562	}	702	}
563		703
564	delete pkt;	704	delete pkt;
565	}	705	}
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	706	else
572	abort ();	707	abort ();
573	}	708	}
574		709
575	void	710	inline void
576	vpn::event_cb (time_watcher &w)	711	vpn::event_cb (ev::timer &w, int)
577	{	712	{
578	if (events)	713	if (events)
579	{	714	{
580	if (events & EVENT_SHUTDOWN)	715	if (events & EVENT_SHUTDOWN)
581	{	716	{
582	slog (L_INFO, _("preparing shutdown..."));	717	slog (L_INFO, _("preparing shutdown..."));
583		718
584	shutdown_all ();	719	shutdown_all ();
585
586	remove_pid (pidfilename);	720	remove_pid (conf.pidfilename);
587
588	slog (L_INFO, _("terminating"));	721	slog (L_INFO, _("exiting."));
589		722	exit (EXIT_SUCCESS);
590	exit (0);
591	}	723	}
592		724
593	if (events & EVENT_RECONNECT)	725	if (events & EVENT_RECONNECT)
594	{	726	{
595	slog (L_INFO, _("forced reconnect"));	727	slog (L_INFO, _("forced reconnect."));
596		728
597	reconnect_all ();	729	reconnect_all ();
598	}	730	}
599		731
600	events = 0;	732	events = 0;
601	}	733	}
602
603	w.at = TSTAMP_CANCEL;
604	}	734	}
605		735
606	void	736	void
607	vpn::shutdown_all ()	737	vpn::shutdown_all ()
608	{	738	{
…		…
618		748
619	conns.clear ();	749	conns.clear ();
620		750
621	connection_init ();	751	connection_init ();
622		752
623	for (configuration::node_vector::iterator i = conf.nodes.begin ();	753	for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
624	i != conf.nodes.end (); ++i)	754	conns.push_back (new connection (this, *i));
625	{
626	connection *conn = new connection (this);
627		755
628	conn->conf = *i;	756	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
629	conns.push_back (conn);
630
631	conn->establish_connection ();	757	(*c)->establish_connection ();
632	}
633	}	758	}
634		759
635	connection *vpn::find_router ()	760	bool
		761	vpn::can_direct (conf_node src, conf_node dst) const
636	{	762	{
637	u32 prio = 1;	763	return src != dst
		764	&& src->may_direct (dst)
		765	&& dst->may_direct (src)
		766	&& (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
		767	\|\| (src->protocols & dst->connectable_protocols ()));
		768	}
		769
		770	// only works for indirect and routed connections: find a router
		771	// from THISNODE to dst
		772	connection *
		773	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
		823	vpn::connection_established (connection *c)
		824	{
640	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	825	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
641	{	826	{
642	connection c = i;	827	connection o = i;
643		828
644	if (c->conf->routerprio > prio	829	if (!o->is_direct
645	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use	830	&& o->si.valid ()
646	&& c->ictx && c->octx	831	&& c->si != o->si
647	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode	832	&& c == find_router_for (o))
648	{
649	prio = c->conf->routerprio;
650	router = c;
651	}	833	{
		834	slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
		835	o->conf->nodename, c->conf->nodename);
		836	o->rekey ();
		837	}
652	}	838	}
653
654	return router;
655	}	839	}
656		840
		841	void
657	void vpn::send_connect_request (int id)	842	vpn::send_connect_request (connection *c)
658	{	843	{
659	connection *c = find_router ();	844	connection *r = find_router_for (c);
660		845
661	if (c)	846	if (r)
		847	{
		848	slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
		849	c->conf->nodename, r->conf->nodename);
662	c->send_connect_request (id);	850	r->send_connect_request (c->conf->id);
		851	}
663	else	852	else
664	// no router found, aggressively connect to all routers	853	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)	854	c->conf->nodename);
666	if ((i)->conf->routerprio && (i)->conf != THISNODE)
667	(*i)->establish_connection ();
668	}	855	}
669		856
670	void	857	void
671	connection::dump_status ()	858	connection::dump_status ()
672	{	859	{
673	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);	860	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
674	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),	861	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
675	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);	862	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
676	slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),	863	slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
677	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);	864	(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	}	865	}
681		866
682	void	867	void
683	vpn::dump_status ()	868	vpn::dump_status ()
684	{	869	{
685	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);	870	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
686		871
687	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	872	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
688	(*c)->dump_status ();	873	(*c)->dump_status ();
689		874
690	slog (L_NOTICE, _("END status dump"));	875	slog (L_NOTICE, _("END status dump"));
691	}	876	}
692		877
693	vpn::vpn (void)	878	vpn::vpn (void)
		879	{
694	: event (this, &vpn::event_cb)	880	event .set<vpn, &vpn::event_cb > (this);
695	, udpv4_ev_watcher (this, &vpn::udpv4_ev)	881	udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
696	, ipv4_ev_watcher (this, &vpn::ipv4_ev)	882	ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
697	#if ENABLE_TCP	883	#if ENABLE_TCP
698	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	884	tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
699	#endif	885	#endif
700	#if ENABLE_ICMP	886	#if ENABLE_ICMP
701	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	887	icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
702	#endif	888	#endif
703	, tap_ev_watcher (this, &vpn::tap_ev)	889	#if ENABLE_DNS
704	{	890	dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
		891	#endif
		892	tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
705	}	893	}
706		894
707	vpn::~vpn ()	895	vpn::~vpn ()
708	{	896	{
709	}	897	}

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.63 by root, Tue Jan 17 21:38:11 2012 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.63 by root, Tue Jan 17 21:38:11 2012 UTC