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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 21:57:54 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
45	vpn network; // THE vpn (bad design...)	60	vpn network; // THE vpn (bad design...)
46		61
47	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
48		63
49	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 ()
50	{	78	{
51	// the tunnel device mtu should be the physical mtu - overhead	79	// the tunnel device mtu should be the physical mtu - overhead
52	// the tricky part is rounding to the cipher key blocksize	80	// the tricky part is rounding to the cipher key blocksize
53	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	81	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	82	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	83	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
56	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	84	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57		85
58	char *env;	86	char *env;
59	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);	87	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
61	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);	88	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);	89	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);	90	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65	asprintf (&env, "MTU=%d", mtu); putenv (env);	91	asprintf (&env, "MTU=%d", mtu); putenv (env);
66	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	92	asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	93	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68	THISNODE->id & 0xff);
69	putenv (env);
70		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,
71	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;
72	}	148	}
73		149
74	int	150	int
75	vpn::setup ()	151	vpn::setup ()
76	{	152	{
		153	int success = 0;
		154
		155	ipv4_tos = -1;
77	ipv4_fd = -1;	156	ipv4_fd = -1;
78		157
79	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)	158	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
80	{	159	{
81	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);	160	ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
82		161
83	if (ipv4_fd < 0)	162	if (ipv4_fd < 0)
84	return -1;	163	return -1;
85
86	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
87		164
88	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)	165	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89	// this I really consider a linux bug. I am neither connected	166	// this I really consider a linux bug. I am neither connected
90	// 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
91	// fragment for me sometimes.	168	// fragment for me sometimes.
…		…
97		174
98	sockinfo si (THISNODE, PROT_IPv4);	175	sockinfo si (THISNODE, PROT_IPv4);
99		176
100	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	177	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101	{	178	{
102	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));
103	exit (1);	180	return -1;
104	}	181	}
105		182
106	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	183	ipv4_ev_watcher.start (ipv4_fd, EV_READ);
		184	++success;
107	}	185	}
		186	else
		187	THISNODE->protocols &= ~PROT_IPv4;
108		188
		189	udpv4_tos = -1;
109	udpv4_fd = -1;	190	udpv4_fd = -1;
110		191
111	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	192	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
112	{	193	{
113	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	194	udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
114		195
115	if (udpv4_fd < 0)	196	if (udpv4_fd < 0)
116	return -1;	197	return -1;
117
118	fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
119		198
120	// standard daemon practise...	199	// standard daemon practise...
121	{	200	{
122	int oval = 1;	201	int oval = 1;
123	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	202	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
…		…
135		214
136	sockinfo si (THISNODE, PROT_UDPv4);	215	sockinfo si (THISNODE, PROT_UDPv4);
137		216
138	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	217	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139	{	218	{
140	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));
141	exit (1);	220	return -1;
142	}	221	}
143		222
144	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	223	udpv4_ev_watcher.start (udpv4_fd, EV_READ);
		224	++success;
145	}	225	}
		226	else
		227	THISNODE->protocols &= ~PROT_UDPv4;
146		228
		229	icmpv4_tos = -1;
147	icmpv4_fd = -1;	230	icmpv4_fd = -1;
148		231
149	#if ENABLE_ICMP	232	#if ENABLE_ICMP
150	if (THISNODE->protocols & PROT_ICMPv4)	233	if (THISNODE->protocols & PROT_ICMPv4)
151	{	234	{
152	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);	235	icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
153		236
154	if (icmpv4_fd < 0)	237	if (icmpv4_fd < 0)
155	return -1;	238	return -1;
156
157	fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
158		239
159	#ifdef ICMP_FILTER	240	#ifdef ICMP_FILTER
160	{	241	{
161	icmp_filter oval;	242	icmp_filter oval;
162	oval.data = 0xffffffff;	243	oval.data = 0xffffffff;
…		…
171	// this I really consider a linux bug. I am neither connected	252	// this I really consider a linux bug. I am neither connected
172	// 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
173	// fragment for me sometimes.	254	// fragment for me sometimes.
174	{	255	{
175	int oval = IP_PMTUDISC_DONT;	256	int oval = IP_PMTUDISC_DONT;
176	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	257	setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177	}	258	}
178	#endif	259	#endif
179		260
180	sockinfo si (THISNODE, PROT_ICMPv4);	261	sockinfo si (THISNODE, PROT_ICMPv4);
181		262
182	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	263	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183	{	264	{
184	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));
185	exit (1);	266	return -1;
186	}	267	}
187		268
188	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	269	icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
		270	++success;
189	}	271	}
190	#endif	272	#endif
191		273
192	tcpv4_fd = -1;	274	tcpv4_fd = -1;
193		275
194	#if ENABLE_TCP	276	#if ENABLE_TCP
195	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)	277	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
196	{	278	{
197	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);	279	tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
198		280
199	if (tcpv4_fd < 0)	281	if (tcpv4_fd < 0)
200	return -1;	282	return -1;
201		283
202	fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
203
204	// standard daemon practise...	284	// standard daemon practise...
205	{	285	{
206	int oval = 1;	286	int oval = 1;
207	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	287	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
208	}	288	}
209		289
210	sockinfo si (THISNODE, PROT_TCPv4);	290	sockinfo si (THISNODE, PROT_TCPv4);
211		291
212	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	292	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213	{	293	{
214	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));
215	exit (1);	295	return -1;
216	}	296	}
217		297
218	if (listen (tcpv4_fd, 5))	298	if (listen (tcpv4_fd, 5))
219	{	299	{
220	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));
221	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);
222	}	331	}
223
224	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
225	}
226	#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	/////////////////////////////////////////////////////////////////////////////
227		366
228	tap = new tap_device ();	367	tap = new tap_device ();
229	if (!tap) //D this, of course, never catches	368	if (!tap) //D this, of course, never catches
230	{	369	{
231	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	370	slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
232	exit (1);	371	return -1;
233	}	372	}
234		373
235	run_script (run_script_cb (this, &vpn::script_if_up), true);	374	fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
236		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
237	tap_ev_watcher.start (tap->fd, POLLIN);	394	tap_ev_watcher.start (tap->fd, EV_READ);
238
239	reconnect_all ();
240		395
241	return 0;	396	return 0;
242	}	397	}
243		398
244	// send a vpn packet out to other hosts
245	bool	399	bool
246	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)	400	vpn::drop_privileges ()
247	{	401	{
248	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))
249	{	452	{
250	case PROT_IPv4:	453	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;	454	return false;
269	}	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;
270	}	465	}
271		466
272	bool	467	bool
273	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)
274	{	469	{
275	#if defined(SOL_IP) && defined(IP_TOS)	470	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 ());	471	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
279		472
280	return true;	473	return true;
281	}	474	}
282		475
…		…
305		498
306	#if ENABLE_ICMP	499	#if ENABLE_ICMP
307	bool	500	bool
308	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)
309	{	502	{
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);	503	pkt->unshift_hdr (4);
315		504
316	icmp_header hdr = (icmp_header )&((*pkt)[0]);	505	icmp_header hdr = (icmp_header )&((*pkt)[0]);
317	hdr->type = ::conf.icmp_type;	506	hdr->type = ::conf.icmp_type;
318	hdr->code = 255;	507	hdr->code = 255;
319	hdr->checksum = 0;	508	hdr->checksum = 0;
320	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);	509	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321		510
		511	set_tos (icmpv4_fd, icmpv4_tos, tos);
