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

Comparing gvpe/src/connection.C (file contents):
Revision 1.86 by pcg, Thu Jan 21 04:30:32 2010 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003-2008 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 it	7	GVPE is free software; you can redistribute it and/or modify it
8	under the terms of the GNU General Public License as published by the	8	under the terms of the GNU General Public License as published by the
43	#include "conf.h"	43	#include "conf.h"
44	#include "slog.h"	44	#include "slog.h"
45	#include "device.h"	45	#include "device.h"
46	#include "vpn.h"	46	#include "vpn.h"
47	#include "connection.h"	47	#include "connection.h"
		48	#include "hkdf.h"
48		49
49	#include "netcompat.h"	50	#include "netcompat.h"
50		51
51	#if !HAVE_RAND_PSEUDO_BYTES
52	# define RAND_pseudo_bytes RAND_bytes
53	#endif
54
55	#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56	#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)	52	#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
57		53
58	#define ULTRA_FAST 1	54	#define ULTRA_FAST 1
59	#define HLOG 15	55	#define HLOG 15
60	#include "lzf/lzf.h"	56	#include "lzf/lzf.h"
61	#include "lzf/lzf_c.c"	57	#include "lzf/lzf_c.c"
…		…
64	//////////////////////////////////////////////////////////////////////////////	60	//////////////////////////////////////////////////////////////////////////////
65		61
66	static std::queue< std::pair<run_script_cb , const char > > rs_queue;	62	static std::queue< std::pair<run_script_cb , const char > > rs_queue;
67	static ev::child rs_child_ev;	63	static ev::child rs_child_ev;
68		64
		65	namespace
		66	{
69	void // c++ requires external linkage here, apparently :(	67	void // c++ requires external linkage here, apparently :(
70	rs_child_cb (ev::child &w, int revents)	68	rs_child_cb (ev::child &w, int revents)
71	{	69	{
72	w.stop ();	70	w.stop ();
73		71
74	if (rs_queue.empty ())	72	if (rs_queue.empty ())
75	return;	73	return;
76		74
77	pid_t pid = run_script (*rs_queue.front ().first, false);	75	pid_t pid = run_script (*rs_queue.front ().first, false);
78	if (pid)	76	if (pid)
79	{	77	{
80	w.set (pid);	78	w.set (pid);
81	w.start ();	79	w.start ();
82	}	80	}
83	else	81	else
84	slog (L_WARN, rs_queue.front ().second);	82	slog (L_WARN, rs_queue.front ().second);
85		83
86	delete rs_queue.front ().first;	84	delete rs_queue.front ().first;
87	rs_queue.pop ();	85	rs_queue.pop ();
88	}	86	}
		87	};
89		88
90	// despite the fancy name, this is quite a hack	89	// despite the fancy name, this is quite a hack
91	static void	90	static void
92	run_script_queued (run_script_cb cb, const char warnmsg)	91	run_script_queued (run_script_cb cb, const char warnmsg)
93	{	92	{
…		…
105	struct crypto_ctx	104	struct crypto_ctx
106	{	105	{
107	EVP_CIPHER_CTX cctx;	106	EVP_CIPHER_CTX cctx;
108	HMAC_CTX hctx;	107	HMAC_CTX hctx;
109		108
110	crypto_ctx (const rsachallenge &challenge, int enc);	109	crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
111	~crypto_ctx ();	110	~crypto_ctx ();
112	};	111	};
113		112
114	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	113	crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
115	{	114	{
		115	ecdh_key s;
		116
		117	curve25519_combine (a, b, s);
		118
		119	{
		120	u8 mac_key[MAC_KEYSIZE];
		121	static const unsigned char mac_info[] = "gvpe mac key";
		122
		123	hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
		124	kdf.extract (auth2.rsa.ikm, sizeof (auth2.rsa.ikm));
		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 (auth2.rsa.ikm, sizeof (auth2.rsa.ikm));
		140	kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
		141	kdf.extract (s, sizeof (s));
		142	kdf.extract_done (HKDF_PRF_HASH ());
		143	kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
		144
116	EVP_CIPHER_CTX_init (&cctx);	145	EVP_CIPHER_CTX_init (&cctx);
117	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));	146	require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
118	HMAC_CTX_init (&hctx);	147	}
119	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
120	}	148	}
121		149
122	crypto_ctx::~crypto_ctx ()	150	crypto_ctx::~crypto_ctx ()
123	{	151	{
124	require (EVP_CIPHER_CTX_cleanup (&cctx));	152	require (EVP_CIPHER_CTX_cleanup (&cctx));
125	HMAC_CTX_cleanup (&hctx);	153	HMAC_CTX_cleanup (&hctx);
126	}	154	}
127		155
		156	static inline void
		157	auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
		158	{
		159	if (RSA_public_encrypt (sizeof (auth.rsa),
		160	(unsigned char )&auth.rsa, (unsigned char )&encr.rsa,
		161	key, RSA_PKCS1_OAEP_PADDING) < 0)
		162	fatal ("RSA_public_encrypt error");
		163
		164	memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
		165	}
		166
		167	static inline bool
		168	auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
		169	{
		170	u8 rsa_decrypt[RSA_KEYLEN];
		171
		172	if (RSA_private_decrypt (sizeof (encr.rsa),
		173	(const unsigned char )&encr.rsa, (unsigned char )rsa_decrypt,
		174	key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
		175	return 0;
		176
		177	memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
		178	memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
		179
		180	return 1;
		181	}
		182
128	static void	183	static void
129	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	184	auth_hash (const auth_data &auth, auth_mac &mac)
130	{	185	{
131	EVP_MD_CTX ctx;	186	HMAC_CTX ctx;
132		187
133	EVP_MD_CTX_init (&ctx);	188	HMAC_CTX_init (&ctx);
134	require (EVP_DigestInit (&ctx, RSA_HASH));	189	require (HMAC_Init_ex (&ctx, auth.rsa.auth_key, sizeof (auth.rsa.auth_key), AUTH_DIGEST (), 0));
135	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));	190	require (HMAC_Update (&ctx, (const unsigned char *)&auth, sizeof auth));
136	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
137	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));	191	require (HMAC_Final (&ctx, (unsigned char *)&mac, 0));
138	EVP_MD_CTX_cleanup (&ctx);	192	HMAC_CTX_cleanup (&ctx);
139	}	193	}
140		194
141	struct rsa_entry	195	void
		196	connection::generate_auth_data ()
