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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.6 by pcg, Sun Apr 6 04:17:36 2003 UTC vs. Revision 1.62 by root, Sat Dec 17 22:05:34 2011 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.6 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.62 by root, Sat Dec 17 22:05:34 2011 UTC