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

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

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.68 by pcg, Thu Aug 7 17:30:27 2008 UTC vs. Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.68 by pcg, Thu Aug 7 17:30:27 2008 UTC vs.
Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC