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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.8 by pcg, Mon Apr 7 01:28:56 2003 UTC vs. Revision 1.69 by root, Sat Sep 5 17:40:22 2015 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.8 by pcg, Mon Apr 7 01:28:56 2003 UTC vs.
Revision 1.69 by root, Sat Sep 5 17:40:22 2015 UTC