ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.4 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 UTC

1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
		3	Copyright (C) 2003-2008,2010 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	extern "C" {
22	# include "lzf/lzf.h"
23	}
24
25	#include <list>	34	#include <list>
		35	#include <queue>
		36	#include <utility>
26		37
27	#include <openssl/rand.h>	38	#include <openssl/rand.h>
28	#include <openssl/evp.h>	39	#include <openssl/evp.h>
29	#include <openssl/rsa.h>	40	#include <openssl/rsa.h>
30	#include <openssl/err.h>	41	#include <openssl/err.h>
31
32	#include "gettext.h"
33		42
34	#include "conf.h"	43	#include "conf.h"
35	#include "slog.h"	44	#include "slog.h"
36	#include "device.h"	45	#include "device.h"
37	#include "vpn.h"	46	#include "vpn.h"
38	#include "connection.h"	47	#include "connection.h"
39		48
		49	#include "netcompat.h"
		50
40	#if !HAVE_RAND_PSEUDO_BYTES	51	#if !HAVE_RAND_PSEUDO_BYTES
41	# define RAND_pseudo_bytes RAND_bytes	52	# define RAND_pseudo_bytes RAND_bytes
42	#endif	53	#endif
43		54
44	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	55	#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
		56	#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
		57
		58	#define ULTRA_FAST 1
		59	#define HLOG 15
		60	#include "lzf/lzf.h"
		61	#include "lzf/lzf_c.c"
		62	#include "lzf/lzf_d.c"
		63
		64	//////////////////////////////////////////////////////////////////////////////
		65
		66	static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
		67	static ev::child rs_child_ev;
		68
		69	namespace
		70	{
		71	void // c++ requires external linkage here, apparently :(
		72	rs_child_cb (ev::child &w, int revents)
		73	{
		74	w.stop ();
		75
		76	if (rs_queue.empty ())
		77	return;
		78
		79	pid_t pid = run_script (*rs_queue.front ().first, false);
		80	if (pid)
		81	{
		82	w.set (pid);
		83	w.start ();
		84	}
		85	else
		86	slog (L_WARN, rs_queue.front ().second);
		87
		88	delete rs_queue.front ().first;
		89	rs_queue.pop ();
		90	}
		91	};
		92
		93	// despite the fancy name, this is quite a hack
		94	static void
		95	run_script_queued (run_script_cb *cb, const char *warnmsg)
		96	{
		97	rs_queue.push (std::make_pair (cb, warnmsg));
		98
		99	if (!rs_child_ev.is_active ())
		100	{
		101	rs_child_ev.set<rs_child_cb> ();
		102	rs_child_ev ();
		103	}
		104	}
		105
		106	//////////////////////////////////////////////////////////////////////////////
45		107
46	struct crypto_ctx	108	struct crypto_ctx
47	{	109	{
48	EVP_CIPHER_CTX cctx;	110	EVP_CIPHER_CTX cctx;
49	HMAC_CTX hctx;	111	HMAC_CTX hctx;
…		…
53	};	115	};
54		116
55	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	117	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56	{	118	{
57	EVP_CIPHER_CTX_init (&cctx);	119	EVP_CIPHER_CTX_init (&cctx);
58	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	120	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59	HMAC_CTX_init (&hctx);	121	HMAC_CTX_init (&hctx);
60	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	122	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61	}	123	}
62		124
63	crypto_ctx::~crypto_ctx ()	125	crypto_ctx::~crypto_ctx ()
64	{	126	{
65	EVP_CIPHER_CTX_cleanup (&cctx);	127	require (EVP_CIPHER_CTX_cleanup (&cctx));
66	HMAC_CTX_cleanup (&hctx);	128	HMAC_CTX_cleanup (&hctx);
67	}	129	}
68		130
69	static void	131	static void
70	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	132	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71	{	133	{
72	EVP_MD_CTX ctx;	134	EVP_MD_CTX ctx;
73		135
74	EVP_MD_CTX_init (&ctx);	136	EVP_MD_CTX_init (&ctx);
75	EVP_DigestInit (&ctx, RSA_HASH);	137	require (EVP_DigestInit (&ctx, RSA_HASH));
76	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	138	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77	EVP_DigestUpdate(&ctx, &id, sizeof id);	139	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	140	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79	EVP_MD_CTX_cleanup (&ctx);	141	EVP_MD_CTX_cleanup (&ctx);
80	}	142	}
81		143
82	struct rsa_entry {	144	struct rsa_entry
		145	{
83	tstamp expire;	146	tstamp expire;
84	rsaid id;	147	rsaid id;
85	rsachallenge chg;	148	rsachallenge chg;
86	};	149	};
87		150
88	struct rsa_cache : list<rsa_entry>	151	struct rsa_cache : list<rsa_entry>
89	{	152	{
90	void cleaner_cb (time_watcher &w); time_watcher cleaner;	153	inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
91		154
92	bool find (const rsaid &id, rsachallenge &chg)	155	bool find (const rsaid &id, rsachallenge &chg)
93	{	156	{
94	for (iterator i = begin (); i != end (); ++i)	157	for (iterator i = begin (); i != end (); ++i)
95	{	158	{
96	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	159	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
97	{	160	{
98	memcpy (&chg, &i->chg, sizeof chg);	161	memcpy (&chg, &i->chg, sizeof chg);
99		162
100	erase (i);	163	erase (i);
101	return true;	164	return true;
102	}	165	}
103	}	166	}
104		167
105	if (cleaner.at < NOW)	168	if (!cleaner.is_active ())
106	cleaner.start (NOW + RSA_TTL);	169	cleaner.again ();
107		170
108	return false;	171	return false;
109	}	172	}
110		173
111	void gen (rsaid &id, rsachallenge &chg)	174	void gen (rsaid &id, rsachallenge &chg)
112	{	175	{
113	rsa_entry e;	176	rsa_entry e;
114		177
115	RAND_bytes ((unsigned char *)&id, sizeof id);	178	RAND_bytes ((unsigned char *)&id, sizeof id);
116	RAND_bytes ((unsigned char *)&chg, sizeof chg);	179	RAND_bytes ((unsigned char *)&chg, sizeof chg);
117		180
118	e.expire = NOW + RSA_TTL;	181	e.expire = ev_now () + RSA_TTL;
119	e.id = id;	182	e.id = id;
120	memcpy (&e.chg, &chg, sizeof chg);	183	memcpy (&e.chg, &chg, sizeof chg);
121		184
122	push_back (e);	185	push_back (e);
123		186
124	if (cleaner.at < NOW)	187	if (!cleaner.is_active ())
125	cleaner.start (NOW + RSA_TTL);	188	cleaner.again ();
126	}	189	}
127		190
128	rsa_cache ()	191	rsa_cache ()
129	: cleaner (this, &rsa_cache::cleaner_cb)	192	{
130	{ }	193	cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
		194	cleaner.set (RSA_TTL, RSA_TTL);
		195	}
131		196
132	} rsa_cache;	197	} rsa_cache;
133		198
134	void rsa_cache::cleaner_cb (time_watcher &w)	199	void
		200	rsa_cache::cleaner_cb (ev::timer &w, int revents)