142	{	197	{
143	tstamp expire;	198	if (auth_expire < ev_now ())
144	rsaid id;
145	rsachallenge chg;
146	};
147
148	struct rsa_cache : list<rsa_entry>
149	{
150	inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
151
152	bool find (const rsaid &id, rsachallenge &chg)
153	{
154	for (iterator i = begin (); i != end (); ++i)
155	{	199	{
156	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())	200	// request data
157	{	201	RAND_bytes ((unsigned char *)&snd_auth.rsa, sizeof snd_auth.rsa);
158	memcpy (&chg, &i->chg, sizeof chg);	202	curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
		203	auth_hash (snd_auth, snd_auth_mac);
159		204
160	erase (i);	205	// eventual response data
161	return true;	206	curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
162	}
163	}	207	}
164		208
165	if (!cleaner.is_active ())	209	// every use prolongs the expiry
166	cleaner.again ();
167
168	return false;
169	}
170
171	void gen (rsaid &id, rsachallenge &chg)
172	{
173	rsa_entry e;
174
175	RAND_bytes ((unsigned char *)&id, sizeof id);
176	RAND_bytes ((unsigned char *)&chg, sizeof chg);
177
178	e.expire = ev_now () + RSA_TTL;	210	auth_expire = ev_now () + AUTH_TTL;
179	e.id = id;
180	memcpy (&e.chg, &chg, sizeof chg);
181
182	push_back (e);
183
184	if (!cleaner.is_active ())
185	cleaner.again ();
186	}
187
188	rsa_cache ()
189	{
190	cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
191	cleaner.set (RSA_TTL, RSA_TTL);
192	}
193
194	} rsa_cache;
195
196	void rsa_cache::cleaner_cb (ev::timer &w, int revents)
197	{
198	if (empty ())
199	w.stop ();
200	else
201	{
202	for (iterator i = begin (); i != end (); )
203	if (i->expire <= ev_now ())
204	i = erase (i);
205	else
206	++i;
207	}
208	}	211	}
209		212
210	//////////////////////////////////////////////////////////////////////////////	213	//////////////////////////////////////////////////////////////////////////////
211		214
212	pkt_queue::pkt_queue (double max_ttl, int max_queue)	215	pkt_queue::pkt_queue (double max_ttl, int max_queue)
…		…
226	delete p;	229	delete p;
227		230
228	delete [] queue;	231	delete [] queue;
229	}	232	}
230		233
		234	void
231	void pkt_queue::expire_cb (ev::timer &w, int revents)	235	pkt_queue::expire_cb (ev::timer &w, int revents)
232	{	236	{
233	ev_tstamp expire = ev_now () - max_ttl;	237	ev_tstamp expire = ev_now () - max_ttl;
234		238
235	for (;;)	239	for (;;)
236	{	240	{
…		…
247		251
248	delete get ();	252	delete get ();
249	}	253	}
250	}	254	}
251		255
		256	void
252	void pkt_queue::put (net_packet *p)	257	pkt_queue::put (net_packet *p)
253	{	258	{
254	ev_tstamp now = ev_now ();	259	ev_tstamp now = ev_now ();
255		260
256	// start expiry timer	261	// start expiry timer
257	if (empty ())	262	if (empty ())
…		…
266	queue[i].tstamp = now;	271	queue[i].tstamp = now;
267		272
268	i = ni;	273	i = ni;
269	}	274	}
270		275
271	net_packet *pkt_queue::get ()	276	net_packet *
		277	pkt_queue::get ()
