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

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC

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

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs. Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC