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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.19 by pcg, Thu Oct 16 02:41:21 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.19 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.62 by root, Sat Dec 17 22:05:34 2011 UTC