135	{	201	{
136	if (empty ())	202	if (empty ())
137	w.at = TSTAMP_CANCEL;	203	w.stop ();
138	else	204	else
139	{	205	{
140	w.at = NOW + RSA_TTL;
141
142	for (iterator i = begin (); i != end (); )	206	for (iterator i = begin (); i != end (); )
143	if (i->expire <= NOW)	207	if (i->expire <= ev_now ())
144	i = erase (i);	208	i = erase (i);
145	else	209	else
146	++i;	210	++i;
147	}	211	}
148	}	212	}
149		213
150	//////////////////////////////////////////////////////////////////////////////	214	//////////////////////////////////////////////////////////////////////////////
151		215
152	void pkt_queue::put (tap_packet *p)	216	pkt_queue::pkt_queue (double max_ttl, int max_queue)
		217	: max_ttl (max_ttl), max_queue (max_queue)
153	{	218	{
154	if (queue[i])	219	queue = new pkt [max_queue];
155	{
156	delete queue[i];
157	j = (j + 1) % QUEUEDEPTH;
158	}
159		220
160	queue[i] = p;
161
162	i = (i + 1) % QUEUEDEPTH;
163	}
164
165	tap_packet *pkt_queue::get ()
166	{
167	tap_packet *p = queue[j];
168
169	if (p)
170	{
171	queue[j] = 0;
172	j = (j + 1) % QUEUEDEPTH;
173	}
174
175	return p;
176	}
177
178	pkt_queue::pkt_queue ()
179	{
180	memset (queue, 0, sizeof (queue));
181	i = 0;	221	i = 0;
182	j = 0;	222	j = 0;
		223
		224	expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
183	}	225	}
184		226
185	pkt_queue::~pkt_queue ()	227	pkt_queue::~pkt_queue ()
186	{	228	{
187	for (i = QUEUEDEPTH; --i > 0; )	229	while (net_packet *p = get ())
		230	delete p;
		231
188	delete queue[i];	232	delete [] queue;
189	}	233	}
190		234
		235	void
		236	pkt_queue::expire_cb (ev::timer &w, int revents)
		237	{
		238	ev_tstamp expire = ev_now () - max_ttl;
		239
		240	for (;;)
		241	{
		242	if (empty ())
		243	break;
		244
		245	double diff = queue[j].tstamp - expire;
		246
		247	if (diff >= 0.)
		248	{
		249	w.start (diff > 0.5 ? diff : 0.5);
		250	break;
		251	}
		252
		253	delete get ();
		254	}
		255	}
		256
		257	void
		258	pkt_queue::put (net_packet *p)
		259	{
		260	ev_tstamp now = ev_now ();
		261
		262	// start expiry timer
		263	if (empty ())
		264	expire.start (max_ttl);
		265
		266	int ni = i + 1 == max_queue ? 0 : i + 1;
		267
		268	if (ni == j)
		269	delete get ();
		270
		271	queue[i].pkt = p;
		272	queue[i].tstamp = now;
		273
		274	i = ni;
		275	}
		276
		277	net_packet *
		278	pkt_queue::get ()
		279	{
		280	if (empty ())
		281	return 0;
		282
		283	net_packet *p = queue[j].pkt;
		284	queue[j].pkt = 0;
		285
		286	j = j + 1 == max_queue ? 0 : j + 1;
		287
		288	return p;
		289	}
		290
191	struct net_rateinfo {	291	struct net_rateinfo
		292	{
192	u32 host;	293	u32 host;
193	double pcnt, diff;	294	double pcnt, diff;
194	tstamp last;	295	tstamp last;
195	};	296	};
196		297
197	// only do action once every x seconds per host whole allowing bursts.	298	// only do action once every x seconds per host whole allowing bursts.
198	// this implementation ("splay list" ;) is inefficient,	299	// this implementation ("splay list" ;) is inefficient,
199	// but low on resources.	300	// but low on resources.
200	struct net_rate_limiter : list<net_rateinfo>	301	struct net_rate_limiter : list<net_rateinfo>
201	{	302	{
202	static const double ALPHA = 1. - 1. / 90.; // allow bursts	303	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203	static const double CUTOFF = 20.; // one event every CUTOFF seconds	304	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	305	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
		306	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
205		307
206	bool can (const sockinfo &si) { return can((u32)si.host); }	308	bool can (const sockinfo &si) { return can((u32)si.host); }
207	bool can (u32 host);	309	bool can (u32 host);
208	};	310	};
209		311
210	net_rate_limiter auth_rate_limiter, reset_rate_limiter;	312	static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211		313
		314	bool
212	bool net_rate_limiter::can (u32 host)	315	net_rate_limiter::can (u32 host)
213	{	316	{
214	iterator i;	317	iterator i;
215		318
216	for (i = begin (); i != end (); )	319	for (i = begin (); i != end (); )
217	if (i->host == host)	320	if (i->host == host)
218	break;	321	break;
219	else if (i->last < NOW - EXPIRE)	322	else if (i->last < ev_now () - NRL_EXPIRE)
220	i = erase (i);	323	i = erase (i);
221	else	324	else
222	i++;	325	i++;
223		326
224	if (i == end ())	327	if (i == end ())
225	{	328	{
226	net_rateinfo ri;	329	net_rateinfo ri;
227		330
228	ri.host = host;	331	ri.host = host;
229	ri.pcnt = 1.;	332	ri.pcnt = 1.;
230	ri.diff = CUTOFF * (1. / (1. - ALPHA));	333	ri.diff = NRL_MAXDIF;
231	ri.last = NOW;	334	ri.last = ev_now ();
232		335
233	push_front (ri);	336	push_front (ri);
234		337
235	return true;	338	return true;
236	}	339	}
237	else	340	else
238	{	341	{
239	net_rateinfo ri (*i);	342	net_rateinfo ri (*i);
240	erase (i);	343	erase (i);
241		344
242	ri.pcnt = ri.pcnt * ALPHA;	345	ri.pcnt = ri.pcnt * NRL_ALPHA;
243	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	346	ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
244		347
245	ri.last = NOW;	348	ri.last = ev_now ();
246		349
		350	double dif = ri.diff / ri.pcnt;
		351
247	bool send = ri.diff / ri.pcnt > CUTOFF;	352	bool send = dif > NRL_CUTOFF;
248		353
		354	if (dif > NRL_MAXDIF)
		355	{
		356	ri.pcnt = 1.;
		357	ri.diff = NRL_MAXDIF;
		358	}
249	if (send)	359	else if (send)
250	ri.pcnt++;	360	ri.pcnt++;
251		361
252	push_front (ri);	362	push_front (ri);
253		363
254	return send;	364	return send;
…		…
257		367
258	/////////////////////////////////////////////////////////////////////////////	368	/////////////////////////////////////////////////////////////////////////////
259		369
260	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];	370	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
261		371
		372	void
262	void hmac_packet::hmac_gen (crypto_ctx *ctx)	373	hmac_packet::hmac_gen (crypto_ctx *ctx)
263	{	374	{
264	unsigned int xlen;	375	unsigned int xlen;
265		376
266	HMAC_CTX *hctx = &ctx->hctx;	377	HMAC_CTX *hctx = &ctx->hctx;
267		378
…		…
285	hmac_gen (ctx);	396	hmac_gen (ctx);
286		397
287	return !memcmp (hmac, hmac_digest, HMACLENGTH);	398	return !memcmp (hmac, hmac_digest, HMACLENGTH);
288	}	399	}
289		400
		401	void
290	void vpn_packet::set_hdr (ptype type, unsigned int dst)	402	vpn_packet::set_hdr (ptype type_, unsigned int dst)
291	{	403	{
292	this->type = type;	404	type = type_;
293		405
294	int src = THISNODE->id;	406	int src = THISNODE->id;
295		407
296	src1 = src;	408	src1 = src;
297	srcdst = ((src >> 8) << 4) | (dst >> 8);	409	srcdst = ((src >> 8) << 4) | (dst >> 8);
…		…
299	}	411	}
300		412
301	#define MAXVPNDATA (MAX_MTU - 6 - 6)	413	#define MAXVPNDATA (MAX_MTU - 6 - 6)
302	#define DATAHDR (sizeof (u32) + RAND_SIZE)	414	#define DATAHDR (sizeof (u32) + RAND_SIZE)
303		415
304	struct vpndata_packet:vpn_packet	416	struct vpndata_packet : vpn_packet
		417	{
		418	u8 data[MAXVPNDATA + DATAHDR]; // seqno
		419
		420	void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
		421	tap_packet *unpack (connection *conn, u32 &seqno);
		422
		423	private:
		424	const u32 data_hdr_size () const
305	{	425	{
306	u8 data[MAXVPNDATA + DATAHDR]; // seqno
307
308	void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
309	tap_packet *unpack (connection *conn, u32 &seqno);
310	private:
311
312	const u32 data_hdr_size () const
313	{
314	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;	426	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
315	}
316	};	427	}
		428	};
317		429
318	void	430	void
319	vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)	431	vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
320	{	432	{
321	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;	433	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
322	int outl = 0, outl2;	434	int outl = 0, outl2;
323	ptype type = PT_DATA_UNCOMPRESSED;	435	ptype type = PT_DATA_UNCOMPRESSED;
324		436
325	#if ENABLE_COMPRESSION	437	#if ENABLE_COMPRESSION
326	u8 cdata[MAX_MTU];	438	u8 cdata[MAX_MTU];
327	u32 cl;
328		439
		440	if (conn->features & FEATURE_COMPRESSION)
		441	{
329	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	442	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		443
330	if (cl)	444	if (cl)
331	{	445	{
332	type = PT_DATA_COMPRESSED;	446	type = PT_DATA_COMPRESSED;
333	d = cdata;	447	d = cdata;
334	l = cl + 2;	448	l = cl + 2;
335		449
336	d[0] = cl >> 8;	450	d[0] = cl >> 8;
337	d[1] = cl;	451	d[1] = cl;
		452	}
338	}	453	}
339	#endif	454	#endif
340		455
341	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	456	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342		457
343	struct {	458	struct {
344	#if RAND_SIZE	459	#if RAND_SIZE
345	u8 rnd[RAND_SIZE];	460	u8 rnd[RAND_SIZE];
346	#endif	461	#endif
…		…
350	datahdr.seqno = ntohl (seqno);	465	datahdr.seqno = ntohl (seqno);
351	#if RAND_SIZE	466	#if RAND_SIZE
352	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	467	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353	#endif	468	#endif
354		469
355	EVP_EncryptUpdate (cctx,	470	require (EVP_EncryptUpdate (cctx,
356	(unsigned char *) data + outl, &outl2,	471	(unsigned char *) data + outl, &outl2,
357	(unsigned char *) &datahdr, DATAHDR);	472	(unsigned char *) &datahdr, DATAHDR));
358	outl += outl2;	473	outl += outl2;
359		474
360	EVP_EncryptUpdate (cctx,	475	require (EVP_EncryptUpdate (cctx,
361	(unsigned char *) data + outl, &outl2,	476	(unsigned char *) data + outl, &outl2,
362	(unsigned char *) d, l);	477	(unsigned char *) d, l));
363	outl += outl2;	478	outl += outl2;
364		479
365	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	480	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366	outl += outl2;	481	outl += outl2;
367		482
368	len = outl + data_hdr_size ();	483	len = outl + data_hdr_size ();
369		484
370	set_hdr (type, dst);	485	set_hdr (type, dst);
…		…
379	int outl = 0, outl2;	494	int outl = 0, outl2;
380	tap_packet *p = new tap_packet;	495	tap_packet *p = new tap_packet;
381	u8 *d;	496	u8 *d;
382	u32 l = len - data_hdr_size ();	497	u32 l = len - data_hdr_size ();
383		498
384	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	499	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385		500
386	#if ENABLE_COMPRESSION	501	#if ENABLE_COMPRESSION
387	u8 cdata[MAX_MTU];	502	u8 cdata[MAX_MTU];
388		503
389	if (type == PT_DATA_COMPRESSED)	504	if (type == PT_DATA_COMPRESSED)
…		…
391	else	506	else
392	#endif	507	#endif
393	d = &(*p)[6 + 6 - DATAHDR];	508	d = &(*p)[6 + 6 - DATAHDR];
394		509
395	/* this overwrites part of the src mac, but we fix that later */	510	/* this overwrites part of the src mac, but we fix that later */
396	EVP_DecryptUpdate (cctx,	511	require (EVP_DecryptUpdate (cctx,
397	d, &outl2,	512	d, &outl2,
398	(unsigned char *)&data, len - data_hdr_size ());	513	(unsigned char *)&data, len - data_hdr_size ()));
399	outl += outl2;	514	outl += outl2;
400		515
401	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	516	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402	outl += outl2;	517	outl += outl2;
403		518
404	seqno = ntohl (*(u32 *)(d + RAND_SIZE));	519	seqno = ntohl (*(u32 *)(d + RAND_SIZE));
405		520
406	id2mac (dst () ? dst() : THISNODE->id, p->dst);	521	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
435	{	550	{
436	// actually, hmaclen cannot be checked because the hmac	551	// actually, hmaclen cannot be checked because the hmac
437	// field comes before this data, so peers with other	552	// field comes before this data, so peers with other
438	// hmacs simply will not work.	553	// hmacs simply will not work.
439	u8 prot_major, prot_minor, randsize, hmaclen;	554	u8 prot_major, prot_minor, randsize, hmaclen;
440	u8 flags, challengelen, pad2, pad3;	555	u8 flags, challengelen, features, pad3;
441	u32 cipher_nid, digest_nid, hmac_nid;	556	u32 cipher_nid, digest_nid, hmac_nid;
442
443	const u8 curflags () const
444	{
445	return 0x80
446	| (ENABLE_COMPRESSION ? 0x01 : 0x00);
447	}
448		557
449	void setup (ptype type, int dst);	558	void setup (ptype type, int dst);
450	bool chk_config () const;	559	bool chk_config () const;
		560
		561	static u8 get_features ()
		562	{
		563	u8 f = 0;
		564	#if ENABLE_COMPRESSION
		565	f |= FEATURE_COMPRESSION;
		566	#endif
		567	#if ENABLE_ROHC
		568	f |= FEATURE_ROHC;
		569	#endif
		570	#if ENABLE_BRIDGING
		571	f |= FEATURE_BRIDGING;
		572	#endif
		573	return f;
		574	}
451	};	575	};
452		576
		577	void
453	void config_packet::setup (ptype type, int dst)	578	config_packet::setup (ptype type, int dst)
454	{	579	{
455	prot_major = PROTOCOL_MAJOR;	580	prot_major = PROTOCOL_MAJOR;
456	prot_minor = PROTOCOL_MINOR;	581	prot_minor = PROTOCOL_MINOR;
457	randsize = RAND_SIZE;	582	randsize = RAND_SIZE;
458	hmaclen = HMACLENGTH;	583	hmaclen = HMACLENGTH;
459	flags = curflags ();	584	flags = 0;
460	challengelen = sizeof (rsachallenge);	585	challengelen = sizeof (rsachallenge);
		586	features = get_features ();
461		587
462	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	588	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463	digest_nid = htonl (EVP_MD_type (RSA_HASH));	589	digest_nid = htonl (EVP_MD_type (RSA_HASH));
464	hmac_nid = htonl (EVP_MD_type (DIGEST));	590	hmac_nid = htonl (EVP_MD_type (DIGEST));
465		591
466	len = sizeof (*this) - sizeof (net_packet);	592	len = sizeof (*this) - sizeof (net_packet);
467	set_hdr (type, dst);	593	set_hdr (type, dst);
468	}	594	}
469		595
		596	bool
470	bool config_packet::chk_config () const	597	config_packet::chk_config () const
471	{	598	{
472	return prot_major == PROTOCOL_MAJOR	599	if (prot_major != PROTOCOL_MAJOR)
473	&& randsize == RAND_SIZE	600	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474	&& hmaclen == HMACLENGTH	601	else if (randsize != RAND_SIZE)
475	&& flags == curflags ()	602	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
		603	else if (hmaclen != HMACLENGTH)
		604	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
476	&& challengelen == sizeof (rsachallenge)	605	else if (challengelen != sizeof (rsachallenge))
		606	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477	&& cipher_nid == htonl (EVP_CIPHER_nid (CIPHER))	607	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
		608	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
478	&& digest_nid == htonl (EVP_MD_type (RSA_HASH))	609	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
		610	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
479	&& hmac_nid == htonl (EVP_MD_type (DIGEST));	611	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
		612	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
		613	else
		614	return true;
		615
		616	return false;
480	}	617	}
481		618
482	struct auth_req_packet : config_packet	619	struct auth_req_packet : config_packet
483	{	620	{
484	char magic[8];	621	char magic[8];
485	u8 initiate; // false if this is just an automatic reply	622	u8 initiate; // false if this is just an automatic reply
486	u8 protocols; // supported protocols (will get patches on forward)	623	u8 protocols; // supported protocols (will be patched on forward)
487	u8 pad2, pad3;	624	u8 pad2, pad3;
488	rsaid id;	625	rsaid id;
489	rsaencrdata encr;	626	rsaencrdata encr;
490		627
491	auth_req_packet (int dst, bool initiate_, u8 protocols_)	628	auth_req_packet (int dst, bool initiate_, u8 protocols_)
492	{	629	{
493	config_packet::setup (PT_AUTH_REQ, dst);	630	config_packet::setup (PT_AUTH_REQ, dst);
494	strncpy (magic, MAGIC, 8);	631	strncpy (magic, MAGIC_OLD, 8);
495	initiate = !!initiate_;	632	initiate = !!initiate_;
496	protocols = protocols_;	633	protocols = protocols_;
497		634
498	len = sizeof (*this) - sizeof (net_packet);	635	len = sizeof (*this) - sizeof (net_packet);
499	}	636	}
…		…
546	};	683	};
547		684
548	/////////////////////////////////////////////////////////////////////////////	685	/////////////////////////////////////////////////////////////////////////////
549		686
550	void	687	void
		688	connection::connection_established ()
		689	{
		690	slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
		691
		692	if (ictx && octx)
		693	{
		694	// make sure rekeying timeouts are slightly asymmetric
		695	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
		696	rekey.start (rekey_interval, rekey_interval);
		697	keepalive.start (::conf.keepalive);
		698
		699	// send queued packets
		700	if (ictx && octx)
		701	{
		702	while (tap_packet *p = (tap_packet *)data_queue.get ())
		703	{
		704	if (p->len) send_data_packet (p);
		705	delete p;
		706	}
		707
		708	while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
		709	{
		710	if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
		711	delete p;
		712	}
		713	}
		714
		715	vpn->connection_established (this);
		716	}
		717	else
		718	{
		719	retry_cnt = 0;
		720	establish_connection.start (5);
		721	keepalive.stop ();
		722	rekey.stop ();
		723	}
		724	}
		725
		726	void
551	connection::reset_dstaddr ()	727	connection::reset_si ()
552	{	728	{
		729	if (vpn->can_direct (THISNODE, conf))
		730	protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
		731	else
		732	{
		733	slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
		734	protocol = 0;
		735	}
		736
553	si.set (conf);	737	si.set (conf, protocol);
		738
		739	is_direct = si.valid ();
		740	}
		741
		742	// ensure sockinfo is valid, forward if necessary
		743	const sockinfo &
		744	connection::forward_si (const sockinfo &si) const
		745	{
		746	if (!si.valid ())
		747	{
		748	connection *r = vpn->find_router_for (this);
		749
		750	if (r)
		751	{
		752	slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
		753	conf->nodename, r->conf->nodename);
		754	return r->si;
		755	}
		756	else
		757	slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
		758	conf->nodename);
		759	}
		760
		761	return si;
		762	}
		763
		764	void
		765	connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		766	{
		767	if (!vpn->send_vpn_packet (pkt, si, tos))
		768	reset_connection ();
554	}	769	}
555		770
556	void	771	void
557	connection::send_ping (const sockinfo &si, u8 pong)	772	connection::send_ping (const sockinfo &si, u8 pong)
558	{	773	{
559	ping_packet *pkt = new ping_packet;	774	ping_packet *pkt = new ping_packet;
560		775
561	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);	776	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
		777
		778	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
		779
562	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	780	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
563		781
564	delete pkt;	782	delete pkt;
565	}	783	}
566		784
…		…
581	void	799	void
582	connection::send_auth_request (const sockinfo &si, bool initiate)	800	connection::send_auth_request (const sockinfo &si, bool initiate)
583	{	801	{
584	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	802	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
585		803
586	protocol = best_protocol (THISNODE->protocols & conf->protocols);
587
588	// mask out protocols we cannot establish
589	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
590	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
591
592	if (protocol)
593	{
594	rsachallenge chg;	804	rsachallenge chg;
595
596	rsa_cache.gen (pkt->id, chg);	805	rsa_cache.gen (pkt->id, chg);
		806	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
597		807
598	if (0 > RSA_public_encrypt (sizeof chg,
599	(unsigned char *)&chg, (unsigned char *)&pkt->encr,
600	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
601	fatal ("RSA_public_encrypt error");
602
603	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	808	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
604		809
605	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	810	send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
606		811
607	delete pkt;	812	delete pkt;
608	}
609	else
610	; // silently fail
611	}	813	}
612		814
613	void	815	void
614	connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)	816	connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
615	{	817	{
…		…
619		821
620	rsa_hash (id, chg, pkt->response);	822	rsa_hash (id, chg, pkt->response);
621		823
622	pkt->hmac_set (octx);	824	pkt->hmac_set (octx);
623		825
624	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);	826	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
625		827
626	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	828	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
627		829
628	delete pkt;	830	delete pkt;
629	}	831	}
630		832
631	void	833	void
632	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	834	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
633	{	835	{
634	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	836	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
635	conf->id, rid, (const char *)rsi);	837	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
636		838
637	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	839	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
638		840
639	r->hmac_set (octx);	841	r->hmac_set (octx);
640	send_vpn_packet (r, si);	842	send_vpn_packet (r, si);
641		843
642	delete r;	844	delete r;
643	}	845	}
644		846
645	void	847	inline void
646	connection::establish_connection_cb (time_watcher &w)	848	connection::establish_connection_cb (ev::timer &w, int revents)
647	{	849	{
648	if (ictx || conf == THISNODE	850	if (!(ictx && octx)
		851	&& conf != THISNODE
649	|| connectmode == conf_node::C_NEVER	852	&& connectmode != conf_node::C_NEVER
650	|| connectmode == conf_node::C_DISABLED)	853	&& connectmode != conf_node::C_DISABLED
651	w.at = TSTAMP_CANCEL;	854	&& !w.is_active ())
652	else if (w.at <= NOW)
653	{	855	{
654	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	856	// a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
655		857	// and stop trying. should probably be handled by a per-connection expire handler.
656	if (retry_int < 3600 * 8)	858	if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
657	retry_cnt++;
658
659	w.at = NOW + retry_int;
660
661	if (conf->hostname)
662	{	859	{
663	reset_dstaddr ();	860	reset_connection ();
664	if (si.host && auth_rate_limiter.can (si))	861	return;
665	{
666	if (retry_cnt < 4)
667	send_auth_request (si, true);
668	else
669	send_ping (si, 0);
670	}	862	}
		863
		864	last_establish_attempt = ev_now ();
		865
		866	ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
		867	? (retry_cnt & 3) + 1
		868	: 1 << (retry_cnt >> 2));
		869
		870	reset_si ();
		871
		872	bool slow = si.prot & PROT_SLOW;
		873
		874	if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
		875	{
		876	/*TODO*/ /* start the timer so we don't recurse endlessly */
		877	w.start (1);
		878	vpn->send_connect_request (this);
671	}	879	}
672	else	880	else
673	vpn->connect_request (conf->id);	881	{
		882	if (si.valid ())
		883	slog (L_DEBUG, _("%s: sending direct connection request to %s."),
		884	conf->nodename, (const char *)si);
		885
		886	const sockinfo &dsi = forward_si (si);
		887
		888	slow = slow || (dsi.prot & PROT_SLOW);
		889
		890	if (dsi.valid () && auth_rate_limiter.can (dsi))
		891	{
		892	if (retry_cnt < 4)
		893	send_auth_request (dsi, true);
		894	else
		895	send_ping (dsi, 0);
		896	}
		897	}
		898
		899	retry_int *= slow ? 8. : 0.9;
		900
		901	if (retry_int < conf->max_retry)
		902	retry_cnt++;
		903	else
		904	retry_int = conf->max_retry;
		905
		906	w.start (retry_int);
674	}	907	}
675	}	908	}
676		909
677	void	910	void
678	connection::reset_connection ()	911	connection::reset_connection ()
…		…
681	{	914	{
682	slog (L_INFO, _("%s(%s): connection lost"),	915	slog (L_INFO, _("%s(%s): connection lost"),
683	conf->nodename, (const char *)si);	916	conf->nodename, (const char *)si);
684		917
685	if (::conf.script_node_down)	918	if (::conf.script_node_down)
686	run_script (run_script_cb (this, &connection::script_node_down), false);	919	{
		920	run_script_cb *cb = new run_script_cb;
		921	cb->set<connection, &connection::script_node_down> (this);
		922	run_script_queued (cb, _("node-down command execution failed, continuing."));
		923	}
687	}	924	}
688		925
689	delete ictx; ictx = 0;	926	delete ictx; ictx = 0;
690	delete octx; octx = 0;	927	delete octx; octx = 0;
		928	#if ENABLE_DNS
		929	dnsv4_reset_connection ();
		930	#endif
691		931
692	si.host= 0;	932	si.host = 0;
693		933
694	last_activity = 0;	934	last_activity = 0.;
		935	//last_si_change = 0.;
695	retry_cnt = 0;	936	retry_cnt = 0;
696		937
697	rekey.reset ();	938	rekey.stop ();
698	keepalive.reset ();	939	keepalive.stop ();
699	establish_connection.reset ();	940	establish_connection.stop ();
700	}	941	}
701		942
702	void	943	void
703	connection::shutdown ()	944	connection::shutdown ()
704	{	945	{
…		…
706	send_reset (si);	947	send_reset (si);
707		948
708	reset_connection ();	949	reset_connection ();
709	}	950	}
710		951
711	void	952	// poor-man's rekeying
712	connection::rekey_cb (time_watcher &w)	953	inline void
		954	connection::rekey_cb (ev::timer &w, int revents)