272	{	278	{
273	if (empty ())	279	if (empty ())
274	return 0;	280	return 0;
275		281
276	net_packet *p = queue[j].pkt;	282	net_packet *p = queue[j].pkt;
…		…
300		306
301	bool can (const sockinfo &si) { return can((u32)si.host); }	307	bool can (const sockinfo &si) { return can((u32)si.host); }
302	bool can (u32 host);	308	bool can (u32 host);
303	};	309	};
304		310
305	net_rate_limiter auth_rate_limiter, reset_rate_limiter;	311	static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
306		312
		313	bool
307	bool net_rate_limiter::can (u32 host)	314	net_rate_limiter::can (u32 host)
308	{	315	{
309	iterator i;	316	iterator i;
310		317
311	for (i = begin (); i != end (); )	318	for (i = begin (); i != end (); )
312	if (i->host == host)	319	if (i->host == host)
…		…
359		366
360	/////////////////////////////////////////////////////////////////////////////	367	/////////////////////////////////////////////////////////////////////////////
361		368
362	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];	369	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
363		370
		371	void
364	void hmac_packet::hmac_gen (crypto_ctx *ctx)	372	hmac_packet::hmac_gen (crypto_ctx *ctx)
365	{	373	{
366	unsigned int xlen;	374	unsigned int xlen;
367		375
368	HMAC_CTX *hctx = &ctx->hctx;	376	HMAC_CTX *hctx = &ctx->hctx;
369		377
370	HMAC_Init_ex (hctx, 0, 0, 0, 0);	378	require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
371	HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),	379	require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
372	len - sizeof (hmac_packet));	380	len - sizeof (hmac_packet)));
373	HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);	381	require (HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen));
374	}	382	}
375		383
376	void	384	void
377	hmac_packet::hmac_set (crypto_ctx *ctx)	385	hmac_packet::hmac_set (crypto_ctx *ctx)
378	{	386	{
…		…
387	hmac_gen (ctx);	395	hmac_gen (ctx);
388		396
389	return !memcmp (hmac, hmac_digest, HMACLENGTH);	397	return !memcmp (hmac, hmac_digest, HMACLENGTH);
390	}	398	}
391		399
		400	void
392	void vpn_packet::set_hdr (ptype type_, unsigned int dst)	401	vpn_packet::set_hdr (ptype type_, unsigned int dst)
393	{	402	{
394	type = type_;	403	type = type_;
395		404
396	int src = THISNODE->id;	405	int src = THISNODE->id;
397		406
…		…
402		411
403	#define MAXVPNDATA (MAX_MTU - 6 - 6)	412	#define MAXVPNDATA (MAX_MTU - 6 - 6)
404	#define DATAHDR (sizeof (u32) + RAND_SIZE)	413	#define DATAHDR (sizeof (u32) + RAND_SIZE)
405		414
406	struct vpndata_packet : vpn_packet	415	struct vpndata_packet : vpn_packet
		416	{
		417	u8 data[MAXVPNDATA + DATAHDR]; // seqno
		418
		419	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
		420	tap_packet unpack (connection conn, u32 &seqno);
		421
		422	private:
		423	const u32 data_hdr_size () const
407	{	424	{
408	u8 data[MAXVPNDATA + DATAHDR]; // seqno
409
410	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
411	tap_packet unpack (connection conn, u32 &seqno);
412	private:
413
414	const u32 data_hdr_size () const
415	{
416	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;	425	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
417	}
418	};	426	}
		427	};
419		428
420	void	429	void
421	vpndata_packet::setup (connection conn, int dst, u8 d, u32 l, u32 seqno)	430	vpndata_packet::setup (connection conn, int dst, u8 d, u32 l, u32 seqno)
422	{	431	{
423	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;	432	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
…		…
441	d[1] = cl;	450	d[1] = cl;
442	}	451	}
443	}	452	}
444	#endif	453	#endif
445		454
446	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));	455	require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
447		456
448	struct {	457	struct {
449	#if RAND_SIZE	458	#if RAND_SIZE
450	u8 rnd[RAND_SIZE];	459	u8 rnd[RAND_SIZE];
451	#endif	460	#endif
452	u32 seqno;	461	u32 seqno;
453	} datahdr;	462	} datahdr;
454		463
455	datahdr.seqno = ntohl (seqno);	464	datahdr.seqno = ntohl (seqno);
456	#if RAND_SIZE	465	#if RAND_SIZE
457	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	466	RAND_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
458	#endif	467	#endif
459		468
460	require (EVP_EncryptUpdate (cctx,	469	require (EVP_EncryptUpdate (cctx,
461	(unsigned char *) data + outl, &outl2,	470	(unsigned char *) data + outl, &outl2,
462	(unsigned char *) &datahdr, DATAHDR));	471	(unsigned char *) &datahdr, DATAHDR));
…		…
484	int outl = 0, outl2;	493	int outl = 0, outl2;
485	tap_packet *p = new tap_packet;	494	tap_packet *p = new tap_packet;
486	u8 *d;	495	u8 *d;
487	u32 l = len - data_hdr_size ();	496	u32 l = len - data_hdr_size ();
488		497
489	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));	498	require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
490		499
491	#if ENABLE_COMPRESSION	500	#if ENABLE_COMPRESSION
492	u8 cdata[MAX_MTU];	501	u8 cdata[MAX_MTU];
493		502
494	if (type == PT_DATA_COMPRESSED)	503	if (type == PT_DATA_COMPRESSED)
…		…
536	}	545	}
537	};	546	};
538		547
539	struct config_packet : vpn_packet	548	struct config_packet : vpn_packet
540	{	549	{
541	// actually, hmaclen cannot be checked because the hmac
542	// field comes before this data, so peers with other
543	// hmacs simply will not work.
544	u8 prot_major, prot_minor, randsize, hmaclen;	550	u8 prot_major, prot_minor, randsize;
545	u8 flags, challengelen, features, pad3;	551	u8 flags, features, pad6, pad7, pad8;
546	u32 cipher_nid, digest_nid, hmac_nid;	552	u32 cipher_nid, mac_nid, auth_nid;
547		553
548	void setup (ptype type, int dst);	554	void setup (ptype type, int dst);
549	bool chk_config () const;	555	bool chk_config () const;
550		556
551	static u8 get_features ()	557	static u8 get_features ()
…		…
562	#endif	568	#endif
563	return f;	569	return f;
564	}	570	}
565	};	571	};
566		572
		573	void