322	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 ());
323		513
324	return true;	514	return true;
325	}	515	}
326	#endif	516	#endif
327		517
328	bool	518	bool
329	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)
330	{	520	{
331	#if defined(SOL_IP) && defined(IP_TOS)	521	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 ());	522	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
335		523
336	return true;	524	return true;
337	}	525	}
338		526
…		…
349	{	537	{
350	// broadcast, this is ugly, but due to the security policy	538	// broadcast, this is ugly, but due to the security policy
351	// we have to connect to all hosts...	539	// we have to connect to all hosts...
352	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	540	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
353	if ((*c)->conf != THISNODE)	541	if ((*c)->conf != THISNODE)
354	(*c)->inject_data_packet (pkt, true);	542	(*c)->inject_data_packet (pkt);
355	}	543	}
356	}	544	}
357		545
358	void	546	void
359	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	547	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
360	{	548	{
361	unsigned int src = pkt->src ();	549	unsigned int src = pkt->src ();
362	unsigned int dst = pkt->dst ();	550	unsigned int dst = pkt->dst ();
363		551
364	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."),
365	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);	553	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
366		554
367	if (src == 0 \|\| src > conns.size ()	555	if (src == 0 \|\| src > conns.size ()
368	\|\| dst > conns.size ()	556	\|\| dst > conns.size ()
369	\|\| pkt->typ () >= vpn_packet::PT_MAX)	557	\|\| pkt->typ () >= vpn_packet::PT_MAX)
370	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)."),
371	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
372	else if (dst > conns.size ())
373	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
374	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	559	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
375	else	560	else
376	{	561	{
377	connection *c = conns[src - 1];	562	connection *c = conns[src - 1];
378		563
379	if (dst == 0)	564	if (dst == 0)
380	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	565	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
381	c->conf->nodename, (const char *)rsi);	566	c->conf->nodename, (const char *)rsi);
382	else if (dst != THISNODE->id)	567	else if (dst != THISNODE->id)
383	{	568	{
384	if (THISNODE->routerprio)	569	if (THISNODE->routerprio)
385	// the tos setting gets lost here. who cares.	570	// the tos setting gets lost here. who cares.
386	conns[dst - 1]->inject_vpn_packet (pkt);	571	conns[dst - 1]->inject_vpn_packet (pkt);
387	else	572	else
388	slog (L_WARN,	573	slog (L_WARN,
389	_("%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?)."),
390	c->conf->nodename, (const char *)rsi,	575	c->conf->nodename, (const char *)rsi,
391	conns[dst - 1]->conf->nodename);	576	conns[dst - 1]->conf->nodename);
392	}	577	}
393	else	578	else
394	c->recv_vpn_packet (pkt, rsi);	579	c->recv_vpn_packet (pkt, rsi);
395	}	580	}
396	}	581	}
397		582
398	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
399	vpn::ipv4_ev (io_watcher &w, short revents)	614	vpn::ipv4_ev (ev::io &w, int revents)
400	{	615	{
401	if (revents & (POLLIN \| POLLERR))	616	if (revents & EV_READ)
402	{	617	{
403	vpn_packet *pkt = new vpn_packet;	618	vpn_packet *pkt = new vpn_packet;
404	struct sockaddr_in sa;	619	struct sockaddr_in sa;
405	socklen_t sa_len = sizeof (sa);	620	socklen_t sa_len = sizeof (sa);
406	int len;	621	int len;
…		…
411		626
412	if (len > 0)	627	if (len > 0)
413	{	628	{
414	pkt->len = len;	629	pkt->len = len;
415		630
416	// 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
417	// this is slow, but...	632	pkt->skip_hdr (pkt->ipv4_hdr_len ());
418	pkt->skip_hdr (IP_OVERHEAD);
419		633
420	recv_vpn_packet (pkt, si);	634	recv_vpn_packet (pkt, si);
421	}	635	}
422	else	636	else
423	{	637	{
424	// probably ECONNRESET or somesuch	638	// probably ECONNRESET or somesuch
425	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	639	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
426	}	640	}
427		641
428	delete pkt;	642	delete pkt;
429	}	643	}
430	else if (revents & POLLHUP)
431	{
432	// this cannot ;) happen on udp sockets
433	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
434	exit (1);
435	}
436	else	644	else
437	{	645	{
438	slog (L_ERR,	646	slog (L_ERR,
439	_("FATAL: unknown revents %08x in socket, terminating\n"),	647	_("FATAL: unknown revents %08x in socket, exiting.\n"),
440	revents);	648	revents);
441	exit (1);	649	exit (EXIT_FAILURE);
442	}	650	}
443	}	651	}
444		652
445	#if ENABLE_ICMP	653	#if ENABLE_ICMP
446	void	654	inline void
447	vpn::icmpv4_ev (io_watcher &w, short revents)	655	vpn::icmpv4_ev (ev::io &w, int revents)
448	{	656	{
449	if (revents & (POLLIN \| POLLERR))	657	if (revents & EV_READ)
450	{	658	{
451	vpn_packet *pkt = new vpn_packet;	659	vpn_packet *pkt = new vpn_packet;
452	struct sockaddr_in sa;	660	struct sockaddr_in sa;
453	socklen_t sa_len = sizeof (sa);	661	socklen_t sa_len = sizeof (sa);
454	int len;	662	int len;
…		…
466	if (hdr->type == ::conf.icmp_type	674	if (hdr->type == ::conf.icmp_type
467	&& hdr->code == 255)	675	&& hdr->code == 255)
468	{	676	{
469	// 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
470	// this is slow, but...	678	// this is slow, but...
471	pkt->skip_hdr (ICMP_OVERHEAD);	679	pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
472		680
473	recv_vpn_packet (pkt, si);	681	recv_vpn_packet (pkt, si);
474	}	682	}
475	}	683	}
476	else	684	else
477	{	685	{
478	// probably ECONNRESET or somesuch	686	// probably ECONNRESET or somesuch
479	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	687	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
480	}	688	}
481		689
482	delete pkt;	690	delete pkt;
483	}	691	}
484	else if (revents & POLLHUP)
485	{
486	// this cannot ;) happen on udp sockets
487	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
488	exit (1);
489	}
490	else	692	else
491	{	693	{
492	slog (L_ERR,	694	slog (L_ERR,
493	_("FATAL: unknown revents %08x in socket, terminating\n"),	695	_("FATAL: unknown revents %08x in socket, exiting.\n"),
494	revents);	696	revents);
495	exit (1);	697	exit (EXIT_FAILURE);
496	}	698	}
497	}	699	}
498	#endif	700	#endif
499		701
500	void	702	inline void
501	vpn::udpv4_ev (io_watcher &w, short revents)	703	vpn::udpv4_ev (ev::io &w, int revents)
502	{	704	{
503	if (revents & (POLLIN \| POLLERR))	705	if (revents & EV_READ)
504	{	706	{
505	vpn_packet *pkt = new vpn_packet;	707	vpn_packet *pkt = new vpn_packet;
506	struct sockaddr_in sa;	708	struct sockaddr_in sa;
507	socklen_t sa_len = sizeof (sa);	709	socklen_t sa_len = sizeof (sa);
508	int len;	710	int len;
…		…
518	recv_vpn_packet (pkt, si);	720	recv_vpn_packet (pkt, si);
519	}	721	}
520	else	722	else
521	{	723	{
522	// probably ECONNRESET or somesuch	724	// probably ECONNRESET or somesuch
523	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));
524	}	726	}
525		727
526	delete pkt;	728	delete pkt;
527	}	729	}
528	else if (revents & POLLHUP)
529	{
530	// this cannot ;) happen on udp sockets
531	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532	exit (1);
533	}
534	else	730	else
535	{	731	{
536	slog (L_ERR,	732	slog (L_ERR,
537	_("FATAL: unknown revents %08x in socket, terminating\n"),	733	_("FATAL: unknown revents %08x in socket, exiting.\n"),
538	revents);	734	revents);
539	exit (1);	735	exit (EXIT_FAILURE);
540	}	736	}
541	}	737	}
542		738
543	void	739	inline void
544	vpn::tap_ev (io_watcher &w, short revents)	740	vpn::tap_ev (ev::io &w, int revents)
545	{	741	{
546	if (revents & POLLIN)	742	if (revents & EV_READ)
547	{	743	{
548	/* process data */	744	/* process data */
549	tap_packet *pkt;	745	tap_packet *pkt;
550		746
551	pkt = tap->recv ();	747	pkt = tap->recv ();
…		…
558	int dst = mac2id (pkt->dst);	754	int dst = mac2id (pkt->dst);
559	int src = mac2id (pkt->src);	755	int src = mac2id (pkt->src);
560		756
561	if (src != THISNODE->id)	757	if (src != THISNODE->id)
562	{	758	{
563	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."));
564	exit (1);	760	exit (EXIT_FAILURE);
565	}	761	}
566		762
567	if (dst == THISNODE->id)	763	if (dst == THISNODE->id)
568	{	764	{
569	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."));
570	exit (1);	766	exit (EXIT_FAILURE);
571	}	767	}
572		768
573	if (dst > conns.size ())	769	if (dst > conns.size ())
574	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);
575	else	771	else
576	inject_data_packet (pkt, dst);	772	inject_data_packet (pkt, dst);
577	}	773	}
578		774
579	delete pkt;	775	delete pkt;
580	}	776	}
581	else if (revents & (POLLHUP \| POLLERR))
582	{
583	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
584	exit (1);
585	}
586	else	777	else
587	abort ();	778	abort ();
588	}	779	}
589		780
590	void	781	inline void
591	vpn::event_cb (time_watcher &w)	782	vpn::event_cb (ev::timer &w, int)
592	{	783	{
593	if (events)	784	if (events)
594	{	785	{
595	if (events & EVENT_SHUTDOWN)	786	if (events & EVENT_SHUTDOWN)
596	{	787	{
597	slog (L_INFO, _("preparing shutdown..."));	788	slog (L_INFO, _("preparing shutdown..."));
598		789
599	shutdown_all ();	790	shutdown_all ();
600
601	remove_pid (pidfilename);	791	remove_pid (conf.pidfilename);
602
603	slog (L_INFO, _("terminating"));	792	slog (L_INFO, _("exiting."));
604		793	exit (EXIT_SUCCESS);
605	exit (0);
606	}	794	}
607		795
608	if (events & EVENT_RECONNECT)	796	if (events & EVENT_RECONNECT)
609	{	797	{
610	slog (L_INFO, _("forced reconnect"));	798	slog (L_INFO, _("forced reconnect."));
611		799
612	reconnect_all ();	800	reconnect_all ();
613	}	801	}
614		802
615	events = 0;	803	events = 0;
616	}	804	}
617
618	w.at = TSTAMP_CANCEL;
619	}	805	}
620		806
621	void	807	void
622	vpn::shutdown_all ()	808	vpn::shutdown_all ()
623	{	809	{
…		…
633		819
634	conns.clear ();	820	conns.clear ();
635		821
636	connection_init ();	822	connection_init ();
637		823
638	for (configuration::node_vector::iterator i = conf.nodes.begin ();	824	for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
639	i != conf.nodes.end (); ++i)	825	conns.push_back (new connection (this, *i));
640	{
641	connection *conn = new connection (this);
642		826
643	conn->conf = *i;	827	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
644	conns.push_back (conn);
645
646	conn->establish_connection ();	828	(*c)->establish_connection ();
647	}
648	}	829	}
649		830
650	connection *vpn::find_router ()	831	bool
		832	vpn::can_direct (conf_node src, conf_node dst) const
