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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.20 by pcg, Thu Oct 16 14:12:00 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.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.69 by root, Sat Sep 5 17:40:22 2015 UTC