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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.22 by pcg, Sat Jan 17 01:18:36 2004 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-2004 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify it
6	it under the terms of the GNU General Public License as published by	8	under the terms of the GNU General Public License as published by the
7	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
8	(at your option) any later version.	10	option) any later version.
9		11
10	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful, but
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13	GNU General Public License for more details.	15	Public License for more details.
14		16
15	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License along
16	along with this program; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
17	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19
		20	Additional permission under GNU GPL version 3 section 7
		21
		22	If you modify this Program, or any covered work, by linking or
		23	combining it with the OpenSSL project's OpenSSL library (or a modified
		24	version of that library), containing parts covered by the terms of the
		25	OpenSSL or SSLeay licenses, the licensors of this Program grant you
		26	additional permission to convey the resulting work. Corresponding
		27	Source for a non-source form of such a combination shall include the
		28	source code for the parts of OpenSSL used as well as that of the
		29	covered work.
18	*/	30	*/
19		31
20	#include "config.h"	32	#include "config.h"
21		33
22	#include <list>	34	#include <list>
23		35
		36	#include <cstdio>
		37	#include <cstring>
24	#include <cstdlib>	38	#include <cstdlib>
25	#include <cstring>
26	#include <cstdio>
27		39
28	#include <sys/types.h>	40	#include <sys/types.h>
29	#include <sys/socket.h>	41	#include <sys/socket.h>
30	#include <sys/wait.h>	42	#include <sys/wait.h>
31	#include <errno.h>	43	#include <errno.h>
44		56
45	vpn network; // THE vpn (bad design...)	57	vpn network; // THE vpn (bad design...)
46		58
47	/////////////////////////////////////////////////////////////////////////////	59	/////////////////////////////////////////////////////////////////////////////
48		60
49	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 ()
50	{	75	{
51	// the tunnel device mtu should be the physical mtu - overhead	76	// the tunnel device mtu should be the physical mtu - overhead
52	// the tricky part is rounding to the cipher key blocksize	77	// the tricky part is rounding to the cipher key blocksize
53	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	78	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	79	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	80	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
56	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	81	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57		82
58	char *env;	83	char *env;
59	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);	84	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
61	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);	85	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);	86	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);	87	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65	asprintf (&env, "MTU=%d", mtu); putenv (env);	88	asprintf (&env, "MTU=%d", mtu); putenv (env);
66	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	89	asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	90	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68	THISNODE->id & 0xff);
69	putenv (env);
70		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,
71	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;
72	}	145	}
73		146
74	int	147	int
75	vpn::setup ()	148	vpn::setup ()
76	{	149	{
		150	int success = 0;
		151
		152	#if 1//D2
		153	ipv42_tos = -1;
77	ipv4_fd = -1;	154	ipv42_fd = -1;
78		155
79	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)	156	if (THISNODE->protocols & PROT_IPv42 && ::conf.ip_proto)
80	{	157	{
81	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);	158	ipv42_fd = setup_socket (PROT_IPv42, PF_INET, SOCK_RAW, ::conf.ip2_proto);
82		159
83	if (ipv4_fd < 0)	160	if (ipv42_fd < 0)
84	return -1;	161	return -1;
85
86	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
87		162
88	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)	163	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89	// this I really consider a linux bug. I am neither connected	164	// this I really consider a linux bug. I am neither connected
90	// 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
91	// fragment for me sometimes.	166	// fragment for me sometimes.
92	{	167	{
93	int oval = IP_PMTUDISC_DONT;	168	int oval = IP_PMTUDISC_DONT;
94	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	169	setsockopt (ipv42_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
95	}	170	}
96	#endif	171	#endif
97		172
98	sockinfo si (THISNODE, PROT_IPv4);	173	sockinfo si (THISNODE, PROT_IPv42);
99		174
100	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	175	if (bind (ipv42_fd, si.sav4 (), si.salenv4 ()))
101	{	176	{
102	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));	177	slog (L_ERR, _("can't bind ipv42 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
103	exit (1);	178	return -1;
104	}	179	}
105		180
106	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);	181	ipv42_ev_watcher.start (ipv42_fd, EV_READ);
		182	++success;
107	}	183	}
		184	else
		185	THISNODE->protocols &= ~PROT_IPv42;
		186	#endif
108		187
		188	ipv4_tos = -1;