713	{	955	{
714	w.at = TSTAMP_CANCEL;
715
716	reset_connection ();	956	reset_connection ();
717	establish_connection ();	957	establish_connection ();
718	}	958	}
719		959
720	void	960	void
721	connection::send_data_packet (tap_packet *pkt, bool broadcast)	961	connection::send_data_packet (tap_packet *pkt)
722	{	962	{
723	vpndata_packet *p = new vpndata_packet;	963	vpndata_packet *p = new vpndata_packet;
724	int tos = 0;	964	int tos = 0;
725		965
726	if (conf->inherit_tos	966	// I am not hilarious about peeking into packets, but so be it.
727	&& (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP	967	if (conf->inherit_tos && pkt->is_ipv4 ())
728	&& ((*pkt)[14] & 0xf0) == 0x40) // IPv4
729	tos = (*pkt)[15] & IPTOS_TOS_MASK;	968	tos = (*pkt)[15] & IPTOS_TOS_MASK;
730		969
731	p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs	970	p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
732	send_vpn_packet (p, si, tos);	971	send_vpn_packet (p, si, tos);
733		972
734	delete p;	973	delete p;
735		974
736	if (oseqno > MAX_SEQNO)	975	if (oseqno > MAX_SEQNO)
737	rekey ();	976	rekey ();
738	}	977	}
739		978
740	void	979	void
		980	connection::post_inject_queue ()
		981	{
		982	// force a connection every now and when when packets are sent (max 1/s)
		983	if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
		984	establish_connection.stop ();
		985
		986	establish_connection ();
		987	}
		988
		989	void
741	connection::inject_data_packet (tap_packet *pkt, bool broadcast)	990	connection::inject_data_packet (tap_packet *pkt)
742	{	991	{
743	if (ictx && octx)	992	if (ictx && octx)
744	send_data_packet (pkt, broadcast);	993	send_data_packet (pkt);
745	else	994	else
746	{	995	{
747	if (!broadcast)//DDDD
748	queue.put (new tap_packet (*pkt));	996	data_queue.put (new tap_packet (*pkt));
		997	post_inject_queue ();
		998	}
		999	}
749		1000
750	establish_connection ();	1001	void
		1002	connection::inject_vpn_packet (vpn_packet *pkt, int tos)
		1003	{
		1004	if (ictx && octx)
		1005	send_vpn_packet (pkt, si, tos);
		1006	else
		1007	{
		1008	vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
		1009	post_inject_queue ();
751	}	1010	}
752	}	1011	}
753		1012
754	void	1013	void
755	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	1014	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
756	{	1015	{
757	last_activity = NOW;	1016	last_activity = ev_now ();
758		1017
759	slog (L_NOISE, "<<%d received packet type %d from %d to %d",	1018	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
760	conf->id, pkt->typ (), pkt->src (), pkt->dst ());	1019	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
		1020
		1021	if (connectmode == conf_node::C_DISABLED)
		1022	return;
761		1023
762	switch (pkt->typ ())	1024	switch (pkt->typ ())
763	{	1025	{
764	case vpn_packet::PT_PING:	1026	case vpn_packet::PT_PING:
		1027	slog (L_TRACE, "%s >> PT_PING", conf->nodename);
		1028
765	// we send pings instead of auth packets after some retries,	1029	// we send pings instead of auth packets after some retries,
766	// so reset the retry counter and establish a connection	1030	// so reset the retry counter and establish a connection
767	// when we receive a ping.	1031	// when we receive a ping.
768	if (!ictx)	1032	if (!ictx)
769	{	1033	{
770	if (auth_rate_limiter.can (rsi))	1034	if (auth_rate_limiter.can (rsi))
771	send_auth_request (rsi, true);	1035	send_auth_request (rsi, true);
772	}	1036	}
773	else	1037	else
		1038	// we would love to change the socket address here, but ping's aren't
		1039	// authenticated, so we best ignore it.
774	send_ping (rsi, 1); // pong	1040	send_ping (rsi, 1); // pong
775		1041
776	break;	1042	break;
777		1043
778	case vpn_packet::PT_PONG:	1044	case vpn_packet::PT_PONG:
		1045	slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
		1046
		1047	// a PONG might mean that the other side doesn't really know
		1048	// about our desire for communication.
		1049	establish_connection ();
779	break;	1050	break;
780		1051
781	case vpn_packet::PT_RESET:	1052	case vpn_packet::PT_RESET:
782	{	1053	{
783	reset_connection ();	1054	reset_connection ();
784		1055
785	config_packet *p = (config_packet *) pkt;	1056	config_packet *p = (config_packet *) pkt;
786		1057
787	if (!p->chk_config ())	1058	if (!p->chk_config ())
788	{	1059	{
789	slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),	1060	slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
790	conf->nodename, (const char *)rsi);	1061	conf->nodename, (const char *)rsi);
791	connectmode = conf_node::C_DISABLED;	1062	connectmode = conf_node::C_DISABLED;
792	}	1063	}
793	else if (connectmode == conf_node::C_ALWAYS)	1064	else if (connectmode == conf_node::C_ALWAYS)
794	establish_connection ();	1065	establish_connection ();
…		…
798	case vpn_packet::PT_AUTH_REQ:	1069	case vpn_packet::PT_AUTH_REQ:
799	if (auth_rate_limiter.can (rsi))	1070	if (auth_rate_limiter.can (rsi))
800	{	1071	{
801	auth_req_packet *p = (auth_req_packet *) pkt;	1072	auth_req_packet *p = (auth_req_packet *) pkt;
802		1073
803	slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);	1074	slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
804		1075
805	if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))	1076	if (p->chk_config ()
		1077	&& (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
806	{	1078	{
807	if (p->prot_minor != PROTOCOL_MINOR)	1079	if (p->prot_minor != PROTOCOL_MINOR)
808	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),	1080	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
809	conf->nodename, (const char *)rsi,	1081	conf->nodename, (const char *)rsi,
810	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1082	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
…		…
812	if (p->initiate)	1084	if (p->initiate)
813	send_auth_request (rsi, false);	1085	send_auth_request (rsi, false);
814		1086
815	rsachallenge k;	1087	rsachallenge k;
816		1088
817	if (0 > RSA_private_decrypt (sizeof (p->encr),	1089	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
818	(unsigned char *)&p->encr, (unsigned char *)&k,	1090	{
819	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
820	slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),	1091	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
821	conf->nodename, (const char *)rsi);	1092	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		1093	break;
		1094	}
822	else	1095	else
823	{	1096	{
824	retry_cnt = 0;
825	establish_connection.set (NOW + 8); //? ;)
826	keepalive.reset ();
827	rekey.reset ();
828
829	delete ictx;
830	ictx = 0;
831
832	delete octx;	1097	delete octx;
833		1098
834	octx = new crypto_ctx (k, 1);	1099	octx = new crypto_ctx (k, 1);
835	oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;	1100	oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
836		1101
837	conf->protocols = p->protocols;	1102	conf->protocols = p->protocols;
		1103	features = p->features & config_packet::get_features ();
		1104
838	send_auth_response (rsi, p->id, k);	1105	send_auth_response (rsi, p->id, k);
		1106
		1107	connection_established ();
839		1108
840	break;	1109	break;
841	}	1110	}
842	}	1111	}
		1112	else
		1113	slog (L_WARN, _("%s(%s): protocol mismatch."),
		1114	conf->nodename, (const char *)rsi);
843		1115
844	send_reset (rsi);	1116	send_reset (rsi);
845	}	1117	}
846		1118
847	break;	1119	break;
848		1120
849	case vpn_packet::PT_AUTH_RES:	1121	case vpn_packet::PT_AUTH_RES:
850	{	1122	{
851	auth_res_packet *p = (auth_res_packet *) pkt;	1123	auth_res_packet *p = (auth_res_packet *)pkt;
852		1124
853	slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);	1125	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
854		1126
855	if (p->chk_config ())	1127	if (p->chk_config ())
856	{	1128	{
857	if (p->prot_minor != PROTOCOL_MINOR)	1129	if (p->prot_minor != PROTOCOL_MINOR)
858	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),	1130	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
…		…
860	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1132	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
861		1133
862	rsachallenge chg;	1134	rsachallenge chg;
863		1135
864	if (!rsa_cache.find (p->id, chg))	1136	if (!rsa_cache.find (p->id, chg))
		1137	{
865	slog (L_ERR, _("%s(%s): unrequested auth response"),	1138	slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
866	conf->nodename, (const char *)rsi);	1139	conf->nodename, (const char *)rsi);
		1140	break;
		1141	}
867	else	1142	else
868	{	1143	{
869	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1144	crypto_ctx *cctx = new crypto_ctx (chg, 0);
870		1145
871	if (!p->hmac_chk (cctx))	1146	if (!p->hmac_chk (cctx))
		1147	{
872	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1148	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
873	"could be an attack, or just corruption or an synchronization error"),	1149	"could be an attack, or just corruption or a synchronization error."),
874	conf->nodename, (const char *)rsi);	1150	conf->nodename, (const char *)rsi);
		1151	break;
		1152	}
875	else	1153	else
876	{	1154	{
877	rsaresponse h;	1155	rsaresponse h;
878		1156
879	rsa_hash (p->id, chg, h);	1157	rsa_hash (p->id, chg, h);
…		…
885	delete ictx; ictx = cctx;	1163	delete ictx; ictx = cctx;
886		1164
887	iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid	1165	iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
888		1166
889	si = rsi;	1167	si = rsi;
		1168	protocol = rsi.prot;
890		1169
891	rekey.set (NOW + ::conf.rekey);	1170	slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
892	keepalive.set (NOW + ::conf.keepalive);	1171	conf->nodename, (const char *)rsi,
		1172	is_direct ? "direct" : "forwarded",
		1173	p->prot_major, p->prot_minor);
893		1174
894	// send queued packets	1175	connection_established ();
895	while (tap_packet *p = queue.get ())	1176
		1177	if (::conf.script_node_up)
896	{	1178	{
897	send_data_packet (p);	1179	run_script_cb *cb = new run_script_cb;
898	delete p;	1180	cb->set<connection, &connection::script_node_up> (this);
		1181	run_script_queued (cb, _("node-up command execution failed, continuing."));
899	}	1182	}
900
901	connectmode = conf->connectmode;
902
903	slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"),
904	conf->nodename, (const char *)rsi,
905	strprotocol (protocol),
906	p->prot_major, p->prot_minor);
907
908	if (::conf.script_node_up)
909	run_script (run_script_cb (this, &connection::script_node_up), false);
910		1183
911	break;	1184	break;
912	}	1185	}
913	else	1186	else
914	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1187	slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
915	conf->nodename, (const char *)rsi);	1188	conf->nodename, (const char *)rsi);
916	}	1189	}
917		1190
918	delete cctx;	1191	delete cctx;
919	}	1192	}
…		…
933		1206
934	if (ictx && octx)	1207	if (ictx && octx)
935	{	1208	{
936	vpndata_packet *p = (vpndata_packet *)pkt;	1209	vpndata_packet *p = (vpndata_packet *)pkt;
937		1210
938	if (rsi == si)	1211	if (!p->hmac_chk (ictx))
		1212	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
		1213	"could be an attack, or just corruption or a synchronization error."),
		1214	conf->nodename, (const char *)rsi);
		1215	else
939	{	1216	{
940	if (!p->hmac_chk (ictx))
941	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
942	"could be an attack, or just corruption or an synchronization error"),
943	conf->nodename, (const char *)rsi);
944	else	1217	u32 seqno;
		1218	tap_packet *d = p->unpack (this, seqno);
		1219	int seqclass = iseqno.seqno_classify (seqno);
		1220
		1221	if (seqclass == 0) // ok
945	{	1222	{
946	u32 seqno;	1223	vpn->tap->send (d);
947	tap_packet *d = p->unpack (this, seqno);
948		1224
949	if (iseqno.recv_ok (seqno))	1225	if (si != rsi)
950	{	1226	{
951	vpn->tap->send (d);	1227	// fast re-sync on source address changes, useful especially for tcp/ip
		1228	//if (last_si_change < ev_now () + 5.)
		1229	// {
		1230	slog (L_INFO, _("%s(%s): changing socket address to %s."),
		1231	conf->nodename, (const char *)si, (const char *)rsi);
952		1232
953	if (p->dst () == 0) // re-broadcast	1233	si = rsi;
954	for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)	1234
		1235	if (::conf.script_node_change)
955	{	1236	{
956	connection *c = *i;	1237	run_script_cb *cb = new run_script_cb;
957		1238	cb->set<connection, &connection::script_node_change> (this);
958	if (c->conf != THISNODE && c->conf != conf)	1239	run_script_queued (cb, _("node-change command execution failed, continuing."));
959	c->inject_data_packet (d);
960	}	1240	}
961		1241
		1242	// }
962	delete d;	1243	//else
963		1244	// slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
964	break;	1245	// conf->nodename, (const char *)si, (const char *)rsi);
965	}	1246	}
966	}	1247	}
		1248	else if (seqclass == 1) // far history
		1249	slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
		1250	"possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
		1251	else if (seqclass == 2) // in-window duplicate, happens often on wireless
		1252	slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
		1253	"possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
		1254	else if (seqclass == 3) // reset
		1255	{
		1256	slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
		1257	"probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
		1258	send_reset (rsi);
		1259	}
		1260
		1261	delete d;
		1262	break;
967	}	1263	}
968	else
969	slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
970	}	1264	}
971		1265
972	send_reset (rsi);	1266	send_reset (rsi);
973	break;	1267	break;
974		1268
975	case vpn_packet::PT_CONNECT_REQ:	1269	case vpn_packet::PT_CONNECT_REQ:
976	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1270	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
977	{	1271	{
978	connect_req_packet *p = (connect_req_packet *) pkt;	1272	connect_req_packet *p = (connect_req_packet *)pkt;
979		1273
980	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1274	if (p->id > 0 && p->id <= vpn->conns.size ())
981	conf->protocols = p->protocols;
982	connection *c = vpn->conns[p->id - 1];
983
984	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
985	conf->id, p->id, c->ictx && c->octx);
986
987	if (c->ictx && c->octx)
988	{	1275	{
		1276	connection *c = vpn->conns[p->id - 1];
		1277	conf->protocols = p->protocols;
		1278
		1279	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
		1280	conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
		1281
		1282	if (c->ictx && c->octx)
		1283	{
989	// send connect_info packets to both sides, in case one is	1284	// send connect_info packets to both sides, in case one is
990	// behind a nat firewall (or both ;)	1285	// behind a nat firewall (or both ;)
991	c->send_connect_info (conf->id, si, conf->protocols);	1286	c->send_connect_info (conf->id, si, conf->protocols);
992	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1287	send_connect_info (c->conf->id, c->si, c->conf->protocols);
		1288	}
		1289	else
		1290	c->establish_connection ();
993	}	1291	}
		1292	else
		1293	slog (L_WARN,
		1294	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1295	p->id);
994	}	1296	}
995		1297
996	break;	1298	break;
997		1299
998	case vpn_packet::PT_CONNECT_INFO:	1300	case vpn_packet::PT_CONNECT_INFO:
999	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1301	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1000	{	1302	{
1001	connect_info_packet *p = (connect_info_packet *) pkt;	1303	connect_info_packet *p = (connect_info_packet *)pkt;
1002		1304
1003	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1305	if (p->id > 0 && p->id <= vpn->conns.size ())
1004	conf->protocols = p->protocols;	1306	{
1005	connection *c = vpn->conns[p->id - 1];	1307	connection *c = vpn->conns[p->id - 1];
1006		1308
		1309	c->conf->protocols = p->protocols;
		1310	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
		1311	p->si.upgrade_protocol (protocol, c->conf);
		1312
1007	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1313	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
		1314	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1008	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1315	(const char *)p->si, !c->ictx && !c->octx);
1009		1316
		1317	const sockinfo &dsi = forward_si (p->si);
		1318
		1319	if (dsi.valid ())
1010	c->send_auth_request (p->si, true);	1320	c->send_auth_request (dsi, true);
		1321	}
		1322	else
		1323	slog (L_WARN,
		1324	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1325	p->id);
1011	}	1326	}
1012		1327
1013	break;	1328	break;
1014		1329
1015	default:	1330	default:
1016	send_reset (rsi);	1331	send_reset (rsi);
1017	break;	1332	break;
1018	}	1333	}
1019	}	1334	}
1020		1335
1021	void connection::keepalive_cb (time_watcher &w)	1336	inline void
		1337	connection::keepalive_cb (ev::timer &w, int revents)
1022	{	1338	{
1023	if (NOW >= last_activity + ::conf.keepalive + 30)	1339	if (ev_now () >= last_activity + ::conf.keepalive + 15)
1024	{	1340	{
1025	reset_connection ();	1341	reset_connection ();
1026	establish_connection ();	1342	establish_connection ();
1027	}	1343	}
1028	else if (NOW < last_activity + ::conf.keepalive)	1344	else if (ev_now () < last_activity + ::conf.keepalive)
1029	w.at = last_activity + ::conf.keepalive;	1345	w.start (last_activity + ::conf.keepalive - ev::now ());
1030	else if (conf->connectmode != conf_node::C_ONDEMAND	1346	else if (conf->connectmode != conf_node::C_ONDEMAND
1031	|| THISNODE->connectmode != conf_node::C_ONDEMAND)	1347	|| THISNODE->connectmode != conf_node::C_ONDEMAND)
1032	{	1348	{
1033	send_ping (si);	1349	send_ping (si);
1034	w.at = NOW + 5;	1350	w.start (3);
1035	}	1351	}
		1352	else if (ev_now () < last_activity + ::conf.keepalive + 10)
		1353	// hold ondemand connections implicitly a few seconds longer
		1354	// should delete octx, though, or something like that ;)
		1355	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1036	else	1356	else
1037	reset_connection ();	1357	reset_connection ();
1038	}	1358	}
1039		1359
		1360	void
1040	void connection::connect_request (int id)	1361	connection::send_connect_request (int id)
1041	{	1362	{
1042	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1363	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1043		1364
1044	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);	1365	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
		1366	conf->nodename, vpn->conns[id - 1]->conf->nodename);
1045	p->hmac_set (octx);	1367	p->hmac_set (octx);
1046	send_vpn_packet (p, si);	1368	send_vpn_packet (p, si);
1047		1369
1048	delete p;	1370	delete p;
1049	}	1371	}
1050		1372
1051	void connection::script_node ()	1373	void
		1374	connection::script_init_env (const char *ext)
1052	{	1375	{
1053	vpn->script_if_up ();
1054
1055	char *env;	1376	char *env;
		1377	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1378	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1379	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1380	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1381	conf->id & 0xff); putenv (env);
		1382	}
		1383
		1384	void
		1385	connection::script_init_connect_env ()
		1386	{
		1387	vpn->script_init_env ();
		1388
		1389	char *env;
1056	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1390	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
		1391	asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1057	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1392	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1058	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1393	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1059	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1394	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1060	}	1395	}
1061		1396
		1397	inline const char *
1062	const char *connection::script_node_up ()	1398	connection::script_node_up ()
1063	{	1399	{
1064	script_node ();	1400	script_init_connect_env ();
1065		1401
1066	putenv ("STATE=up");	1402	putenv ((char *)"STATE=up");
1067		1403
		1404	char *filename;
		1405	asprintf (&filename,
		1406	"%s/%s",
		1407	confbase,
1068	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1408	::conf.script_node_up ? ::conf.script_node_up : "node-up");
1069	}
1070		1409
		1410	return filename;
		1411	}
		1412
		1413	inline const char *
		1414	connection::script_node_change ()
		1415	{
		1416	script_init_connect_env ();
		1417
		1418	putenv ((char *)"STATE=change");
		1419
		1420	char *filename;
		1421	asprintf (&filename,
		1422	"%s/%s",
		1423	confbase,
		1424	::conf.script_node_change ? ::conf.script_node_change : "node-change");
		1425
		1426	return filename;
		1427	}
		1428
		1429	inline const char *
1071	const char *connection::script_node_down ()	1430	connection::script_node_down ()
1072	{	1431	{
1073	script_node ();	1432	script_init_connect_env ();
1074		1433
1075	putenv ("STATE=down");	1434	putenv ((char *)"STATE=down");
1076		1435
1077	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1436	char *filename;
1078	}	1437	asprintf (&filename,
		1438	"%s/%s",
		1439	confbase,
		1440	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1079		1441
1080	// send a vpn packet out to other hosts	1442	return filename;
1081	void
1082	connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1083	{
1084	switch (protocol)
1085	{
1086	case PROT_IPv4:
1087	vpn->send_ipv4_packet (pkt, si, tos);
1088	break;
1089
1090	case PROT_UDPv4:
1091	vpn->send_udpv4_packet (pkt, si, tos);
1092	break;
1093
1094	case PROT_TCPv4:
1095	vpn->send_tcpv4_packet (pkt, si, tos);
1096	break;
1097	}
1098	}	1443	}
1099		1444
1100	connection::connection(struct vpn *vpn_)	1445	connection::connection (struct vpn *vpn, conf_node *conf)
1101	: vpn(vpn_)	1446	: vpn(vpn), conf(conf),
1102	, rekey (this, &connection::rekey_cb)	1447	#if ENABLE_DNS
1103	, keepalive (this, &connection::keepalive_cb)	1448	dns (0),
		1449	#endif
		1450	data_queue(conf->max_ttl, conf->max_queue + 1),
		1451	vpn_queue(conf->max_ttl, conf->max_queue + 1)
		1452	{
		1453	rekey .set<connection, &connection::rekey_cb > (this);
		1454	keepalive .set<connection, &connection::keepalive_cb > (this);
1104	, establish_connection (this, &connection::establish_connection_cb)	1455	establish_connection.set<connection, &connection::establish_connection_cb> (this);
1105	{	1456
		1457	last_establish_attempt = 0.;
1106	octx = ictx = 0;	1458	octx = ictx = 0;
1107	retry_cnt = 0;
1108		1459
1109	connectmode = conf_node::C_ALWAYS; // initial setting	1460	if (!conf->protocols) // make sure some protocol is enabled
		1461	conf->protocols = PROT_UDPv4;
		1462
		1463	connectmode = conf->connectmode;
		1464
		1465	// queue a dummy packet to force an initial connection attempt
		1466	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
		1467	vpn_queue.put (new net_packet);
		1468
1110	reset_connection ();	1469	reset_connection ();
1111	}	1470	}
1112		1471
1113	connection::~connection ()	1472	connection::~connection ()
1114	{	1473	{
1115	shutdown ();	1474	shutdown ();
1116	}	1475	}
1117		1476
		1477	void
1118	void connection_init ()	1478	connection_init ()
1119	{	1479	{
1120	auth_rate_limiter.clear ();	1480	auth_rate_limiter.clear ();
1121	reset_rate_limiter.clear ();	1481	reset_rate_limiter.clear ();
1122	}	1482	}
1123		1483

Diff Legend

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