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

Comparing gvpe/src/connection.C (file contents):
Revision 1.66 by pcg, Thu Dec 6 00:35:29 2007 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

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

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.66 by pcg, Thu Dec 6 00:35:29 2007 UTC vs. Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.66 by pcg, Thu Dec 6 00:35:29 2007 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC