ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.97 by root, Tue Dec 4 13:23:17 2012 UTC

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

Diff Legend

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