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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.19 by pcg, Thu Oct 16 02:41:21 2003 UTC vs. Revision 1.64 by root, Tue Dec 4 10:29:43 2012 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.19 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.64 by root, Tue Dec 4 10:29:43 2012 UTC