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

Comparing gvpe/src/connection.C (file contents):
Revision 1.82 by pcg, Fri Aug 15 18:35:24 2008 UTC vs.
Revision 1.106 by root, Fri Jul 19 21:01:16 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 "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
56		54
57	#define ULTRA_FAST 1	55	#define ULTRA_FAST 1
58	#define HLOG 15	56	#define HLOG 15
59	#include "lzf/lzf.h"	57	#include "lzf/lzf.h"
60	#include "lzf/lzf_c.c"	58	#include "lzf/lzf_c.c"
…		…
63	//////////////////////////////////////////////////////////////////////////////	61	//////////////////////////////////////////////////////////////////////////////
64		62
65	static std::queue< std::pair<run_script_cb , const char > > rs_queue;	63	static std::queue< std::pair<run_script_cb , const char > > rs_queue;
66	static ev::child rs_child_ev;	64	static ev::child rs_child_ev;
67		65
		66	namespace
		67	{
68	void // c++ requires external linkage here, apparently :(	68	void // c++ requires external linkage here, apparently :(
69	rs_child_cb (ev::child &w, int revents)	69	rs_child_cb (ev::child &w, int revents)
70	{	70	{
71	w.stop ();	71	w.stop ();
72		72
73	if (rs_queue.empty ())	73	if (rs_queue.empty ())
74	return;	74	return;
75		75
76	pid_t pid = run_script (*rs_queue.front ().first, false);	76	pid_t pid = run_script (*rs_queue.front ().first, false);
77	if (pid)	77	if (pid)
78	{	78	{
79	w.set (pid);	79	w.set (pid);
80	w.start ();	80	w.start ();
81	}	81	}
82	else	82	else
83	slog (L_WARN, rs_queue.front ().second);	83	slog (L_WARN, rs_queue.front ().second);
84		84
85	delete rs_queue.front ().first;	85	delete rs_queue.front ().first;
86	rs_queue.pop ();	86	rs_queue.pop ();
87	}	87	}
		88	};
88		89
89	// despite the fancy name, this is quite a hack	90	// despite the fancy name, this is quite a hack
90	static void	91	static void
91	run_script_queued (run_script_cb cb, const char warnmsg)	92	run_script_queued (run_script_cb cb, const char warnmsg)
92	{	93	{
…		…
104	struct crypto_ctx	105	struct crypto_ctx
105	{	106	{
106	EVP_CIPHER_CTX cctx;	107	EVP_CIPHER_CTX cctx;
107	HMAC_CTX hctx;	108	HMAC_CTX hctx;
108		109
109	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);
110	~crypto_ctx ();	111	~crypto_ctx ();
111	};	112	};
112		113
113	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)
114	{	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
115	EVP_CIPHER_CTX_init (&cctx);	144	EVP_CIPHER_CTX_init (&cctx);
116	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));
117	HMAC_CTX_init (&hctx);	146	}
118	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
119	}	147	}
120		148
121	crypto_ctx::~crypto_ctx ()	149	crypto_ctx::~crypto_ctx ()
122	{	150	{
123	require (EVP_CIPHER_CTX_cleanup (&cctx));	151	require (EVP_CIPHER_CTX_cleanup (&cctx));
124	HMAC_CTX_cleanup (&hctx);	152	HMAC_CTX_cleanup (&hctx);
125	}	153	}
126		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
127	static void	182	static void
128	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	183	auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
129	{	184	{
130	EVP_MD_CTX ctx;	185	hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
131		186	kdf.extract (&auth.rsa, sizeof (auth.rsa));
132	EVP_MD_CTX_init (&ctx);	187	kdf.extract_done ();
133	require (EVP_DigestInit (&ctx, RSA_HASH));	188	kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
134	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
135	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
136	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
137	EVP_MD_CTX_cleanup (&ctx);
138	}	189	}
139		190
140	struct rsa_entry	191	void
		192	connection::generate_auth_data ()