651	{	833	{
652	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	{
653	connection *router = 0;	846	connection *router = 0;
654		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	{
655	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	896	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
656	{	897	{
657	connection c = i;	898	connection o = i;
658		899
659	if (c->conf->routerprio > prio	900	if (!o->is_direct
660	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use	901	&& o->si.valid ()
661	&& c->ictx && c->octx	902	&& c->si != o->si
662	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode	903	&& c == find_router_for (o))
663	{
664	prio = c->conf->routerprio;
665	router = c;
666	}	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	}
667	}	909	}
668
669	return router;
670	}	910	}
671		911
		912	void
672	void vpn::send_connect_request (int id)	913	vpn::send_connect_request (connection *c)
673	{	914	{
674	connection *c = find_router ();	915	connection *r = find_router_for (c);
675		916
676	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);
677	c->send_connect_request (id);	921	r->send_connect_request (c->conf->id);
		922	}
678	else	923	else
679	// 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."),
680	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	925	c->conf->nodename);
681	if ((i)->conf->routerprio && (i)->conf != THISNODE)
682	(*i)->establish_connection ();
683	}	926	}
684		927
685	void	928	void
686	connection::dump_status ()	929	connection::dump_status ()
687	{	930	{
688	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);	931	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
689	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),	932	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
690	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);	933	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
691	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"),
692	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);	935	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
693	slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
694	(long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
695	}	936	}
696		937
697	void	938	void
698	vpn::dump_status ()	939	vpn::dump_status ()
699	{	940	{
700	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);	941	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
701		942
702	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	943	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
703	(*c)->dump_status ();	944	(*c)->dump_status ();
704		945
705	slog (L_NOTICE, _("END status dump"));	946	slog (L_NOTICE, _("END status dump"));
706	}	947	}
707		948
708	vpn::vpn (void)	949	vpn::vpn (void)
		950	{
709	: event (this, &vpn::event_cb)	951	event .set<vpn, &vpn::event_cb > (this);
710	, udpv4_ev_watcher (this, &vpn::udpv4_ev)	952	udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
711	, ipv4_ev_watcher (this, &vpn::ipv4_ev)	953	ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
712	#if ENABLE_TCP	954	#if ENABLE_TCP
713	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	955	tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
714	#endif	956	#endif
715	#if ENABLE_ICMP	957	#if ENABLE_ICMP
716	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	958	icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
717	#endif	959	#endif
718	, tap_ev_watcher (this, &vpn::tap_ev)	960	#if ENABLE_DNS
719	{	961	dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
		962	#endif
		963	tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
720	}	964	}
721		965
722	vpn::~vpn ()	966	vpn::~vpn ()
723	{	967	{
724	}	968	}

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.21 by pcg, Thu Oct 16 21:57:54 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.21 by pcg, Thu Oct 16 21:57:54 2003 UTC vs.
Revision 1.64 by root, Tue Dec 4 10:29:43 2012 UTC