ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.105 by root, Fri Jul 19 18:22:54 2013 UTC

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

Diff Legend

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