141	{	193	{
142	tstamp expire;	194	if (auth_expire < ev_now ())
143	rsaid id;
144	rsachallenge chg;
145	};
146
147	struct rsa_cache : list<rsa_entry>
148	{
149	inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
150
151	bool find (const rsaid &id, rsachallenge &chg)
152	{
153	for (iterator i = begin (); i != end (); ++i)
154	{	195	{
155	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())	196	// request data
156	{	197	rand_fill (snd_auth.rsa);
157	memcpy (&chg, &i->chg, sizeof chg);	198	curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
158		199
159	erase (i);	200	// eventual response data
160	return true;	201	curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
161	}
162	}	202	}
163		203
164	if (!cleaner.is_active ())	204	// every use prolongs the expiry
165	cleaner.again ();
166
167	return false;
168	}
169
170	void gen (rsaid &id, rsachallenge &chg)
171	{
172	rsa_entry e;
173
174	RAND_bytes ((unsigned char *)&id, sizeof id);
175	RAND_bytes ((unsigned char *)&chg, sizeof chg);
176
177	e.expire = ev_now () + RSA_TTL;	205	auth_expire = ev_now () + AUTH_TTL;
178	e.id = id;
179	memcpy (&e.chg, &chg, sizeof chg);
180
181	push_back (e);
182
183	if (!cleaner.is_active ())
184	cleaner.again ();
185	}
186
187	rsa_cache ()
188	{
189	cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
190	cleaner.set (RSA_TTL, RSA_TTL);
191	}
192
193	} rsa_cache;
194
195	void rsa_cache::cleaner_cb (ev::timer &w, int revents)
196	{
197	if (empty ())
198	w.stop ();
199	else
200	{
201	for (iterator i = begin (); i != end (); )
202	if (i->expire <= ev_now ())
203	i = erase (i);
204	else
205	++i;
206	}
207	}	206	}
208		207
209	//////////////////////////////////////////////////////////////////////////////	208	//////////////////////////////////////////////////////////////////////////////
210		209
211	pkt_queue::pkt_queue (double max_ttl, int max_queue)	210	pkt_queue::pkt_queue (double max_ttl, int max_queue)
…		…
225	delete p;	224	delete p;
226		225
227	delete [] queue;	226	delete [] queue;
228	}	227	}
229		228
		229	void
230	void pkt_queue::expire_cb (ev::timer &w, int revents)	230	pkt_queue::expire_cb (ev::timer &w, int revents)
231	{	231	{
232	ev_tstamp expire = ev_now () - max_ttl;	232	ev_tstamp expire = ev_now () - max_ttl;
233		233
234	for (;;)	234	for (;;)
235	{	235	{
…		…
246		246
247	delete get ();	247	delete get ();
248	}	248	}
249	}	249	}
250		250
		251	void
251	void pkt_queue::put (net_packet *p)	252	pkt_queue::put (net_packet *p)
252	{	253	{
253	ev_tstamp now = ev_now ();	254	ev_tstamp now = ev_now ();
254		255
255	// start expiry timer	256	// start expiry timer
256	if (empty ())	257	if (empty ())
…		…
265	queue[i].tstamp = now;	266	queue[i].tstamp = now;
266		267
267	i = ni;	268	i = ni;
268	}	269	}
269		270
270	net_packet *pkt_queue::get ()	271	net_packet *
		272	pkt_queue::get ()
271	{	273	{
272	if (empty ())	274	if (empty ())
273	return 0;	275	return 0;
274		276
275	net_packet *p = queue[j].pkt;	277	net_packet *p = queue[j].pkt;
…		…
299		301
300	bool can (const sockinfo &si) { return can((u32)si.host); }	302	bool can (const sockinfo &si) { return can((u32)si.host); }
301	bool can (u32 host);	303	bool can (u32 host);
302	};	304	};
303		305
304	net_rate_limiter auth_rate_limiter, reset_rate_limiter;	306	static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
305		307
		308	bool
306	bool net_rate_limiter::can (u32 host)	309	net_rate_limiter::can (u32 host)
307	{	310	{
308	iterator i;	311	iterator i;
309		312
310	for (i = begin (); i != end (); )	313	for (i = begin (); i != end (); )
311	if (i->host == host)	314	if (i->host == host)
…		…
356	}	359	}
357	}	360	}
358		361
359	/////////////////////////////////////////////////////////////////////////////	362	/////////////////////////////////////////////////////////////////////////////
360		363
361	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];	364	void
362
363	void hmac_packet::hmac_gen (crypto_ctx *ctx)	365	hmac_packet::hmac_gen (crypto_ctx ctx, u8 hmac_digest)
364	{	366	{
365	unsigned int xlen;
366
367	HMAC_CTX *hctx = &ctx->hctx;	367	HMAC_CTX *hctx = &ctx->hctx;
368		368
369	HMAC_Init_ex (hctx, 0, 0, 0, 0);	369	require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
370	HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),	370	require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
371	len - sizeof (hmac_packet));	371	require (HMAC_Final (hctx, hmac_digest, 0));
372	HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
373	}	372	}
374		373
375	void	374	void
376	hmac_packet::hmac_set (crypto_ctx *ctx)	375	hmac_packet::hmac_set (crypto_ctx *ctx)
377	{	376	{
378	hmac_gen (ctx);	377	unsigned char hmac_digest[EVP_MAX_MD_SIZE];
379		378	hmac_gen (ctx, hmac_digest);
380	memcpy (hmac, hmac_digest, HMACLENGTH);	379	memcpy (hmac, hmac_digest, HMACLENGTH);
381	}	380	}
382		381
383	bool	382	bool
384	hmac_packet::hmac_chk (crypto_ctx *ctx)	383	hmac_packet::hmac_chk (crypto_ctx *ctx)
385	{	384	{
386	hmac_gen (ctx);	385	unsigned char hmac_digest[EVP_MAX_MD_SIZE];
387		386	hmac_gen (ctx, hmac_digest);
388	return !memcmp (hmac, hmac_digest, HMACLENGTH);	387	return !memcmp (hmac, hmac_digest, HMACLENGTH);
389	}	388	}
390		389
		390	void
391	void vpn_packet::set_hdr (ptype type_, unsigned int dst)	391	vpn_packet::set_hdr (ptype type_, unsigned int dst)
392	{	392	{
393	type = type_;	393	type = type_;
394		394
395	int src = THISNODE->id;	395	int src = THISNODE->id;
396		396
…		…
401		401
402	#define MAXVPNDATA (MAX_MTU - 6 - 6)	402	#define MAXVPNDATA (MAX_MTU - 6 - 6)
403	#define DATAHDR (sizeof (u32) + RAND_SIZE)	403	#define DATAHDR (sizeof (u32) + RAND_SIZE)
404		404
405	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
406	{	414	{
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	private:
412
413	const u32 data_hdr_size () const
414	{
415	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;	415	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
416	}
417	};	416	}
		417	};
418		418
419	void	419	void
420	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)
421	{	421	{
422	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;	422	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
…		…
424	ptype type = PT_DATA_UNCOMPRESSED;	424	ptype type = PT_DATA_UNCOMPRESSED;
425		425
426	#if ENABLE_COMPRESSION	426	#if ENABLE_COMPRESSION
427	u8 cdata[MAX_MTU];	427	u8 cdata[MAX_MTU];
428		428
429	if (conn->features & ENABLE_COMPRESSION)	429	if (conn->features & FEATURE_COMPRESSION)
430	{	430	{
431	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	431	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
432		432
433	if (cl)	433	if (cl)
434	{	434	{
…		…
440	d[1] = cl;	440	d[1] = cl;
441	}	441	}
442	}	442	}
443	#endif	443	#endif
444		444
445	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));	445	require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
446		446
447	struct {	447	struct {
448	#if RAND_SIZE	448	#if RAND_SIZE
449	u8 rnd[RAND_SIZE];	449	u8 rnd[RAND_SIZE];
450	#endif	450	#endif
451	u32 seqno;	451	u32 seqno;
452	} datahdr;	452	} datahdr;
453		453
454	datahdr.seqno = ntohl (seqno);	454	datahdr.seqno = ntohl (seqno);
455	#if RAND_SIZE	455	#if RAND_SIZE
456	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);
457	#endif	459	#endif
458		460
459	require (EVP_EncryptUpdate (cctx,	461	require (EVP_EncryptUpdate (cctx,
460	(unsigned char *) data + outl, &outl2,	462	(unsigned char *) data + outl, &outl2,
461	(unsigned char *) &datahdr, DATAHDR));	463	(unsigned char *) &datahdr, DATAHDR));
…		…
483	int outl = 0, outl2;	485	int outl = 0, outl2;
484	tap_packet *p = new tap_packet;	486	tap_packet *p = new tap_packet;
485	u8 *d;	487	u8 *d;
486	u32 l = len - data_hdr_size ();	488	u32 l = len - data_hdr_size ();
487		489
488	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));	490	require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
489		491
490	#if ENABLE_COMPRESSION	492	#if ENABLE_COMPRESSION
491	u8 cdata[MAX_MTU];	493	u8 cdata[MAX_MTU];
492		494
493	if (type == PT_DATA_COMPRESSED)	495	if (type == PT_DATA_COMPRESSED)
494	d = cdata;	496	d = cdata;
495	else	497	else
496	#endif	498	#endif
497	d = &(*p)[6 + 6 - DATAHDR];	499	d = &(*p)[6 + 6] - DATAHDR;
498		500
499	/* 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
500	require (EVP_DecryptUpdate (cctx,	508	require (EVP_DecryptUpdate (cctx,
501	d, &outl2,	509	d, &outl2,
502	(unsigned char *)&data, len - data_hdr_size ()));	510	(unsigned char *)&data, len - data_hdr_size ()));
503	outl += outl2;	511	outl += outl2;
504		512
…		…
535	}	543	}
536	};	544	};
537		545
538	struct config_packet : vpn_packet	546	struct config_packet : vpn_packet
539	{	547	{
540	// actually, hmaclen cannot be checked because the hmac	548	u8 serial[SERIAL_SIZE];
541	// field comes before this data, so peers with other
542	// hmacs simply will not work.
543	u8 prot_major, prot_minor, randsize, hmaclen;	549	u8 prot_major, prot_minor, randsize;
544	u8 flags, challengelen, features, pad3;	550	u8 flags, features, pad6, pad7, pad8;
545	u32 cipher_nid, digest_nid, hmac_nid;	551	u32 cipher_nid, mac_nid, auth_nid;
546		552
547	void setup (ptype type, int dst);	553	void setup (ptype type, int dst);
548	bool chk_config () const;	554	bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
549		555
550	static u8 get_features ()	556	static u8 get_features ()
551	{	557	{
552	u8 f = 0;	558	u8 f = 0;
553	#if ENABLE_COMPRESSION	559	#if ENABLE_COMPRESSION
…		…
561	#endif	567	#endif
562	return f;	568	return f;
563	}	569	}
564	};	570	};
565		571
		572	void
566	void config_packet::setup (ptype type, int dst)	573	config_packet::setup (ptype type, int dst)
567	{	574	{
568	prot_major = PROTOCOL_MAJOR;	575	prot_major = PROTOCOL_MAJOR;
569	prot_minor = PROTOCOL_MINOR;	576	prot_minor = PROTOCOL_MINOR;
570	randsize = RAND_SIZE;	577	randsize = RAND_SIZE;
571	hmaclen = HMACLENGTH;
572	flags = 0;	578	flags = 0;
573	challengelen = sizeof (rsachallenge);
574	features = get_features ();	579	features = get_features ();
575		580
		581	strncpy ((char *)serial, conf.serial, sizeof (serial));
		582
576	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	583	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
577	digest_nid = htonl (EVP_MD_type (RSA_HASH));
578	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 ()));
579		586
580	len = sizeof (*this) - sizeof (net_packet);	587	len = sizeof (*this) - sizeof (net_packet);
581	set_hdr (type, dst);	588	set_hdr (type, dst);
582	}	589	}
583		590
584	bool config_packet::chk_config () const	591	bool
		592	config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
585	{	593	{
586	if (prot_major != PROTOCOL_MAJOR)	594	if (prot_major != PROTOCOL_MAJOR)
587	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);
588	else if (randsize != RAND_SIZE)	597	else if (randsize != RAND_SIZE)
589	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)"),
590	else if (hmaclen != HMACLENGTH)	599	conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
591	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
592	else if (challengelen != sizeof (rsachallenge))
593	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
594	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	600	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
595	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)"),
596	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	602	conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
597	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
598	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	603	else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
599	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 ()));
600	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)
601	return true;	617	return true;
		618	}
602		619
603	return false;	620	return false;
604	}	621	}
605		622
606	struct auth_req_packet : config_packet	623	struct auth_req_packet : config_packet // UNPROTECTED
607	{	624	{
608	char magic[8];	625	char magic[8];
609	u8 initiate; // false if this is just an automatic reply	626	u8 initiate; // false if this is just an automatic reply
610	u8 protocols; // supported protocols (will be patched on forward)	627	u8 protocols; // supported protocols (will be patched on forward)
611	u8 pad2, pad3;	628	u8 pad2, pad3;
612	rsaid id;	629	auth_encr encr;
613	rsaencrdata encr;
614		630
615	auth_req_packet (int dst, bool initiate_, u8 protocols_)	631	auth_req_packet (int dst, bool initiate_, u8 protocols_)
616	{	632	{
617	config_packet::setup (PT_AUTH_REQ, dst);	633	config_packet::setup (PT_AUTH_REQ, dst);
618	strncpy (magic, MAGIC, 8);	634	memcpy (magic, MAGIC, 8);
619	initiate = !!initiate_;	635	initiate = !!initiate_;
620	protocols = protocols_;	636	protocols = protocols_;
621		637
622	len = sizeof (*this) - sizeof (net_packet);	638	len = sizeof (*this) - sizeof (net_packet);
623	}	639	}
624	};	640	};
625		641
626	struct auth_res_packet : config_packet	642	struct auth_res_packet : vpn_packet // UNPROTECTED
627	{	643	{
628	rsaid id;
629	u8 pad1, pad2, pad3;
630	u8 response_len; // encrypted length
631	rsaresponse response;	644	auth_response response;
632		645
633	auth_res_packet (int dst)	646	auth_res_packet (int dst)
634	{	647	{
635	config_packet::setup (PT_AUTH_RES, dst);	648	set_hdr (PT_AUTH_RES, dst);
636		649
637	len = sizeof (*this) - sizeof (net_packet);	650	len = sizeof (*this) - sizeof (net_packet);
638	}	651	}
639	};	652	};
640		653
…		…
670	};	683	};
671		684
672	/////////////////////////////////////////////////////////////////////////////	685	/////////////////////////////////////////////////////////////////////////////
673		686
674	void	687	void
675	connection::connection_established ()	688	connection::connection_established (const sockinfo &rsi)
676	{	689	{
677	slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);	690	if (!have_snd_auth \|\| !have_rcv_auth)
		691	return;
678		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
679	if (ictx && octx)	723	if (ictx && octx)
680	{	724	{
681	// make sure rekeying timeouts are slightly asymmetric	725	while (tap_packet p = (tap_packet )data_queue.get ())
682	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
683	rekey.start (rekey_interval, rekey_interval);
684	keepalive.start (::conf.keepalive);
685
686	// send queued packets
687	if (ictx && octx)
688	{	726	{
689	while (tap_packet p = (tap_packet )data_queue.get ())
690	{
691	if (p->len) send_data_packet (p);	727	if (p->len) send_data_packet (p);
692	delete p;	728	delete p;
693	}
694
695	while (vpn_packet p = (vpn_packet )vpn_queue.get ())
696	{
697	if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
698	delete p;
699	}
700	}	729	}
701		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	}
		736	}
		737
702	vpn->connection_established (this);	738	vpn->connection_established (this);
703	}
704	else
705	{
706	retry_cnt = 0;
707	establish_connection.start (5);
708	keepalive.stop ();
709	rekey.stop ();
710	}
711	}	739	}
712		740
713	void	741	void
714	connection::reset_si ()	742	connection::reset_si ()
715	{	743	{
…		…
761	ping_packet *pkt = new ping_packet;	789	ping_packet *pkt = new ping_packet;
762		790
763	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);
764		792
765	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);	793	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
766
767	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	794	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
768		795
769	delete pkt;	796	delete pkt;
770	}	797	}
771		798
…		…
786	void	813	void
787	connection::send_auth_request (const sockinfo &si, bool initiate)	814	connection::send_auth_request (const sockinfo &si, bool initiate)
788	{	815	{
789	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);
790		817
791	rsachallenge chg;	818	generate_auth_data ();
792	rsa_cache.gen (pkt->id, chg);
793	rsa_encrypt (conf->rsa_key, chg, pkt->encr);	819	auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
794		820
795	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);	821	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
796
797	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
798		823
799	delete pkt;	824	delete pkt;
800	}	825	}
801		826
802	void	827	void
803	connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)	828	connection::send_auth_response (const sockinfo &si)
804	{	829	{
805	auth_res_packet *pkt = new auth_res_packet (conf->id);	830	auth_res_packet *pkt = new auth_res_packet (conf->id);
806		831
807	pkt->id = id;	832	memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
808		833	auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
809	rsa_hash (id, chg, pkt->response);
810
811	pkt->hmac_set (octx);
812		834
813	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);	835	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
814
815	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
816		837
817	delete pkt;	838	delete pkt;
818	}	839	}
819		840
820	void	841	void
821	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	842	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
822	{	843	{
823	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,	844	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
824	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);	845	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
		846	conf->protocols);
825		847
826	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);
827		849
828	r->hmac_set (octx);	850	r->hmac_set (octx);
829	send_vpn_packet (r, si);	851	send_vpn_packet (r, si);
…		…
832	}	854	}
833		855
834	inline void	856	inline void
835	connection::establish_connection_cb (ev::timer &w, int revents)	857	connection::establish_connection_cb (ev::timer &w, int revents)
836	{	858	{
837	if (!ictx	859	if (!(ictx && octx)
838	&& conf != THISNODE	860	&& conf != THISNODE
839	&& connectmode != conf_node::C_NEVER	861	&& connectmode != conf_node::C_NEVER
840	&& connectmode != conf_node::C_DISABLED	862	&& connectmode != conf_node::C_DISABLED
841	&& !w.is_active ())	863	&& !w.is_active ())
842	{	864	{
…		…
910	}	932	}
911	}	933	}
912		934
913	delete ictx; ictx = 0;	935	delete ictx; ictx = 0;
914	delete octx; octx = 0;	936	delete octx; octx = 0;
915	#if ENABLE_DNS
916	dnsv4_reset_connection ();
917	#endif
918		937
919	si.host = 0;	938	si.host = 0;
		939
		940	have_snd_auth = false;
		941	have_rcv_auth = false;
		942	auth_expire = 0.;
920		943
921	last_activity = 0.;	944	last_activity = 0.;
922	//last_si_change = 0.;	945	//last_si_change = 0.;
923	retry_cnt = 0;	946	retry_cnt = 0;
924		947
…		…
983	data_queue.put (new tap_packet (*pkt));	1006	data_queue.put (new tap_packet (*pkt));
984	post_inject_queue ();	1007	post_inject_queue ();
985	}	1008	}
986	}	1009	}
987		1010
		1011	void
988	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)	1012	connection::inject_vpn_packet (vpn_packet *pkt, int tos)
989	{	1013	{
990	if (ictx && octx)	1014	if (ictx && octx)
991	send_vpn_packet (pkt, si, tos);	1015	send_vpn_packet (pkt, si, tos);
992	else	1016	else
993	{	1017	{
…		…
999	void	1023	void
1000	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	1024	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
1001	{	1025	{
1002	last_activity = ev_now ();	1026	last_activity = ev_now ();
1003		1027
1004	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",	1028	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
1005	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());	1029	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1006		1030
1007	if (connectmode == conf_node::C_DISABLED)	1031	if (connectmode == conf_node::C_DISABLED)
1008	return;	1032	return;
1009		1033
…		…
1019	{	1043	{
1020	if (auth_rate_limiter.can (rsi))	1044	if (auth_rate_limiter.can (rsi))
1021	send_auth_request (rsi, true);	1045	send_auth_request (rsi, true);
1022	}	1046	}
1023	else	1047	else
1024	// we would love to change thre socket address here, but ping's aren't	1048	// we would love to change the socket address here, but ping's aren't
1025	// authenticated, so we best ignore it.	1049	// authenticated, so we best ignore it.
1026	send_ping (rsi, 1); // pong	1050	send_ping (rsi, 1); // pong
1027		1051
1028	break;	1052	break;
1029		1053
1030	case vpn_packet::PT_PONG:	1054	case vpn_packet::PT_PONG:
1031	slog (L_TRACE, "%s >> PT_PONG", conf->nodename);	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 ();
1032	break;	1060	break;
1033		1061
1034	case vpn_packet::PT_RESET:	1062	case vpn_packet::PT_RESET:
1035	{	1063	{
1036	reset_connection ();	1064	reset_connection ();
1037		1065
1038	config_packet p = (config_packet ) pkt;	1066	config_packet p = (config_packet ) pkt;
1039		1067
1040	if (!p->chk_config ())	1068	if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
1041	{
1042	slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
1043	conf->nodename, (const char *)rsi);
1044	connectmode = conf_node::C_DISABLED;
1045	}
1046	else if (connectmode == conf_node::C_ALWAYS)
1047	establish_connection ();	1069	establish_connection ();
1048	}	1070	}
1049	break;	1071	break;
1050		1072
1051	case vpn_packet::PT_AUTH_REQ:	1073	case vpn_packet::PT_AUTH_REQ:
1052	if (auth_rate_limiter.can (rsi))	1074	if (auth_rate_limiter.can (rsi))
1053	{	1075	{
1054	auth_req_packet p = (auth_req_packet ) pkt;	1076	auth_req_packet p = (auth_req_packet )pkt;
1055		1077
1056	slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");	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);
1057		1081
1058	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))
1059	{	1088	{
1060	if (p->prot_minor != PROTOCOL_MINOR)	1089	if (p->prot_minor != PROTOCOL_MINOR)
1061	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."),
1062	conf->nodename, (const char *)rsi,	1091	conf->nodename, (const char *)rsi,
1063	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1092	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1064		1093
1065	if (p->initiate)	1094	if (p->initiate)
1066	send_auth_request (rsi, false);	1095	send_auth_request (rsi, false);
1067		1096
1068	rsachallenge k;	1097	auth_data auth;
1069		1098
1070	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))	1099	if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1071	{	1100	{
1072	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?"),
1073	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));
1074	break;
1075	}	1103	}
1076	else	1104	else
1077	{	1105	{
1078	delete octx;	1106	bool chg = !have_rcv_auth \|\| memcmp (&rcv_auth, &auth, sizeof auth);
1079		1107
1080	octx = new crypto_ctx (k, 1);	1108	rcv_auth = auth;
1081	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	1109	have_rcv_auth = true;
1082		1110
		1111	send_auth_response (rsi);
		1112
		1113	if (chg)
		1114	{
1083	conf->protocols = p->protocols;	1115	conf->protocols = p->protocols;
1084	features = p->features & config_packet::get_features ();	1116	features = p->features & config_packet::get_features ();
1085		1117
1086	send_auth_response (rsi, p->id, k);
1087
1088	connection_established ();	1118	connection_established (rsi);
1089
1090	break;	1119	}
1091	}	1120	}
		1121
		1122	break;
1092	}	1123	}
1093	else
1094	slog (L_WARN, _("%s(%s): protocol mismatch."),
1095	conf->nodename, (const char *)rsi);
1096		1124
1097	send_reset (rsi);	1125	send_reset (rsi);
1098	}	1126	}
1099		1127
1100	break;	1128	break;
…		…
1103	{	1131	{
1104	auth_res_packet p = (auth_res_packet )pkt;	1132	auth_res_packet p = (auth_res_packet )pkt;
1105		1133
1106	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);	1134	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1107		1135
1108	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))
1109	{	1140	{
1110	if (p->prot_minor != PROTOCOL_MINOR)
1111	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1112	conf->nodename, (const char *)rsi,
1113	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1114
1115	rsachallenge chg;
1116
1117	if (!rsa_cache.find (p->id, chg))
1118	{
1119	slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),	1141	slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1120	conf->nodename, (const char *)rsi);	1142	conf->nodename, (const char *)rsi);
1121	break;
1122	}	1143	}
1123	else	1144	else if (!have_snd_auth)
1124	{	1145	{
1125	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1146	memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1126		1147
1127	if (!p->hmac_chk (cctx))	1148	have_snd_auth = true;
1128	{
1129	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1130	"could be an attack, or just corruption or a synchronization error."),
1131	conf->nodename, (const char *)rsi);
1132	break;
1133	}
1134	else
1135	{
1136	rsaresponse h;
1137
1138	rsa_hash (p->id, chg, h);
1139
1140	if (!memcmp ((u8 )&h, (u8 )p->response, sizeof h))
1141	{
1142	prot_minor = p->prot_minor;
1143
1144	delete ictx; ictx = cctx;
1145
1146	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1147
1148	si = rsi;
1149	protocol = rsi.prot;
1150
1151	slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1152	conf->nodename, (const char *)rsi,
1153	is_direct ? "direct" : "forwarded",
1154	p->prot_major, p->prot_minor);
1155
1156	connection_established ();	1149	connection_established (rsi);
1157
1158	if (::conf.script_node_up)
1159	{
1160	run_script_cb *cb = new run_script_cb;
1161	cb->set<connection, &connection::script_node_up> (this);
1162	run_script_queued (cb, _("node-up command execution failed, continuing."));
1163	}
1164
1165	break;
1166	}
1167	else
1168	slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1169	conf->nodename, (const char *)rsi);
1170	}
1171
1172	delete cctx;
1173	}
1174	}	1150	}
1175	}	1151	}
1176
1177	send_reset (rsi);
1178	break;	1152	break;
1179		1153
1180	case vpn_packet::PT_DATA_COMPRESSED:	1154	case vpn_packet::PT_DATA_COMPRESSED:
1181	#if !ENABLE_COMPRESSION	1155	#if !ENABLE_COMPRESSION
1182	send_reset (rsi);	1156	send_reset (rsi);
…		…
1210	// {	1184	// {
1211	slog (L_INFO, _("%s(%s): changing socket address to %s."),	1185	slog (L_INFO, _("%s(%s): changing socket address to %s."),
1212	conf->nodename, (const char )si, (const char )rsi);	1186	conf->nodename, (const char )si, (const char )rsi);
1213		1187
1214	si = rsi;	1188	si = rsi;
		1189
		1190	if (::conf.script_node_change)
		1191	{
		1192	run_script_cb *cb = new run_script_cb;
		1193	cb->set<connection, &connection::script_node_change> (this);
		1194	run_script_queued (cb, _("node-change command execution failed, continuing."));
		1195	}
		1196
1215	// }	1197	// }
1216	//else	1198	//else
1217	// slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),	1199	// slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1218	// conf->nodename, (const char )si, (const char )rsi);	1200	// conf->nodename, (const char )si, (const char )rsi);
1219	}	1201	}
…		…
1240	break;	1222	break;
1241		1223
1242	case vpn_packet::PT_CONNECT_REQ:	1224	case vpn_packet::PT_CONNECT_REQ:
1243	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1225	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1244	{	1226	{
1245	connect_req_packet p = (connect_req_packet ) pkt;	1227	connect_req_packet p = (connect_req_packet )pkt;
1246		1228
1247	if (p->id > 0 && p->id <= vpn->conns.size ())	1229	if (p->id > 0 && p->id <= vpn->conns.size ())
1248	{	1230	{
1249	connection *c = vpn->conns[p->id - 1];	1231	connection *c = vpn->conns[p->id - 1];
1250	conf->protocols = p->protocols;	1232	conf->protocols = p->protocols;
1251		1233
1252	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",	1234	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1253	conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);	1235	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
		1236	p->protocols,
		1237	c->ictx && c->octx);
1254		1238
1255	if (c->ictx && c->octx)	1239	if (c->ictx && c->octx)
1256	{	1240	{
1257	// send connect_info packets to both sides, in case one is	1241	// send connect_info packets to both sides, in case one is
1258	// behind a nat firewall (or both ;)	1242	// behind a nat firewall (or both ;)
…		…
1281		1265
1282	c->conf->protocols = p->protocols;	1266	c->conf->protocols = p->protocols;
1283	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1267	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1284	p->si.upgrade_protocol (protocol, c->conf);	1268	p->si.upgrade_protocol (protocol, c->conf);
1285		1269
1286	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",	1270	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
		1271	conf->nodename,
1287	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,	1272	vpn->conns[p->id - 1]->conf->nodename,
		1273	(const char *)p->si,
		1274	p->protocols,
		1275	protocol,
		1276	p->si.supported_protocols (c->conf),
1288	(const char *)p->si, !c->ictx && !c->octx);	1277	!c->ictx && !c->octx);
1289		1278
1290	const sockinfo &dsi = forward_si (p->si);	1279	const sockinfo &dsi = forward_si (p->si);
1291		1280
1292	if (dsi.valid ())	1281	if (dsi.valid ())
1293	c->send_auth_request (dsi, true);	1282	c->send_auth_request (dsi, true);
		1283	else
		1284	slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
		1285	vpn->conns[p->id - 1]->conf->nodename,
		1286	(const char *)p->si);
1294	}	1287	}
1295	else	1288	else
1296	slog (L_WARN,	1289	slog (L_WARN,
1297	_("received authenticated connection request from unknown node #%d, config file mismatch?"),	1290	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
1298	p->id);	1291	p->id);
…		…
1307	}	1300	}
1308		1301
1309	inline void	1302	inline void
1310	connection::keepalive_cb (ev::timer &w, int revents)	1303	connection::keepalive_cb (ev::timer &w, int revents)
1311	{	1304	{
1312	if (ev_now () >= last_activity + ::conf.keepalive + 30)	1305	ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
		1306
		1307	if (when >= 0)
		1308	w.start (when);
		1309	else if (when < -15)
1313	{	1310	{
1314	reset_connection ();	1311	reset_connection ();
1315	establish_connection ();	1312	establish_connection ();
1316	}	1313	}
1317	else if (ev_now () < last_activity + ::conf.keepalive)
1318	w.start (last_activity + ::conf.keepalive - ev::now ());
1319	else if (conf->connectmode != conf_node::C_ONDEMAND	1314	else if (conf->connectmode != conf_node::C_ONDEMAND
1320	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1315	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1321	{	1316	{
		1317	w.start (3);
1322	send_ping (si);	1318	send_ping (si);
1323	w.start (5);
1324	}	1319	}
1325	else if (ev_now () < last_activity + ::conf.keepalive + 10)	1320	else if (when >= -10)
1326	// hold ondemand connections implicitly a few seconds longer	1321	// hold ondemand connections implicitly a few seconds longer
1327	// should delete octx, though, or something like that ;)	1322	// should delete octx, though, or something like that ;)
1328	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());	1323	w.start (when + 10);
1329	else	1324	else
1330	reset_connection ();	1325	reset_connection ();
1331	}	1326	}
1332		1327
		1328	void
1333	void connection::send_connect_request (int id)	1329	connection::send_connect_request (int id)
1334	{	1330	{
1335	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1331	connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1336		1332
1337	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",	1333	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1338	conf->nodename, vpn->conns[id - 1]->conf->nodename);	1334	conf->nodename, vpn->conns[id - 1]->conf->nodename,
		1335	THISNODE->protocols);
1339	p->hmac_set (octx);	1336	p->hmac_set (octx);
1340	send_vpn_packet (p, si);	1337	send_vpn_packet (p, si);
1341		1338
1342	delete p;	1339	delete p;
1343	}	1340	}
1344		1341
		1342	void
1345	void connection::script_init_env (const char *ext)	1343	connection::script_init_env (const char *ext)
1346	{	1344	{
1347	char *env;	1345	char *env;
1348	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);	1346	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1349	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);	1347	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1350	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,	1348	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1351	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,	1349	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1352	conf->id & 0xff); putenv (env);	1350	conf->id & 0xff); putenv (env);
1353	}	1351	}
1354		1352
		1353	void
1355	void connection::script_init_connect_env ()	1354	connection::script_init_connect_env ()
1356	{	1355	{
1357	vpn->script_init_env ();	1356	vpn->script_init_env ();
1358		1357
1359	char *env;	1358	char *env;
1360	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1359	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
		1360	asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1361	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1361	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1362	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1362	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1363	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1363	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1364	}	1364	}
1365		1365
1366	inline const char *	1366	inline const char *
1367	connection::script_node_up ()	1367	connection::script_node_up ()
1368	{	1368	{
…		…
1373	char *filename;	1373	char *filename;
1374	asprintf (&filename,	1374	asprintf (&filename,
1375	"%s/%s",	1375	"%s/%s",
1376	confbase,	1376	confbase,
1377	::conf.script_node_up ? ::conf.script_node_up : "node-up");	1377	::conf.script_node_up ? ::conf.script_node_up : "node-up");
		1378
		1379	return filename;
		1380	}
		1381
		1382	inline const char *
		1383	connection::script_node_change ()
		1384	{
		1385	script_init_connect_env ();
		1386
		1387	putenv ((char *)"STATE=change");
		1388
		1389	char *filename;
		1390	asprintf (&filename,
		1391	"%s/%s",
		1392	confbase,
		1393	::conf.script_node_change ? ::conf.script_node_change : "node-change");
1378		1394
1379	return filename;	1395	return filename;
1380	}	1396	}
1381		1397
1382	inline const char *	1398	inline const char *
…		…
1408	establish_connection.set<connection, &connection::establish_connection_cb> (this);	1424	establish_connection.set<connection, &connection::establish_connection_cb> (this);
1409		1425
1410	last_establish_attempt = 0.;	1426	last_establish_attempt = 0.;
1411	octx = ictx = 0;	1427	octx = ictx = 0;
1412		1428
1413	if (!conf->protocols) // make sure some protocol is enabled
1414	conf->protocols = PROT_UDPv4;
1415
1416	connectmode = conf->connectmode;	1429	connectmode = conf->connectmode;
1417		1430
1418	// queue a dummy packet to force an initial connection attempt	1431	// queue a dummy packet to force an initial connection attempt
1419	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)	1432	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1420	vpn_queue.put (new net_packet);	1433	vpn_queue.put (new net_packet);
…		…
1425	connection::~connection ()	1438	connection::~connection ()
1426	{	1439	{
1427	shutdown ();	1440	shutdown ();
1428	}	1441	}
1429		1442
		1443	void
1430	void connection_init ()	1444	connection_init ()
1431	{	1445	{
1432	auth_rate_limiter.clear ();	1446	auth_rate_limiter.clear ();
1433	reset_rate_limiter.clear ();	1447	reset_rate_limiter.clear ();
1434	}	1448	}
1435		1449

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.82 by pcg, Fri Aug 15 18:35:24 2008 UTC vs. Revision 1.106 by root, Fri Jul 19 21:01:16 2013 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.82 by pcg, Fri Aug 15 18:35:24 2008 UTC vs.
Revision 1.106 by root, Fri Jul 19 21:01:16 2013 UTC