ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.101 by root, Wed Jul 17 16:40:57 2013 UTC

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

Diff Legend

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