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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.17 by pcg, Wed Oct 15 06:06:41 2003 UTC vs. Revision 1.68 by root, Wed Jul 15 23:04:06 2015 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.17 by pcg, Wed Oct 15 06:06:41 2003 UTC vs.
Revision 1.68 by root, Wed Jul 15 23:04:06 2015 UTC