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

Comparing gvpe/src/connection.C (file contents):
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.47 by pcg, Mon Mar 7 01:31:26 2005 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	10	(at your option) any later version.
9		11
10	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	GNU General Public License for more details.	15	GNU General Public License for more details.
14		16
15	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
16	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
17	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	*/	20	*/
19		21
20	#include "config.h"	22	#include "config.h"
21		23
22	extern "C" {	24	#include <cassert>
23	# include "lzf/lzf.h"
24	}
25		25
26	#include <list>	26	#include <list>
27		27
28	#include <openssl/rand.h>	28	#include <openssl/rand.h>
29	#include <openssl/evp.h>	29	#include <openssl/evp.h>
44	# define RAND_pseudo_bytes RAND_bytes	44	# define RAND_pseudo_bytes RAND_bytes
45	#endif	45	#endif
46		46
47	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	47	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48		48
		49	#define ULTRA_FAST 1
		50	#define HLOG 15
		51	#include "lzf/lzf.h"
		52	#include "lzf/lzf_c.c"
		53	#include "lzf/lzf_d.c"
		54
49	struct crypto_ctx	55	struct crypto_ctx
50	{	56	{
51	EVP_CIPHER_CTX cctx;	57	EVP_CIPHER_CTX cctx;
52	HMAC_CTX hctx;	58	HMAC_CTX hctx;
53		59
…		…
56	};	62	};
57		63
58	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	64	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59	{	65	{
60	EVP_CIPHER_CTX_init (&cctx);	66	EVP_CIPHER_CTX_init (&cctx);
61	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	67	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62	HMAC_CTX_init (&hctx);	68	HMAC_CTX_init (&hctx);
63	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	69	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64	}	70	}
65		71
66	crypto_ctx::~crypto_ctx ()	72	crypto_ctx::~crypto_ctx ()
67	{	73	{
68	EVP_CIPHER_CTX_cleanup (&cctx);	74	require (EVP_CIPHER_CTX_cleanup (&cctx));
69	HMAC_CTX_cleanup (&hctx);	75	HMAC_CTX_cleanup (&hctx);
70	}	76	}
71		77
72	static void	78	static void
73	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	79	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74	{	80	{
75	EVP_MD_CTX ctx;	81	EVP_MD_CTX ctx;
76		82
77	EVP_MD_CTX_init (&ctx);	83	EVP_MD_CTX_init (&ctx);
78	EVP_DigestInit (&ctx, RSA_HASH);	84	require (EVP_DigestInit (&ctx, RSA_HASH));
79	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	85	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80	EVP_DigestUpdate(&ctx, &id, sizeof id);	86	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	87	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82	EVP_MD_CTX_cleanup (&ctx);	88	EVP_MD_CTX_cleanup (&ctx);
83	}	89	}
84		90
85	struct rsa_entry {	91	struct rsa_entry {
86	tstamp expire;	92	tstamp expire;
…		…
134		140
135	} rsa_cache;	141	} rsa_cache;
136		142
137	void rsa_cache::cleaner_cb (time_watcher &w)	143	void rsa_cache::cleaner_cb (time_watcher &w)
138	{	144	{
139	if (empty ())	145	if (!empty ())
140	w.at = TSTAMP_CANCEL;
141	else
142	{	146	{
143	w.at = NOW + RSA_TTL;	147	w.start (NOW + RSA_TTL);
144		148
145	for (iterator i = begin (); i != end (); )	149	for (iterator i = begin (); i != end (); )
146	if (i->expire <= NOW)	150	if (i->expire <= NOW)
147	i = erase (i);	151	i = erase (i);
148	else	152	else
…		…
200	// only do action once every x seconds per host whole allowing bursts.	204	// only do action once every x seconds per host whole allowing bursts.
201	// this implementation ("splay list" ;) is inefficient,	205	// this implementation ("splay list" ;) is inefficient,
202	// but low on resources.	206	// but low on resources.
203	struct net_rate_limiter : list<net_rateinfo>	207	struct net_rate_limiter : list<net_rateinfo>
204	{	208	{
205	static const double ALPHA = 1. - 1. / 600.; // allow bursts	209	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206	static const double CUTOFF = 10.; // one event every CUTOFF seconds	210	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	211	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208	static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value	212	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
209		213
210	bool can (const sockinfo &si) { return can((u32)si.host); }	214	bool can (const sockinfo &si) { return can((u32)si.host); }
211	bool can (u32 host);	215	bool can (u32 host);
212	};	216	};
213		217
…		…
218	iterator i;	222	iterator i;
219		223
220	for (i = begin (); i != end (); )	224	for (i = begin (); i != end (); )
221	if (i->host == host)	225	if (i->host == host)
222	break;	226	break;
223	else if (i->last < NOW - EXPIRE)	227	else if (i->last < NOW - NRL_EXPIRE)
224	i = erase (i);	228	i = erase (i);
225	else	229	else
226	i++;	230	i++;
227		231
228	if (i == end ())	232	if (i == end ())
229	{	233	{
230	net_rateinfo ri;	234	net_rateinfo ri;
231		235
232	ri.host = host;	236	ri.host = host;
233	ri.pcnt = 1.;	237	ri.pcnt = 1.;
234	ri.diff = MAXDIF;	238	ri.diff = NRL_MAXDIF;
235	ri.last = NOW;	239	ri.last = NOW;
236		240
237	push_front (ri);	241	push_front (ri);
238		242
239	return true;	243	return true;
…		…
241	else	245	else
242	{	246	{
243	net_rateinfo ri (*i);	247	net_rateinfo ri (*i);
244	erase (i);	248	erase (i);
245		249
246	ri.pcnt = ri.pcnt * ALPHA;	250	ri.pcnt = ri.pcnt * NRL_ALPHA;
247	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	251	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
248		252
249	ri.last = NOW;	253	ri.last = NOW;
250		254
251	double dif = ri.diff / ri.pcnt;	255	double dif = ri.diff / ri.pcnt;
252		256
253	bool send = dif > CUTOFF;	257	bool send = dif > NRL_CUTOFF;
254		258
255	if (dif > MAXDIF)	259	if (dif > NRL_MAXDIF)
256	{	260	{
257	ri.pcnt = 1.;	261	ri.pcnt = 1.;
258	ri.diff = MAXDIF;	262	ri.diff = NRL_MAXDIF;
259	}	263	}
260	else if (send)	264	else if (send)
261	ri.pcnt++;	265	ri.pcnt++;
262		266
263	push_front (ri);	267	push_front (ri);
…		…
310	}	314	}
311		315
312	#define MAXVPNDATA (MAX_MTU - 6 - 6)	316	#define MAXVPNDATA (MAX_MTU - 6 - 6)
313	#define DATAHDR (sizeof (u32) + RAND_SIZE)	317	#define DATAHDR (sizeof (u32) + RAND_SIZE)
314		318
315	struct vpndata_packet:vpn_packet	319	struct vpndata_packet : vpn_packet
316	{	320	{
317	u8 data[MAXVPNDATA + DATAHDR]; // seqno	321	u8 data[MAXVPNDATA + DATAHDR]; // seqno
318		322
319	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);	323	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
320	tap_packet unpack (connection conn, u32 &seqno);	324	tap_packet unpack (connection conn, u32 &seqno);
…		…
333	int outl = 0, outl2;	337	int outl = 0, outl2;
334	ptype type = PT_DATA_UNCOMPRESSED;	338	ptype type = PT_DATA_UNCOMPRESSED;
335		339
336	#if ENABLE_COMPRESSION	340	#if ENABLE_COMPRESSION
337	u8 cdata[MAX_MTU];	341	u8 cdata[MAX_MTU];
338	u32 cl;
339		342
		343	if (conn->features & ENABLE_COMPRESSION)
		344	{
340	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	345	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		346
341	if (cl)	347	if (cl)
342	{	348	{
343	type = PT_DATA_COMPRESSED;	349	type = PT_DATA_COMPRESSED;
344	d = cdata;	350	d = cdata;
345	l = cl + 2;	351	l = cl + 2;
346		352
347	d[0] = cl >> 8;	353	d[0] = cl >> 8;
348	d[1] = cl;	354	d[1] = cl;
		355	}
349	}	356	}
350	#endif	357	#endif
351		358
352	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	359	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353		360
354	struct {	361	struct {
355	#if RAND_SIZE	362	#if RAND_SIZE
356	u8 rnd[RAND_SIZE];	363	u8 rnd[RAND_SIZE];
357	#endif	364	#endif
…		…
361	datahdr.seqno = ntohl (seqno);	368	datahdr.seqno = ntohl (seqno);
362	#if RAND_SIZE	369	#if RAND_SIZE
363	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	370	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364	#endif	371	#endif
365		372
366	EVP_EncryptUpdate (cctx,	373	require (EVP_EncryptUpdate (cctx,
367	(unsigned char *) data + outl, &outl2,	374	(unsigned char *) data + outl, &outl2,
368	(unsigned char *) &datahdr, DATAHDR);	375	(unsigned char *) &datahdr, DATAHDR));
369	outl += outl2;	376	outl += outl2;
370		377
371	EVP_EncryptUpdate (cctx,	378	require (EVP_EncryptUpdate (cctx,
372	(unsigned char *) data + outl, &outl2,	379	(unsigned char *) data + outl, &outl2,
373	(unsigned char *) d, l);	380	(unsigned char *) d, l));
374	outl += outl2;	381	outl += outl2;
375		382
376	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	383	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377	outl += outl2;	384	outl += outl2;
378		385
379	len = outl + data_hdr_size ();	386	len = outl + data_hdr_size ();
380		387
381	set_hdr (type, dst);	388	set_hdr (type, dst);
…		…
390	int outl = 0, outl2;	397	int outl = 0, outl2;
391	tap_packet *p = new tap_packet;	398	tap_packet *p = new tap_packet;
392	u8 *d;	399	u8 *d;
393	u32 l = len - data_hdr_size ();	400	u32 l = len - data_hdr_size ();
394		401
395	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	402	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396		403
397	#if ENABLE_COMPRESSION	404	#if ENABLE_COMPRESSION
398	u8 cdata[MAX_MTU];	405	u8 cdata[MAX_MTU];
399		406
400	if (type == PT_DATA_COMPRESSED)	407	if (type == PT_DATA_COMPRESSED)
…		…
402	else	409	else
403	#endif	410	#endif
404	d = &(*p)[6 + 6 - DATAHDR];	411	d = &(*p)[6 + 6 - DATAHDR];
405		412
406	/* this overwrites part of the src mac, but we fix that later */	413	/* this overwrites part of the src mac, but we fix that later */
407	EVP_DecryptUpdate (cctx,	414	require (EVP_DecryptUpdate (cctx,
408	d, &outl2,	415	d, &outl2,
409	(unsigned char *)&data, len - data_hdr_size ());	416	(unsigned char *)&data, len - data_hdr_size ()));
410	outl += outl2;	417	outl += outl2;
411		418
412	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	419	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413	outl += outl2;	420	outl += outl2;
414		421
415	seqno = ntohl ((u32 )(d + RAND_SIZE));	422	seqno = ntohl ((u32 )(d + RAND_SIZE));
416		423
417	id2mac (dst () ? dst() : THISNODE->id, p->dst);	424	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
446	{	453	{
447	// actually, hmaclen cannot be checked because the hmac	454	// actually, hmaclen cannot be checked because the hmac
448	// field comes before this data, so peers with other	455	// field comes before this data, so peers with other
449	// hmacs simply will not work.	456	// hmacs simply will not work.
450	u8 prot_major, prot_minor, randsize, hmaclen;	457	u8 prot_major, prot_minor, randsize, hmaclen;
451	u8 flags, challengelen, pad2, pad3;	458	u8 flags, challengelen, features, pad3;
452	u32 cipher_nid, digest_nid, hmac_nid;	459	u32 cipher_nid, digest_nid, hmac_nid;
453
454	const u8 curflags () const
455	{
456	return 0x80
457	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
458	}
459		460
460	void setup (ptype type, int dst);	461	void setup (ptype type, int dst);
461	bool chk_config () const;	462	bool chk_config () const;
		463
		464	static u8 get_features ()
		465	{
		466	u8 f = 0;
		467	#if ENABLE_COMPRESSION
		468	f \|= FEATURE_COMPRESSION;
		469	#endif
		470	#if ENABLE_ROHC
		471	f \|= FEATURE_ROHC;
		472	#endif
		473	return f;
		474	}
462	};	475	};
463		476
464	void config_packet::setup (ptype type, int dst)	477	void config_packet::setup (ptype type, int dst)
465	{	478	{
466	prot_major = PROTOCOL_MAJOR;	479	prot_major = PROTOCOL_MAJOR;
467	prot_minor = PROTOCOL_MINOR;	480	prot_minor = PROTOCOL_MINOR;
468	randsize = RAND_SIZE;	481	randsize = RAND_SIZE;
469	hmaclen = HMACLENGTH;	482	hmaclen = HMACLENGTH;
470	flags = curflags ();	483	flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
471	challengelen = sizeof (rsachallenge);	484	challengelen = sizeof (rsachallenge);
		485	features = get_features ();
472		486
473	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	487	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474	digest_nid = htonl (EVP_MD_type (RSA_HASH));	488	digest_nid = htonl (EVP_MD_type (RSA_HASH));
475	hmac_nid = htonl (EVP_MD_type (DIGEST));	489	hmac_nid = htonl (EVP_MD_type (DIGEST));
476		490
…		…
479	}	493	}
480		494
481	bool config_packet::chk_config () const	495	bool config_packet::chk_config () const
482	{	496	{
483	if (prot_major != PROTOCOL_MAJOR)	497	if (prot_major != PROTOCOL_MAJOR)
484	slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);	498	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485	else if (randsize != RAND_SIZE)	499	else if (randsize != RAND_SIZE)
486	slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);	500	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487	else if (hmaclen != HMACLENGTH)	501	else if (hmaclen != HMACLENGTH)
488	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	502	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
		503	#if 0 // this implementation should handle all flag settings
489	else if (flags != curflags ())	504	else if (flags != curflags ())
490	slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());	505	slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
		506	#endif
491	else if (challengelen != sizeof (rsachallenge))	507	else if (challengelen != sizeof (rsachallenge))
492	slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));	508	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	509	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494	slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	510	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	511	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
496	slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));	512	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
497	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	513	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
498	slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	514	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
499	else	515	else
500	return true;	516	return true;
501		517
502	return false;	518	return false;
503	}	519	}
504		520
505	struct auth_req_packet : config_packet	521	struct auth_req_packet : config_packet
506	{	522	{
507	char magic[8];	523	char magic[8];
508	u8 initiate; // false if this is just an automatic reply	524	u8 initiate; // false if this is just an automatic reply
509	u8 protocols; // supported protocols (will get patches on forward)	525	u8 protocols; // supported protocols (will be patched on forward)
510	u8 pad2, pad3;	526	u8 pad2, pad3;
511	rsaid id;	527	rsaid id;
512	rsaencrdata encr;	528	rsaencrdata encr;
513		529
514	auth_req_packet (int dst, bool initiate_, u8 protocols_)	530	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
575	{	591	{
576	if (ictx && octx)	592	if (ictx && octx)
577	{	593	{
578	connectmode = conf->connectmode;	594	connectmode = conf->connectmode;
579		595
		596	// make sure rekeying timeouts are slightly asymmetric
580	rekey.start (NOW + ::conf.rekey);	597	rekey.start (NOW + ::conf.rekey
		598	+ (conf->id > THISNODE->id ? 10 : 0));
581	keepalive.start (NOW + ::conf.keepalive);	599	keepalive.start (NOW + ::conf.keepalive);
582		600
583	// send queued packets	601	// send queued packets
584	if (ictx && octx)	602	if (ictx && octx)
585	{	603	{
…		…
598	}	616	}
599	else	617	else
600	{	618	{
601	retry_cnt = 0;	619	retry_cnt = 0;
602	establish_connection.start (NOW + 5);	620	establish_connection.start (NOW + 5);
603	keepalive.reset ();	621	keepalive.stop ();
604	rekey.reset ();	622	rekey.stop ();
605	}	623	}
606	}	624	}
607		625
608	void	626	void
609	connection::reset_si ()	627	connection::reset_si ()
…		…
611	protocol = best_protocol (THISNODE->protocols & conf->protocols);	629	protocol = best_protocol (THISNODE->protocols & conf->protocols);
612		630
613	// mask out protocols we cannot establish	631	// mask out protocols we cannot establish
614	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	632	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	633	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		634	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
616		635
617	si.set (conf, protocol);	636	si.set (conf, protocol);
618	}	637	}
619		638
620	// ensure sockinfo is valid, forward if necessary	639	// ensure sockinfo is valid, forward if necessary
…		…
625	{	644	{
626	connection *r = vpn->find_router ();	645	connection *r = vpn->find_router ();
627		646
628	if (r)	647	if (r)
629	{	648	{
630	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	649	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631	conf->nodename, r->conf->nodename);	650	conf->nodename, r->conf->nodename, (const char *)r->si);
632	return r->si;	651	return r->si;
633	}	652	}
634	else	653	else
635	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	654	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636	conf->nodename);	655	conf->nodename);
…		…
675	connection::send_auth_request (const sockinfo &si, bool initiate)	694	connection::send_auth_request (const sockinfo &si, bool initiate)
676	{	695	{
677	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	696	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678		697
679	rsachallenge chg;	698	rsachallenge chg;
680
681	rsa_cache.gen (pkt->id, chg);	699	rsa_cache.gen (pkt->id, chg);
682		700	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
683	if (0 > RSA_public_encrypt (sizeof chg,
684	(unsigned char )&chg, (unsigned char )&pkt->encr,
685	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686	fatal ("RSA_public_encrypt error");
687		701
688	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	702	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
689		703
690	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	704	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
691		705
…		…
725	}	739	}
726		740
727	void	741	void
728	connection::establish_connection_cb (time_watcher &w)	742	connection::establish_connection_cb (time_watcher &w)
729	{	743	{
730	if (ictx \|\| conf == THISNODE	744	if (!ictx
		745	&& conf != THISNODE
731	\|\| connectmode == conf_node::C_NEVER	746	&& connectmode != conf_node::C_NEVER
732	\|\| connectmode == conf_node::C_DISABLED)	747	&& connectmode != conf_node::C_DISABLED
733	w.at = TSTAMP_CANCEL;	748	&& NOW > w.at)
734	else if (w.at <= NOW)
735	{	749	{
736	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	750	w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
737		751
738	if (retry_int < 3600 * 8)	752	double retry_int = double (retry_cnt & 3
739	retry_cnt++;	753	? (retry_cnt & 3) + 1
740		754	: 1 << (retry_cnt >> 2));
741	w.at = NOW + retry_int;
742		755
743	reset_si ();	756	reset_si ();
		757
		758	bool slow = si.prot & PROT_SLOW;
744		759
745	if (si.prot && !si.host)	760	if (si.prot && !si.host)
746	vpn->send_connect_request (conf->id);	761	vpn->send_connect_request (conf->id);
747	else	762	else
748	{	763	{
749	const sockinfo &dsi = forward_si (si);	764	const sockinfo &dsi = forward_si (si);
		765
		766	slow = slow \|\| (dsi.prot & PROT_SLOW);
750		767
751	if (dsi.valid () && auth_rate_limiter.can (dsi))	768	if (dsi.valid () && auth_rate_limiter.can (dsi))
752	{	769	{
753	if (retry_cnt < 4)	770	if (retry_cnt < 4)
754	send_auth_request (dsi, true);	771	send_auth_request (dsi, true);
755	else	772	else
756	send_ping (dsi, 0);	773	send_ping (dsi, 0);
757	}	774	}
758	}	775	}
		776
		777	retry_int *= slow ? 3. : 0.7;
		778
		779	if (retry_int < conf->max_retry)
		780	retry_cnt++;
		781	else
		782	retry_int = conf->max_retry;
		783
		784	w.start (NOW + retry_int);
759	}	785	}
760	}	786	}
761		787
762	void	788	void
763	connection::reset_connection ()	789	connection::reset_connection ()
…		…
771	run_script (run_script_cb (this, &connection::script_node_down), false);	797	run_script (run_script_cb (this, &connection::script_node_down), false);
772	}	798	}
773		799
774	delete ictx; ictx = 0;	800	delete ictx; ictx = 0;
775	delete octx; octx = 0;	801	delete octx; octx = 0;
		802	#if ENABLE_DNS
		803	dnsv4_reset_connection ();
		804	#endif
776		805
777	si.host= 0;	806	si.host = 0;
778		807
779	last_activity = 0;	808	last_activity = 0;
780	retry_cnt = 0;	809	retry_cnt = 0;
781		810
782	rekey.reset ();	811	rekey.stop ();
783	keepalive.reset ();	812	keepalive.stop ();
784	establish_connection.reset ();	813	establish_connection.stop ();
785	}	814	}
786		815
787	void	816	void
788	connection::shutdown ()	817	connection::shutdown ()
789	{	818	{
…		…
794	}	823	}
795		824
796	void	825	void
797	connection::rekey_cb (time_watcher &w)	826	connection::rekey_cb (time_watcher &w)
798	{	827	{
799	w.at = TSTAMP_CANCEL;
800
801	reset_connection ();	828	reset_connection ();
802	establish_connection ();	829	establish_connection ();
803	}	830	}
804		831
805	void	832	void
…		…
839	{	866	{
840	if (ictx && octx)	867	if (ictx && octx)
841	send_vpn_packet (pkt, si, tos);	868	send_vpn_packet (pkt, si, tos);
842	else	869	else
843	{	870	{
844	vpn_queue.put (new vpn_packet (*pkt));	871	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
845		872
846	establish_connection ();	873	establish_connection ();
847	}	874	}
848	}	875	}
849		876
…		…
908	if (p->initiate)	935	if (p->initiate)
909	send_auth_request (rsi, false);	936	send_auth_request (rsi, false);
910		937
911	rsachallenge k;	938	rsachallenge k;
912		939
913	if (0 > RSA_private_decrypt (sizeof (p->encr),	940	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914	(unsigned char )&p->encr, (unsigned char )&k,	941	{
915	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	942	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
917	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));	943	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		944	break;
		945	}
918	else	946	else
919	{	947	{
920	delete octx;	948	delete octx;
921		949
922	octx = new crypto_ctx (k, 1);	950	octx = new crypto_ctx (k, 1);
923	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	951	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
924		952
		953	// compatibility code, remove when no longer required
		954	if (p->flags & 1) p->features \|= FEATURE_COMPRESSION;
		955
925	conf->protocols = p->protocols;	956	conf->protocols = p->protocols;
		957	features = p->features & config_packet::get_features ();
926		958
927	send_auth_response (rsi, p->id, k);	959	send_auth_response (rsi, p->id, k);
928		960
929	connection_established ();	961	connection_established ();
930		962
…		…
966	crypto_ctx *cctx = new crypto_ctx (chg, 0);	998	crypto_ctx *cctx = new crypto_ctx (chg, 0);
967		999
968	if (!p->hmac_chk (cctx))	1000	if (!p->hmac_chk (cctx))
969	{	1001	{
970	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1002	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
971	"could be an attack, or just corruption or an synchronization error"),	1003	"could be an attack, or just corruption or a synchronization error"),
972	conf->nodename, (const char *)rsi);	1004	conf->nodename, (const char *)rsi);
973	break;	1005	break;
974	}	1006	}
975	else	1007	else
976	{	1008	{
…		…
1025	{	1057	{
1026	vpndata_packet p = (vpndata_packet )pkt;	1058	vpndata_packet p = (vpndata_packet )pkt;
1027		1059
1028	if (!p->hmac_chk (ictx))	1060	if (!p->hmac_chk (ictx))
1029	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1061	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1030	"could be an attack, or just corruption or an synchronization error"),	1062	"could be an attack, or just corruption or a synchronization error"),
1031	conf->nodename, (const char *)rsi);	1063	conf->nodename, (const char *)rsi);
1032	else	1064	else
1033	{	1065	{
1034	u32 seqno;	1066	u32 seqno;
1035	tap_packet *d = p->unpack (this, seqno);	1067	tap_packet *d = p->unpack (this, seqno);
…		…
1044	si = rsi;	1076	si = rsi;
1045		1077
1046	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1078	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1047	conf->nodename, (const char )si, (const char )rsi);	1079	conf->nodename, (const char )si, (const char )rsi);
1048	}	1080	}
1049
1050	delete d;
1051
1052	break;
1053	}	1081	}
		1082
		1083	delete d;
		1084	break;
1054	}	1085	}
1055	}	1086	}
1056		1087
1057	send_reset (rsi);	1088	send_reset (rsi);
1058	break;	1089	break;
…		…
1083	break;	1114	break;
1084		1115
1085	case vpn_packet::PT_CONNECT_INFO:	1116	case vpn_packet::PT_CONNECT_INFO:
1086	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1117	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1087	{	1118	{
1088	connect_info_packet p = (connect_info_packet ) pkt;	1119	connect_info_packet p = (connect_info_packet )pkt;
1089		1120
1090	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1121	if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1091		1122	{
1092	connection *c = vpn->conns[p->id - 1];	1123	connection *c = vpn->conns[p->id - 1];
1093		1124
1094	c->conf->protocols = p->protocols;	1125	c->conf->protocols = p->protocols;
1095	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1126	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1096	p->si.upgrade_protocol (protocol, c->conf);	1127	p->si.upgrade_protocol (protocol, c->conf);
1097		1128
1098	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1129	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1099	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1130	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1100		1131
1101	const sockinfo &dsi = forward_si (p->si);	1132	const sockinfo &dsi = forward_si (p->si);
1102		1133
1103	if (dsi.valid ())	1134	if (dsi.valid ())
1104	c->send_auth_request (dsi, true);	1135	c->send_auth_request (dsi, true);
		1136	}
1105	}	1137	}
1106		1138
1107	break;	1139	break;
1108		1140
1109	default:	1141	default:
…		…
1118	{	1150	{
1119	reset_connection ();	1151	reset_connection ();
1120	establish_connection ();	1152	establish_connection ();
1121	}	1153	}
1122	else if (NOW < last_activity + ::conf.keepalive)	1154	else if (NOW < last_activity + ::conf.keepalive)
1123	w.at = last_activity + ::conf.keepalive;	1155	w.start (last_activity + ::conf.keepalive);
1124	else if (conf->connectmode != conf_node::C_ONDEMAND	1156	else if (conf->connectmode != conf_node::C_ONDEMAND
1125	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1157	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1126	{	1158	{
1127	send_ping (si);	1159	send_ping (si);
1128	w.at = NOW + 5;	1160	w.start (NOW + 5);
1129	}	1161	}
1130	else if (NOW < last_activity + ::conf.keepalive + 10)	1162	else if (NOW < last_activity + ::conf.keepalive + 10)
1131	// hold ondemand connections implicitly a few seconds longer	1163	// hold ondemand connections implicitly a few seconds longer
1132	// should delete octx, though, or something like that ;)	1164	// should delete octx, though, or something like that ;)
1133	w.at = last_activity + ::conf.keepalive + 10;	1165	w.start (last_activity + ::conf.keepalive + 10);
1134	else	1166	else
1135	reset_connection ();	1167	reset_connection ();
1136	}	1168	}
1137		1169
1138	void connection::send_connect_request (int id)	1170	void connection::send_connect_request (int id)
…		…
1173	putenv ("STATE=down");	1205	putenv ("STATE=down");
1174		1206
1175	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1207	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1176	}	1208	}
1177		1209
1178	connection::connection(struct vpn *vpn_)	1210	connection::connection (struct vpn vpn, conf_node conf)
1179	: vpn(vpn_)	1211	: vpn(vpn), conf(conf)
1180	, rekey (this, &connection::rekey_cb)	1212	, rekey (this, &connection::rekey_cb)
1181	, keepalive (this, &connection::keepalive_cb)	1213	, keepalive (this, &connection::keepalive_cb)
1182	, establish_connection (this, &connection::establish_connection_cb)	1214	, establish_connection (this, &connection::establish_connection_cb)
		1215	#if ENABLE_DNS
		1216	, dns (0)
		1217	#endif
1183	{	1218	{
1184	octx = ictx = 0;	1219	octx = ictx = 0;
1185	retry_cnt = 0;	1220	retry_cnt = 0;
1186		1221
		1222	if (!conf->protocols) // make sure some protocol is enabled
		1223	conf->protocols = PROT_UDPv4;
		1224
1187	connectmode = conf_node::C_ALWAYS; // initial setting	1225	connectmode = conf_node::C_ALWAYS; // initial setting
1188	reset_connection ();	1226	reset_connection ();
1189	}	1227	}
1190		1228
1191	connection::~connection ()	1229	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs. Revision 1.47 by pcg, Mon Mar 7 01:31:26 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.47 by pcg, Mon Mar 7 01:31:26 2005 UTC