109	udpv4_fd = -1;	189	ipv4_fd = -1;
110		190
111	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	191	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
112	{	192	{
113	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	193	ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
114		194
115	if (udpv4_fd < 0)	195	if (ipv4_fd < 0)
116	return -1;	196	return -1;
117
118	fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
119
120	// standard daemon practise...
121	{
122	int oval = 1;
123	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
124	}
125		197
126	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)	198	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
127	// this I really consider a linux bug. I am neither connected	199	// this I really consider a linux bug. I am neither connected
128	// 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
129	// fragment for me sometimes.	201	// fragment for me sometimes.
130	{	202	{
131	int oval = IP_PMTUDISC_DONT;	203	int oval = IP_PMTUDISC_DONT;
		204	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
		205	}
		206	#endif
		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
		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);
		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;
132	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	244	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
133	}	245	}
134	#endif	246	#endif
135		247
136	sockinfo si (THISNODE, PROT_UDPv4);	248	sockinfo si (THISNODE, PROT_UDPv4);
137		249
138	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	250	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139	{	251	{
140	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	252	slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
141	exit (1);	253	return -1;
142	}	254	}
143		255
144	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);	256	udpv4_ev_watcher.start (udpv4_fd, EV_READ);
		257	++success;
145	}	258	}
		259	else
		260	THISNODE->protocols &= ~PROT_UDPv4;
146		261
		262	icmpv4_tos = -1;
147	icmpv4_fd = -1;	263	icmpv4_fd = -1;
148		264
149	#if ENABLE_ICMP	265	#if ENABLE_ICMP
150	if (THISNODE->protocols & PROT_ICMPv4)	266	if (THISNODE->protocols & PROT_ICMPv4)
151	{	267	{
152	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);	268	icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
153		269
154	if (icmpv4_fd < 0)	270	if (icmpv4_fd < 0)
155	return -1;	271	return -1;
156
157	fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
158		272
159	#ifdef ICMP_FILTER	273	#ifdef ICMP_FILTER
160	{	274	{
161	icmp_filter oval;	275	icmp_filter oval;
162	oval.data = 0xffffffff;	276	oval.data = 0xffffffff;
…		…
171	// this I really consider a linux bug. I am neither connected	285	// this I really consider a linux bug. I am neither connected
172	// nor do I fragment myself. Linux still sets DF and doesn't	286	// nor do I fragment myself. Linux still sets DF and doesn't
173	// fragment for me sometimes.	287	// fragment for me sometimes.
174	{	288	{
175	int oval = IP_PMTUDISC_DONT;	289	int oval = IP_PMTUDISC_DONT;
176	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	290	setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177	}	291	}
178	#endif	292	#endif
179		293
180	sockinfo si (THISNODE, PROT_ICMPv4);	294	sockinfo si (THISNODE, PROT_ICMPv4);
181		295
182	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	296	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183	{	297	{
184	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));	298	slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
185	exit (1);	299	return -1;
186	}	300	}
187		301
188	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);	302	icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
		303	++success;
