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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.4 by pcg, Fri Apr 4 05:26:45 2003 UTC vs. Revision 1.54 by pcg, Mon Mar 23 15:22:00 2009 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.4 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.54 by pcg, Mon Mar 23 15:22:00 2009 UTC