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

Comparing gvpe/src/connection.C (file contents):
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.108 by root, Fri Oct 11 04:07:24 2013 UTC

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

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs. Revision 1.108 by root, Fri Oct 11 04:07:24 2013 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.108 by root, Fri Oct 11 04:07:24 2013 UTC