567	void config_packet::setup (ptype type, int dst)	574	config_packet::setup (ptype type, int dst)
568	{	575	{
569	prot_major = PROTOCOL_MAJOR;	576	prot_major = PROTOCOL_MAJOR;
570	prot_minor = PROTOCOL_MINOR;	577	prot_minor = PROTOCOL_MINOR;
571	randsize = RAND_SIZE;	578	randsize = RAND_SIZE;
572	hmaclen = HMACLENGTH;
573	flags = 0;	579	flags = 0;
574	challengelen = sizeof (rsachallenge);
575	features = get_features ();	580	features = get_features ();
576		581
577	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	582	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
578	digest_nid = htonl (EVP_MD_type (RSA_HASH));
579	hmac_nid = htonl (EVP_MD_type (DIGEST));	583	mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
		584	auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
580		585
581	len = sizeof (*this) - sizeof (net_packet);	586	len = sizeof (*this) - sizeof (net_packet);
582	set_hdr (type, dst);	587	set_hdr (type, dst);
583	}	588	}
584		589
		590	bool
585	bool config_packet::chk_config () const	591	config_packet::chk_config () const
586	{	592	{
587	if (prot_major != PROTOCOL_MAJOR)	593	if (prot_major != PROTOCOL_MAJOR)
588	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);	594	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
589	else if (randsize != RAND_SIZE)	595	else if (randsize != RAND_SIZE)
590	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);	596	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
591	else if (hmaclen != HMACLENGTH)
592	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
593	else if (challengelen != sizeof (rsachallenge))
594	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
595	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	597	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
596	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	598	slog (L_WARN, _("cipher algo mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
597	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
598	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
599	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	599	else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
600	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	600	slog (L_WARN, _("mac algo mismatch (remote %x <=> local %x)"), ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
		601	else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
		602	slog (L_WARN, _("auth algo mismatch (remote %x <=> local %x)"), ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
601	else	603	else
602	return true;	604	return true;
603		605
604	return false;	606	return false;
605	}	607	}
606		608
607	struct auth_req_packet : config_packet	609	struct auth_req_packet : config_packet // UNPROTECTED
608	{	610	{
609	char magic[8];	611	char magic[8];
610	u8 initiate; // false if this is just an automatic reply	612	u8 initiate; // false if this is just an automatic reply
611	u8 protocols; // supported protocols (will be patched on forward)	613	u8 protocols; // supported protocols (will be patched on forward)
612	u8 pad2, pad3;	614	u8 pad2, pad3;
613	rsaid id;	615	auth_encr encr;
614	rsaencrdata encr;
615		616
616	auth_req_packet (int dst, bool initiate_, u8 protocols_)	617	auth_req_packet (int dst, bool initiate_, u8 protocols_)
617	{	618	{
618	config_packet::setup (PT_AUTH_REQ, dst);	619	config_packet::setup (PT_AUTH_REQ, dst);
619	strncpy (magic, MAGIC_OLD, 8);	620	memcpy (magic, MAGIC, 8);
620	initiate = !!initiate_;	621	initiate = !!initiate_;
621	protocols = protocols_;	622	protocols = protocols_;
622		623
623	len = sizeof (*this) - sizeof (net_packet);	624	len = sizeof (*this) - sizeof (net_packet);
624	}	625	}
625	};	626	};
626		627
627	struct auth_res_packet : config_packet	628	struct auth_res_packet : config_packet // UNPROTECTED
628	{	629	{
629	rsaid id;
630	u8 pad1, pad2, pad3;
631	u8 response_len; // encrypted length
632	rsaresponse response;	630	auth_response response;
633		631
634	auth_res_packet (int dst)	632	auth_res_packet (int dst)
635	{	633	{
636	config_packet::setup (PT_AUTH_RES, dst);	634	config_packet::setup (PT_AUTH_RES, dst);
637		635
…		…
671	};	669	};
672		670
673	/////////////////////////////////////////////////////////////////////////////	671	/////////////////////////////////////////////////////////////////////////////
674		672
675	void	673	void
676	connection::connection_established ()	674	connection::connection_established (const sockinfo &rsi)
677	{	675	{
678	slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);	676	if (!have_snd_auth \|\| !have_rcv_auth)
		677	return;
		678
		679	si = rsi;
		680	protocol = rsi.prot;
		681
		682	slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
		683	conf->nodename, (const char *)rsi,
		684	is_direct ? "direct" : "forwarded",
		685	PROTOCOL_MAJOR, prot_minor);
		686
		687	if (::conf.script_node_up)
		688	{
		689	run_script_cb *cb = new run_script_cb;
		690	cb->set<connection, &connection::script_node_up> (this);
		691	run_script_queued (cb, _("node-up command execution failed, continuing."));
		692	}
		693
		694	delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
		695	iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
		696
		697	delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
		698	oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
679		699
680	if (ictx && octx)	700	if (ictx && octx)
681	{	701	{
682	// make sure rekeying timeouts are slightly asymmetric	702	// make sure rekeying timeouts are slightly asymmetric
683	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);	703	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
684	rekey.start (rekey_interval, rekey_interval);	704	rekey.start (rekey_interval, rekey_interval);
		705
685	keepalive.start (::conf.keepalive);	706	keepalive.start (::conf.keepalive);
686		707
687	// send queued packets	708	// send queued packets
688	if (ictx && octx)	709	if (ictx && octx)
689	{	710	{
…		…
700	}	721	}
701	}	722	}
702		723
703	vpn->connection_established (this);	724	vpn->connection_established (this);
704	}	725	}
		726	#if 0
705	else	727	else
706	{	728	{
707	retry_cnt = 0;	729	retry_cnt = 0;
708	establish_connection.start (5);	730	establish_connection.start (5);
709	keepalive.stop ();	731	keepalive.stop ();
710	rekey.stop ();	732	rekey.stop ();
711	}	733	}
		734	#endif
712	}	735	}
713		736
714	void	737	void
715	connection::reset_si ()	738	connection::reset_si ()
716	{	739	{
…		…
762	ping_packet *pkt = new ping_packet;	785	ping_packet *pkt = new ping_packet;
763		786
764	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);	787	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
765		788
766	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);	789	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
767
768	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	790	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
769		791
770	delete pkt;	792	delete pkt;
771	}	793	}
772		794
…		…
787	void	809	void
788	connection::send_auth_request (const sockinfo &si, bool initiate)	810	connection::send_auth_request (const sockinfo &si, bool initiate)
789	{	811	{
790	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	812	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
791		813
792	rsachallenge chg;	814	generate_auth_data ();
793	rsa_cache.gen (pkt->id, chg);
794	rsa_encrypt (conf->rsa_key, chg, pkt->encr);	815	auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
795		816
796	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);	817	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
797
798	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	818	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
799		819
800	delete pkt;	820	delete pkt;
801	}	821	}
802		822
803	void	823	void
804	connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)	824	connection::send_auth_response (const sockinfo &si)
805	{	825	{
806	auth_res_packet *pkt = new auth_res_packet (conf->id);	826	auth_res_packet *pkt = new auth_res_packet (conf->id);
807		827
808	pkt->id = id;	828	auth_hash (rcv_auth, pkt->response.mac);
809		829	memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof (rcv_ecdh_b));
810	rsa_hash (id, chg, pkt->response);
811
812	pkt->hmac_set (octx);
813		830
814	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);	831	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
815
816	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	832	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
817		833
818	delete pkt;	834	delete pkt;
819	}	835	}
820		836
821	void	837	void
822	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	838	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
823	{	839	{
824	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,	840	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
825	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);	841	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
		842	conf->protocols);
826		843
827	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	844	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
828		845
829	r->hmac_set (octx);	846	r->hmac_set (octx);
830	send_vpn_packet (r, si);	847	send_vpn_packet (r, si);
…		…
833	}	850	}
834		851
835	inline void	852	inline void
836	connection::establish_connection_cb (ev::timer &w, int revents)	853	connection::establish_connection_cb (ev::timer &w, int revents)
837	{	854	{
838	if (!ictx	855	if (!(ictx && octx)
839	&& conf != THISNODE	856	&& conf != THISNODE
840	&& connectmode != conf_node::C_NEVER	857	&& connectmode != conf_node::C_NEVER
841	&& connectmode != conf_node::C_DISABLED	858	&& connectmode != conf_node::C_DISABLED
842	&& !w.is_active ())	859	&& !w.is_active ())
843	{	860	{
…		…
911	}	928	}
912	}	929	}
913		930
914	delete ictx; ictx = 0;	931	delete ictx; ictx = 0;
915	delete octx; octx = 0;	932	delete octx; octx = 0;
916	#if ENABLE_DNS
917	dnsv4_reset_connection ();
918	#endif
919		933
920	si.host = 0;	934	si.host = 0;
		935
		936	have_snd_auth = false;
		937	have_rcv_auth = false;
		938	auth_expire = 0.;
921		939
922	last_activity = 0.;	940	last_activity = 0.;
923	//last_si_change = 0.;	941	//last_si_change = 0.;
924	retry_cnt = 0;	942	retry_cnt = 0;
925		943
…		…
984	data_queue.put (new tap_packet (*pkt));	1002	data_queue.put (new tap_packet (*pkt));
985	post_inject_queue ();	1003	post_inject_queue ();
986	}	1004	}
987	}	1005	}
988		1006
		1007	void
989	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)	1008	connection::inject_vpn_packet (vpn_packet *pkt, int tos)
990	{	1009	{
991	if (ictx && octx)	1010	if (ictx && octx)
992	send_vpn_packet (pkt, si, tos);	1011	send_vpn_packet (pkt, si, tos);
993	else	1012	else
994	{	1013	{
…		…
1000	void	1019	void
1001	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	1020	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
1002	{	1021	{
1003	last_activity = ev_now ();	1022	last_activity = ev_now ();
1004		1023
1005	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",	1024	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
1006	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());	1025	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1007		1026
1008	if (connectmode == conf_node::C_DISABLED)	1027	if (connectmode == conf_node::C_DISABLED)
1009	return;	1028	return;
1010		1029
…		…
1020	{	1039	{
1021	if (auth_rate_limiter.can (rsi))	1040	if (auth_rate_limiter.can (rsi))
1022	send_auth_request (rsi, true);	1041	send_auth_request (rsi, true);
1023	}	1042	}
1024	else	1043	else
1025	// we would love to change thre socket address here, but ping's aren't	1044	// we would love to change the socket address here, but ping's aren't
1026	// authenticated, so we best ignore it.	1045	// authenticated, so we best ignore it.
1027	send_ping (rsi, 1); // pong	1046	send_ping (rsi, 1); // pong
1028		1047
1029	break;	1048	break;
1030		1049
1031	case vpn_packet::PT_PONG:	1050	case vpn_packet::PT_PONG:
1032	slog (L_TRACE, "%s >> PT_PONG", conf->nodename);	1051	slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
		1052
		1053	// a PONG might mean that the other side doesn't really know
		1054	// about our desire for communication.
		1055	establish_connection ();
1033	break;	1056	break;
1034		1057
1035	case vpn_packet::PT_RESET:	1058	case vpn_packet::PT_RESET:
1036	{	1059	{
1037	reset_connection ();	1060	reset_connection ();
…		…
1050	break;	1073	break;
1051		1074
1052	case vpn_packet::PT_AUTH_REQ:	1075	case vpn_packet::PT_AUTH_REQ:
1053	if (auth_rate_limiter.can (rsi))	1076	if (auth_rate_limiter.can (rsi))
1054	{	1077	{
1055	auth_req_packet p = (auth_req_packet ) pkt;	1078	auth_req_packet p = (auth_req_packet )pkt;
1056		1079
1057	slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");	1080	slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
		1081	conf->nodename, p->initiate ? "initiate" : "reply",
		1082	p->protocols, p->features);
1058		1083
1059	if (p->chk_config ()	1084	if (p->chk_config () && !memcmp (p->magic, MAGIC, 8))
1060	&& (!strncmp (p->magic, MAGIC_OLD, 8) \|\| !strncmp (p->magic, MAGIC, 8)))
1061	{	1085	{
1062	if (p->prot_minor != PROTOCOL_MINOR)	1086	if (p->prot_minor != PROTOCOL_MINOR)
1063	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),	1087	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1064	conf->nodename, (const char *)rsi,	1088	conf->nodename, (const char *)rsi,
1065	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1089	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1066		1090
1067	if (p->initiate)	1091	if (p->initiate)
1068	send_auth_request (rsi, false);	1092	send_auth_request (rsi, false);
1069		1093
1070	rsachallenge k;	1094	auth_data auth;
1071		1095
1072	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))	1096	if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1073	{	1097	{
1074	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	1098	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1075	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));	1099	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1076	break;
1077	}	1100	}
1078	else	1101	else
1079	{	1102	{
1080	delete octx;	1103	bool chg = !have_rcv_auth \|\| memcmp (&rcv_auth, &auth, sizeof auth);
1081		1104
1082	octx = new crypto_ctx (k, 1);	1105	rcv_auth = auth;
1083	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	1106	have_rcv_auth = true;
1084		1107
		1108	send_auth_response (rsi);
		1109
		1110	if (chg)
		1111	{
1085	conf->protocols = p->protocols;	1112	conf->protocols = p->protocols;
1086	features = p->features & config_packet::get_features ();	1113	features = p->features & config_packet::get_features ();
1087		1114
1088	send_auth_response (rsi, p->id, k);
1089
1090	connection_established ();	1115	connection_established (rsi);
1091
1092	break;	1116	}
1093	}	1117	}
		1118
		1119	break;
1094	}	1120	}
1095	else	1121	else
1096	slog (L_WARN, _("%s(%s): protocol mismatch."),	1122	slog (L_WARN, _("%s(%s): protocol mismatch."),
1097	conf->nodename, (const char *)rsi);	1123	conf->nodename, (const char *)rsi);
1098		1124
…		…
1107		1133
1108	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);	1134	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1109		1135
1110	if (p->chk_config ())	1136	if (p->chk_config ())
1111	{	1137	{
1112	if (p->prot_minor != PROTOCOL_MINOR)	1138	if (memcmp (&p->response.mac, snd_auth_mac, sizeof (snd_auth_mac)))
1113	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1114	conf->nodename, (const char *)rsi,
1115	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1116
1117	rsachallenge chg;
1118
1119	if (!rsa_cache.find (p->id, chg))
1120	{	1139	{
1121	slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),	1140	slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1122	conf->nodename, (const char *)rsi);	1141	conf->nodename, (const char *)rsi);
1123	break;
1124	}	1142	}
1125	else	1143	else if (!have_snd_auth)
1126	{	1144	{
1127	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1145	if (p->prot_minor != PROTOCOL_MINOR)
1128		1146	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1129	if (!p->hmac_chk (cctx))
1130	{
1131	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1132	"could be an attack, or just corruption or a synchronization error."),
1133	conf->nodename, (const char *)rsi);	1147	conf->nodename, (const char *)rsi,
1134	break;	1148	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1135	}
1136	else
1137	{
1138	rsaresponse h;
1139		1149
1140	rsa_hash (p->id, chg, h);
1141
1142	if (!memcmp ((u8 )&h, (u8 )p->response, sizeof h))
1143	{
1144	prot_minor = p->prot_minor;	1150	prot_minor = p->prot_minor;
		1151	memcpy (snd_ecdh_b, p->response.ecdh, sizeof (snd_ecdh_b));
1145		1152
1146	delete ictx; ictx = cctx;	1153	have_snd_auth = true;
1147
1148	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1149
1150	si = rsi;
1151	protocol = rsi.prot;
1152
1153	slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1154	conf->nodename, (const char *)rsi,
1155	is_direct ? "direct" : "forwarded",
1156	p->prot_major, p->prot_minor);
1157
1158	connection_established ();	1154	connection_established (rsi);
1159
1160	if (::conf.script_node_up)
1161	{
1162	run_script_cb *cb = new run_script_cb;
1163	cb->set<connection, &connection::script_node_up> (this);
1164	run_script_queued (cb, _("node-up command execution failed, continuing."));
1165	}
1166
1167	break;
1168	}
1169	else
1170	slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1171	conf->nodename, (const char *)rsi);
1172	}
1173
1174	delete cctx;
1175	}	1155	}
		1156
		1157	break;
1176	}	1158	}
1177	}	1159	}
1178		1160
1179	send_reset (rsi);	1161	send_reset (rsi);
1180	break;	1162	break;
…		…
1257	if (p->id > 0 && p->id <= vpn->conns.size ())	1239	if (p->id > 0 && p->id <= vpn->conns.size ())
1258	{	1240	{
1259	connection *c = vpn->conns[p->id - 1];	1241	connection *c = vpn->conns[p->id - 1];
1260	conf->protocols = p->protocols;	1242	conf->protocols = p->protocols;
1261		1243
1262	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",	1244	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1263	conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);	1245	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
		1246	p->protocols,
		1247	c->ictx && c->octx);
1264		1248
1265	if (c->ictx && c->octx)	1249	if (c->ictx && c->octx)
1266	{	1250	{
1267	// send connect_info packets to both sides, in case one is	1251	// send connect_info packets to both sides, in case one is
1268	// behind a nat firewall (or both ;)	1252	// behind a nat firewall (or both ;)
…		…
1291		1275
1292	c->conf->protocols = p->protocols;	1276	c->conf->protocols = p->protocols;
1293	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1277	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1294	p->si.upgrade_protocol (protocol, c->conf);	1278	p->si.upgrade_protocol (protocol, c->conf);
1295		1279
1296	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",	1280	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
		1281	conf->nodename,
1297	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,	1282	vpn->conns[p->id - 1]->conf->nodename,
		1283	(const char *)p->si,
		1284	p->protocols,
		1285	protocol,
		1286	p->si.supported_protocols (c->conf),
1298	(const char *)p->si, !c->ictx && !c->octx);	1287	!c->ictx && !c->octx);
1299		1288
1300	const sockinfo &dsi = forward_si (p->si);	1289	const sockinfo &dsi = forward_si (p->si);
1301		1290
1302	if (dsi.valid ())	1291	if (dsi.valid ())
1303	c->send_auth_request (dsi, true);	1292	c->send_auth_request (dsi, true);
		1293	else
		1294	slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
		1295	vpn->conns[p->id - 1]->conf->nodename,
		1296	(const char *)p->si);
1304	}	1297	}
1305	else	1298	else
1306	slog (L_WARN,	1299	slog (L_WARN,
1307	_("received authenticated connection request from unknown node #%d, config file mismatch?"),	1300	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
1308	p->id);	1301	p->id);
…		…
1317	}	1310	}
1318		1311
1319	inline void	1312	inline void
1320	connection::keepalive_cb (ev::timer &w, int revents)	1313	connection::keepalive_cb (ev::timer &w, int revents)
1321	{	1314	{
1322	if (ev_now () >= last_activity + ::conf.keepalive + 15)	1315	ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
		1316
		1317	if (when >= 0)
		1318	w.start (when);
		1319	else if (when < -15)
1323	{	1320	{
1324	reset_connection ();	1321	reset_connection ();
1325	establish_connection ();	1322	establish_connection ();
1326	}	1323	}
1327	else if (ev_now () < last_activity + ::conf.keepalive)
1328	w.start (last_activity + ::conf.keepalive - ev::now ());
1329	else if (conf->connectmode != conf_node::C_ONDEMAND	1324	else if (conf->connectmode != conf_node::C_ONDEMAND
1330	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1325	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1331	{	1326	{
		1327	w.start (3);
1332	send_ping (si);	1328	send_ping (si);
1333	w.start (3);
1334	}	1329	}
1335	else if (ev_now () < last_activity + ::conf.keepalive + 10)	1330	else if (when >= -10)
1336	// hold ondemand connections implicitly a few seconds longer	1331	// hold ondemand connections implicitly a few seconds longer
1337	// should delete octx, though, or something like that ;)	1332	// should delete octx, though, or something like that ;)
1338	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());	1333	w.start (when + 10);
1339	else	1334	else
1340	reset_connection ();	1335	reset_connection ();
1341	}	1336	}
1342		1337
		1338	void
1343	void connection::send_connect_request (int id)	1339	connection::send_connect_request (int id)
1344	{	1340	{
1345	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1341	connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1346		1342
1347	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",	1343	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1348	conf->nodename, vpn->conns[id - 1]->conf->nodename);	1344	conf->nodename, vpn->conns[id - 1]->conf->nodename,
		1345	THISNODE->protocols);
1349	p->hmac_set (octx);	1346	p->hmac_set (octx);
1350	send_vpn_packet (p, si);	1347	send_vpn_packet (p, si);
1351		1348
1352	delete p;	1349	delete p;
1353	}	1350	}
1354		1351
		1352	void
1355	void connection::script_init_env (const char *ext)	1353	connection::script_init_env (const char *ext)
1356	{	1354	{
1357	char *env;	1355	char *env;
1358	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);	1356	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1359	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);	1357	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1360	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,	1358	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1361	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,	1359	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1362	conf->id & 0xff); putenv (env);	1360	conf->id & 0xff); putenv (env);
1363	}	1361	}
1364		1362
		1363	void
1365	void connection::script_init_connect_env ()	1364	connection::script_init_connect_env ()
1366	{	1365	{
1367	vpn->script_init_env ();	1366	vpn->script_init_env ();
1368		1367
1369	char *env;	1368	char *env;
1370	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1369	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
…		…
1435	establish_connection.set<connection, &connection::establish_connection_cb> (this);	1434	establish_connection.set<connection, &connection::establish_connection_cb> (this);
1436		1435
1437	last_establish_attempt = 0.;	1436	last_establish_attempt = 0.;
1438	octx = ictx = 0;	1437	octx = ictx = 0;
1439		1438
1440	if (!conf->protocols) // make sure some protocol is enabled
1441	conf->protocols = PROT_UDPv4;
1442
1443	connectmode = conf->connectmode;	1439	connectmode = conf->connectmode;
1444		1440
1445	// queue a dummy packet to force an initial connection attempt	1441	// queue a dummy packet to force an initial connection attempt
1446	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)	1442	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1447	vpn_queue.put (new net_packet);	1443	vpn_queue.put (new net_packet);
…		…
1452	connection::~connection ()	1448	connection::~connection ()
1453	{	1449	{
1454	shutdown ();	1450	shutdown ();
1455	}	1451	}
1456		1452
		1453	void
1457	void connection_init ()	1454	connection_init ()
1458	{	1455	{
1459	auth_rate_limiter.clear ();	1456	auth_rate_limiter.clear ();
1460	reset_rate_limiter.clear ();	1457	reset_rate_limiter.clear ();
1461	}	1458	}
1462		1459

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.86 by pcg, Thu Jan 21 04:30:32 2010 UTC vs. Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.86 by pcg, Thu Jan 21 04:30:32 2010 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC