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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.9 by pcg, Tue Apr 8 02:00: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.9 by pcg, Tue Apr 8 02:00:54 2003 UTC vs.
Revision 1.64 by root, Tue Dec 4 10:29:43 2012 UTC