189	}	304	}
190	#endif	305	#endif
191		306
192	tcpv4_fd = -1;	307	tcpv4_fd = -1;
193		308
194	#if ENABLE_TCP	309	#if ENABLE_TCP
195	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)	310	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
196	{	311	{
197	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);	312	tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
198		313
199	if (tcpv4_fd < 0)	314	if (tcpv4_fd < 0)
200	return -1;	315	return -1;
201		316
202	fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
203
204	// standard daemon practise...	317	// standard daemon practise...
205	{	318	{
206	int oval = 1;	319	int oval = 1;
207	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	320	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
208	}	321	}
209		322
210	sockinfo si (THISNODE, PROT_TCPv4);	323	sockinfo si (THISNODE, PROT_TCPv4);
211		324
212	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	325	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213	{	326	{
214	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));
215	exit (1);	328	return -1;
216	}	329	}
217		330
218	if (listen (tcpv4_fd, 5))	331	if (listen (tcpv4_fd, 5))
219	{	332	{
220	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));
221	exit (1);	334	return -1;
222	}	335	}
223		336
224	tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);	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);
225	}	364	}
226	#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	/////////////////////////////////////////////////////////////////////////////
227		399
228	tap = new tap_device ();	400	tap = new tap_device ();
229	if (!tap) //D this, of course, never catches	401	if (!tap) //D this, of course, never catches
230	{	402	{
231	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	403	slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
232	exit (1);	404	return -1;
233	}	405	}
234		406
235	run_script (run_script_cb (this, &vpn::script_if_up), true);	407	fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
236		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
237	tap_ev_watcher.start (tap->fd, EVENT_READ);	427	tap_ev_watcher.start (tap->fd, EV_READ);
238
239	reconnect_all ();
240		428
241	return 0;	429	return 0;
242	}
243
244	// send a vpn packet out to other hosts
245	bool
246	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247	{
248	switch (si.prot)
249	{
250	case PROT_IPv4:
251	return send_ipv4_packet (pkt, si, tos);
252
253	case PROT_UDPv4:
254	return send_udpv4_packet (pkt, si, tos);
255
256	#if ENABLE_TCP
257	case PROT_TCPv4:
258	return send_tcpv4_packet (pkt, si, tos);
259	#endif
260
261	#if ENABLE_ICMP
262	case PROT_ICMPv4:
263	return send_icmpv4_packet (pkt, si, tos);
264	#endif
265
266	default:
267	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268	return false;
269	}
270	}	430	}
271		431
272	bool	432	bool
273	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	433	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274	{	434	{
275	#if defined(SOL_IP) && defined(IP_TOS)	435	set_tos (ipv4_fd, ipv4_tos, tos);
276	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277	#endif
278	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	436	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
279		437
280	return true;	438	return true;
281	}	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
282		451
283	static u16	452	static u16
284	ipv4_checksum (u16 *data, unsigned int len)	453	ipv4_checksum (u16 *data, unsigned int len)
285	{	454	{
286	// use 32 bit accumulator and fold back carry bits at the end	455	// use 32 bit accumulator and fold back carry bits at the end
…		…
305		474
306	#if ENABLE_ICMP	475	#if ENABLE_ICMP
307	bool	476	bool
308	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	477	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309	{	478	{
310	#if defined(SOL_IP) && defined(IP_TOS)
311	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312	#endif
313
314	pkt->unshift_hdr (4);	479	pkt->unshift_hdr (4);
315		480
316	icmp_header hdr = (icmp_header )&((*pkt)[0]);	481	icmp_header hdr = (icmp_header )&((*pkt)[0]);
317	hdr->type = ::conf.icmp_type;	482	hdr->type = ::conf.icmp_type;
318	hdr->code = 255;	483	hdr->code = 255;
319	hdr->checksum = 0;	484	hdr->checksum = 0;
320	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);	485	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321		486
		487	set_tos (icmpv4_fd, icmpv4_tos, tos);
322	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	488	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
323		489
324	return true;	490	return true;
325	}	491	}
326	#endif	492	#endif
327		493
328	bool	494	bool
329	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	495	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
330	{	496	{
331	#if defined(SOL_IP) && defined(IP_TOS)	497	set_tos (udpv4_fd, udpv4_tos, tos);
332	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333	#endif
334	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	498	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
335		499
336	return true;	500	return true;
337	}	501	}
338		502
…		…
349	{	513	{
350	// broadcast, this is ugly, but due to the security policy	514	// broadcast, this is ugly, but due to the security policy
351	// we have to connect to all hosts...	515	// we have to connect to all hosts...
352	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	516	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
353	if ((*c)->conf != THISNODE)	517	if ((*c)->conf != THISNODE)
354	(*c)->inject_data_packet (pkt, true);	518	(*c)->inject_data_packet (pkt);
355	}	519	}
356	}	520	}
357		521
358	void	522	void
359	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	523	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
360	{	524	{
361	unsigned int src = pkt->src ();	525	unsigned int src = pkt->src ();
362	unsigned int dst = pkt->dst ();	526	unsigned int dst = pkt->dst ();
363		527
364	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."),
365	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);	529	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
366		530
367	if (src == 0 \|\| src > conns.size ()	531	if (src == 0 \|\| src > conns.size ()
368	\|\| dst > conns.size ()	532	\|\| dst > conns.size ()
369	\|\| pkt->typ () >= vpn_packet::PT_MAX)	533	\|\| pkt->typ () >= vpn_packet::PT_MAX)
370	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)."),
371	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	535	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
372	else if (dst > conns.size ())
373	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
374	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
375	else	536	else
376	{	537	{
377	connection *c = conns[src - 1];	538	connection *c = conns[src - 1];
378		539
379	if (dst == 0)	540	if (dst == 0)
380	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	541	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
381	c->conf->nodename, (const char *)rsi);	542	c->conf->nodename, (const char *)rsi);
382	else if (dst != THISNODE->id)	543	else if (dst != THISNODE->id)
383	{	544	{
384	if (THISNODE->routerprio)	545	if (THISNODE->routerprio)
385	// the tos setting gets lost here. who cares.	546	// the tos setting gets lost here. who cares.
386	conns[dst - 1]->inject_vpn_packet (pkt);	547	conns[dst - 1]->inject_vpn_packet (pkt);
387	else	548	else
388	slog (L_WARN,	549	slog (L_WARN,
389	_("%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?)."),
390	c->conf->nodename, (const char *)rsi,	551	c->conf->nodename, (const char *)rsi,
391	conns[dst - 1]->conf->nodename);	552	conns[dst - 1]->conf->nodename);
392	}	553	}
393	else	554	else
394	c->recv_vpn_packet (pkt, rsi);	555	c->recv_vpn_packet (pkt, rsi);
395	}	556	}
396	}	557	}
397		558
398	void	559	bool
		560	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		561	{
		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
399	vpn::ipv4_ev (io_watcher &w, short revents)	596	vpn::ipv42_ev (ev::io &w, int revents)
400	{	597	{
401	if (revents & EVENT_READ)	598	if (revents & EV_READ)
402	{	599	{
403	vpn_packet *pkt = new vpn_packet;	600	vpn_packet *pkt = new vpn_packet;
404	struct sockaddr_in sa;	601	struct sockaddr_in sa;
405	socklen_t sa_len = sizeof (sa);	602	socklen_t sa_len = sizeof (sa);
406	int len;	603	int len;
407		604
408	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);
409		606
		607	sockinfo si(sa, PROT_IPv42);
		608
		609	if (len > 0)
		610	{
		611	pkt->len = len;
		612
		613	// raw sockets deliver the ipv4 header, but don't expect it on sends
		614	pkt->skip_hdr (pkt->ipv4_hdr_len ());
		615
		616	recv_vpn_packet (pkt, si);
		617	}
		618	else
		619	{
		620	// probably ECONNRESET or somesuch
		621	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
		622	}
		623
		624	delete pkt;
		625	}
		626	else
		627	{
		628	slog (L_ERR,
		629	_("FATAL: unknown revents %08x in socket, exiting.\n"),
		630	revents);
		631	exit (EXIT_FAILURE);
		632	}
		633	}
		634	#endif
		635
		636	inline void
		637	vpn::ipv4_ev (ev::io &w, int revents)
		638	{
		639	if (revents & EV_READ)
		640	{
		641	vpn_packet *pkt = new vpn_packet;
		642	struct sockaddr_in sa;
		643	socklen_t sa_len = sizeof (sa);
		644	int len;
		645
		646	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
		647
410	sockinfo si(sa, PROT_IPv4);	648	sockinfo si(sa, PROT_IPv4);
411		649
412	if (len > 0)	650	if (len > 0)
413	{	651	{
414	pkt->len = len;	652	pkt->len = len;
415		653
416	// 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
417	// this is slow, but...	655	pkt->skip_hdr (pkt->ipv4_hdr_len ());
418	pkt->skip_hdr (IP_OVERHEAD);
419		656
420	recv_vpn_packet (pkt, si);	657	recv_vpn_packet (pkt, si);
421	}	658	}
422	else	659	else
423	{	660	{
424	// probably ECONNRESET or somesuch	661	// probably ECONNRESET or somesuch
425	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	662	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
426	}	663	}
427		664
428	delete pkt;	665	delete pkt;
429	}	666	}
430	else	667	else
431	{	668	{
432	slog (L_ERR,	669	slog (L_ERR,
433	_("FATAL: unknown revents %08x in socket, terminating\n"),	670	_("FATAL: unknown revents %08x in socket, exiting.\n"),
434	revents);	671	revents);
435	exit (1);	672	exit (EXIT_FAILURE);
436	}	673	}
437	}	674	}
438		675
439	#if ENABLE_ICMP	676	#if ENABLE_ICMP
440	void	677	inline void
441	vpn::icmpv4_ev (io_watcher &w, short revents)	678	vpn::icmpv4_ev (ev::io &w, int revents)
442	{	679	{
443	if (revents & EVENT_READ)	680	if (revents & EV_READ)
444	{	681	{
445	vpn_packet *pkt = new vpn_packet;	682	vpn_packet *pkt = new vpn_packet;
446	struct sockaddr_in sa;	683	struct sockaddr_in sa;
447	socklen_t sa_len = sizeof (sa);	684	socklen_t sa_len = sizeof (sa);
448	int len;	685	int len;
…		…
460	if (hdr->type == ::conf.icmp_type	697	if (hdr->type == ::conf.icmp_type
461	&& hdr->code == 255)	698	&& hdr->code == 255)
462	{	699	{
463	// raw sockets deliver the ipv4, but don't expect it on sends	700	// raw sockets deliver the ipv4, but don't expect it on sends
464	// this is slow, but...	701	// this is slow, but...
465	pkt->skip_hdr (ICMP_OVERHEAD);	702	pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
466		703
467	recv_vpn_packet (pkt, si);	704	recv_vpn_packet (pkt, si);
468	}	705	}
469	}	706	}
470	else	707	else
471	{	708	{
472	// probably ECONNRESET or somesuch	709	// probably ECONNRESET or somesuch
473	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	710	slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
474	}	711	}
475		712
476	delete pkt;	713	delete pkt;
477	}	714	}
478	else	715	else
479	{	716	{
480	slog (L_ERR,	717	slog (L_ERR,
481	_("FATAL: unknown revents %08x in socket, terminating\n"),	718	_("FATAL: unknown revents %08x in socket, exiting.\n"),
482	revents);	719	revents);
483	exit (1);	720	exit (EXIT_FAILURE);
484	}	721	}
485	}	722	}
486	#endif	723	#endif
487		724
488	void	725	inline void
489	vpn::udpv4_ev (io_watcher &w, short revents)	726	vpn::udpv4_ev (ev::io &w, int revents)
490	{	727	{
491	if (revents & EVENT_READ)	728	if (revents & EV_READ)
492	{	729	{
493	vpn_packet *pkt = new vpn_packet;	730	vpn_packet *pkt = new vpn_packet;
494	struct sockaddr_in sa;	731	struct sockaddr_in sa;
495	socklen_t sa_len = sizeof (sa);	732	socklen_t sa_len = sizeof (sa);
496	int len;	733	int len;
…		…
506	recv_vpn_packet (pkt, si);	743	recv_vpn_packet (pkt, si);
507	}	744	}
508	else	745	else
509	{	746	{
510	// probably ECONNRESET or somesuch	747	// probably ECONNRESET or somesuch
511	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	748	slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
512	}	749	}
513		750
514	delete pkt;	751	delete pkt;
515	}	752	}
516	else	753	else
517	{	754	{
518	slog (L_ERR,	755	slog (L_ERR,
519	_("FATAL: unknown revents %08x in socket, terminating\n"),	756	_("FATAL: unknown revents %08x in socket, exiting.\n"),
520	revents);	757	revents);
521	exit (1);	758	exit (EXIT_FAILURE);
522	}	759	}
523	}	760	}
524		761
525	void	762	inline void
526	vpn::tap_ev (io_watcher &w, short revents)	763	vpn::tap_ev (ev::io &w, int revents)
527	{	764	{
528	if (revents & EVENT_READ)	765	if (revents & EV_READ)
529	{	766	{
530	/* process data */	767	/* process data */
531	tap_packet *pkt;	768	tap_packet *pkt;
532		769
533	pkt = tap->recv ();	770	pkt = tap->recv ();
…		…
540	int dst = mac2id (pkt->dst);	777	int dst = mac2id (pkt->dst);
541	int src = mac2id (pkt->src);	778	int src = mac2id (pkt->src);
542		779
543	if (src != THISNODE->id)	780	if (src != THISNODE->id)
544	{	781	{
545	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));	782	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
546	exit (1);	783	exit (EXIT_FAILURE);
547	}	784	}
548		785
549	if (dst == THISNODE->id)	786	if (dst == THISNODE->id)
550	{	787	{
551	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));	788	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
552	exit (1);	789	exit (EXIT_FAILURE);
553	}	790	}
554		791
555	if (dst > conns.size ())	792	if (dst > conns.size ())
556	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);	793	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
557	else	794	else
…		…
562	}	799	}
563	else	800	else
564	abort ();	801	abort ();
565	}	802	}
566		803
567	void	804	inline void
568	vpn::event_cb (time_watcher &w)	805	vpn::event_cb (ev::timer &w, int)
569	{	806	{
570	if (events)	807	if (events)
571	{	808	{
572	if (events & EVENT_SHUTDOWN)	809	if (events & EVENT_SHUTDOWN)
573	{	810	{
574	slog (L_INFO, _("preparing shutdown..."));	811	slog (L_INFO, _("preparing shutdown..."));
575		812
576	shutdown_all ();	813	shutdown_all ();
577	remove_pid (pidfilename);	814	remove_pid (conf.pidfilename);
578	slog (L_INFO, _("terminating"));	815	slog (L_INFO, _("exiting."));
579	exit (0);	816	exit (EXIT_SUCCESS);
580	}	817	}
581		818
582	if (events & EVENT_RECONNECT)	819	if (events & EVENT_RECONNECT)
583	{	820	{
584	slog (L_INFO, _("forced reconnect"));	821	slog (L_INFO, _("forced reconnect."));
585		822
586	reconnect_all ();	823	reconnect_all ();
587	}	824	}
588		825
589	events = 0;	826	events = 0;
…		…
605		842
606	conns.clear ();	843	conns.clear ();
607		844
608	connection_init ();	845	connection_init ();
609		846
610	for (configuration::node_vector::iterator i = conf.nodes.begin ();	847	for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
611	i != conf.nodes.end (); ++i)	848	conns.push_back (new connection (this, *i));
612	{
613	connection *conn = new connection (this);
614		849
615	conn->conf = *i;	850	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
616	conns.push_back (conn);
617
618	conn->establish_connection ();	851	(*c)->establish_connection ();
619	}
620	}	852	}
621		853
622	connection *vpn::find_router ()	854	bool
		855	vpn::can_direct (conf_node src, conf_node dst) const
623	{	856	{
624	u32 prio = 1;	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	{
625	connection *router = 0;	869	connection *router = 0;
626		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	{
627	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	919	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
628	{	920	{
629	connection c = i;	921	connection o = i;
630		922
631	if (c->conf->routerprio > prio	923	if (!o->is_direct
632	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use	924	&& o->si.valid ()
633	&& c->ictx && c->octx	925	&& c->si != o->si
634	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode	926	&& c == find_router_for (o))
635	{
636	prio = c->conf->routerprio;
637	router = c;
638	}	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	}
639	}	932	}
640
641	return router;
642	}	933	}
643		934
		935	void
644	void vpn::send_connect_request (int id)	936	vpn::send_connect_request (connection *c)
645	{	937	{
646	connection *c = find_router ();	938	connection *r = find_router_for (c);
647		939
648	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);
649	c->send_connect_request (id);	944	r->send_connect_request (c->conf->id);
		945	}
650	else	946	else
651	// no router found, aggressively connect to all routers	947	slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
652	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	948	c->conf->nodename);
653	if ((i)->conf->routerprio && (i)->conf != THISNODE)
654	(*i)->establish_connection ();
655	}	949	}
656		950
657	void	951	void
658	connection::dump_status ()	952	connection::dump_status ()
659	{	953	{
660	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);	954	slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
661	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),	955	slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
662	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);	956	connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
663	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"),
664	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);	958	(long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
665	slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
666	(long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
667	}	959	}
668		960
669	void	961	void
670	vpn::dump_status ()	962	vpn::dump_status ()
671	{	963	{
672	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);	964	slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
673		965
674	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	966	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
675	(*c)->dump_status ();	967	(*c)->dump_status ();
676		968
677	slog (L_NOTICE, _("END status dump"));	969	slog (L_NOTICE, _("END status dump"));
678	}	970	}
679		971
680	vpn::vpn (void)	972	vpn::vpn (void)
		973	{
681	: event (this, &vpn::event_cb)	974	event .set<vpn, &vpn::event_cb > (this);
682	, udpv4_ev_watcher (this, &vpn::udpv4_ev)	975	udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
683	, ipv4_ev_watcher (this, &vpn::ipv4_ev)	976	ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
		977	#if 1//D2
		978	ipv42_ev_watcher .set<vpn, &vpn::ipv42_ev > (this);
		979	#endif
684	#if ENABLE_TCP	980	#if ENABLE_TCP
685	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	981	tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
686	#endif	982	#endif
687	#if ENABLE_ICMP	983	#if ENABLE_ICMP
688	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	984	icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
689	#endif	985	#endif
690	, tap_ev_watcher (this, &vpn::tap_ev)	986	#if ENABLE_DNS
691	{	987	dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
		988	#endif
		989	tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
692	}	990	}
693		991
694	vpn::~vpn ()	992	vpn::~vpn ()
695	{	993	{
696	}	994	}

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.22 by pcg, Sat Jan 17 01:18:36 2004 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.22 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.62 by root, Sat Dec 17 22:05:34 2011 UTC