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

Comparing gvpe/src/connection.C (file contents):
Revision 1.26 by pcg, Sat Jan 17 14:08:57 2004 UTC vs.
Revision 1.49 by pcg, Sat Mar 12 18:10:40 2005 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003-2004 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
22	extern "C" {
23	# include "lzf/lzf.h"
24	}
25		23
26	#include <cassert>	24	#include <cassert>
27		25
28	#include <list>	26	#include <list>
29		27
46	# define RAND_pseudo_bytes RAND_bytes	44	# define RAND_pseudo_bytes RAND_bytes
47	#endif	45	#endif
48		46
49	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	47	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
50		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
51	struct crypto_ctx	55	struct crypto_ctx
52	{	56	{
53	EVP_CIPHER_CTX cctx;	57	EVP_CIPHER_CTX cctx;
54	HMAC_CTX hctx;	58	HMAC_CTX hctx;
55		59
…		…
58	};	62	};
59		63
60	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	64	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
61	{	65	{
62	EVP_CIPHER_CTX_init (&cctx);	66	EVP_CIPHER_CTX_init (&cctx);
63	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));
64	HMAC_CTX_init (&hctx);	68	HMAC_CTX_init (&hctx);
65	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);
66	}	70	}
67		71
68	crypto_ctx::~crypto_ctx ()	72	crypto_ctx::~crypto_ctx ()
69	{	73	{
70	EVP_CIPHER_CTX_cleanup (&cctx);	74	require (EVP_CIPHER_CTX_cleanup (&cctx));
71	HMAC_CTX_cleanup (&hctx);	75	HMAC_CTX_cleanup (&hctx);
72	}	76	}
73		77
74	static void	78	static void
75	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	79	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
76	{	80	{
77	EVP_MD_CTX ctx;	81	EVP_MD_CTX ctx;
78		82
79	EVP_MD_CTX_init (&ctx);	83	EVP_MD_CTX_init (&ctx);
80	EVP_DigestInit (&ctx, RSA_HASH);	84	require (EVP_DigestInit (&ctx, RSA_HASH));
81	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	85	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
82	EVP_DigestUpdate(&ctx, &id, sizeof id);	86	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	87	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84	EVP_MD_CTX_cleanup (&ctx);	88	EVP_MD_CTX_cleanup (&ctx);
85	}	89	}
86		90
87	struct rsa_entry {	91	struct rsa_entry {
88	tstamp expire;	92	tstamp expire;
…		…
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 = 0;
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
…		…
484	slog (L_WARN, _("major version mismatch (remote %d <=> local %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 (remote %d <=> local %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 (remote %d <=> local %d)"), hmaclen, HMACLENGTH);	502	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489	else if (flags != curflags ())
490	slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491	else if (challengelen != sizeof (rsachallenge))	503	else if (challengelen != sizeof (rsachallenge))
492	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));	504	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	505	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	506	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)))	507	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
…		…
504		516
505	struct auth_req_packet : config_packet	517	struct auth_req_packet : config_packet
506	{	518	{
507	char magic[8];	519	char magic[8];
508	u8 initiate; // false if this is just an automatic reply	520	u8 initiate; // false if this is just an automatic reply
509	u8 protocols; // supported protocols (will get patches on forward)	521	u8 protocols; // supported protocols (will be patched on forward)
510	u8 pad2, pad3;	522	u8 pad2, pad3;
511	rsaid id;	523	rsaid id;
512	rsaencrdata encr;	524	rsaencrdata encr;
513		525
514	auth_req_packet (int dst, bool initiate_, u8 protocols_)	526	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
575	{	587	{
576	if (ictx && octx)	588	if (ictx && octx)
577	{	589	{
578	connectmode = conf->connectmode;	590	connectmode = conf->connectmode;
579		591
		592	// make sure rekeying timeouts are slightly asymmetric
580	rekey.start (NOW + ::conf.rekey);	593	rekey.start (NOW + ::conf.rekey
		594	+ (conf->id > THISNODE->id ? 10 : 0));
581	keepalive.start (NOW + ::conf.keepalive);	595	keepalive.start (NOW + ::conf.keepalive);
582		596
583	// send queued packets	597	// send queued packets
584	if (ictx && octx)	598	if (ictx && octx)
585	{	599	{
…		…
611	protocol = best_protocol (THISNODE->protocols & conf->protocols);	625	protocol = best_protocol (THISNODE->protocols & conf->protocols);
612		626
613	// mask out protocols we cannot establish	627	// mask out protocols we cannot establish
614	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	628	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	629	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		630	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
616		631
617	si.set (conf, protocol);	632	si.set (conf, protocol);
618	}	633	}
619		634
620	// ensure sockinfo is valid, forward if necessary	635	// ensure sockinfo is valid, forward if necessary
…		…
625	{	640	{
626	connection *r = vpn->find_router ();	641	connection *r = vpn->find_router ();
627		642
628	if (r)	643	if (r)
629	{	644	{
630	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	645	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631	conf->nodename, r->conf->nodename);	646	conf->nodename, r->conf->nodename, (const char *)r->si);
632	return r->si;	647	return r->si;
633	}	648	}
634	else	649	else
635	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	650	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636	conf->nodename);	651	conf->nodename);
…		…
726	&& conf != THISNODE	741	&& conf != THISNODE
727	&& connectmode != conf_node::C_NEVER	742	&& connectmode != conf_node::C_NEVER
728	&& connectmode != conf_node::C_DISABLED	743	&& connectmode != conf_node::C_DISABLED
729	&& NOW > w.at)	744	&& NOW > w.at)
730	{	745	{
731	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	746	w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
732		747
733	if (retry_int < 3600 * 8)	748	double retry_int = double (retry_cnt & 3
734	retry_cnt++;	749	? (retry_cnt & 3) + 1
735		750	: 1 << (retry_cnt >> 2));
736	w.start (NOW + retry_int);
737		751
738	reset_si ();	752	reset_si ();
		753
		754	bool slow = si.prot & PROT_SLOW;
739		755
740	if (si.prot && !si.host)	756	if (si.prot && !si.host)
741	vpn->send_connect_request (conf->id);	757	vpn->send_connect_request (conf->id);
742	else	758	else
743	{	759	{
744	const sockinfo &dsi = forward_si (si);	760	const sockinfo &dsi = forward_si (si);
		761
		762	slow = slow \|\| (dsi.prot & PROT_SLOW);
745		763
746	if (dsi.valid () && auth_rate_limiter.can (dsi))	764	if (dsi.valid () && auth_rate_limiter.can (dsi))
747	{	765	{
748	if (retry_cnt < 4)	766	if (retry_cnt < 4)
749	send_auth_request (dsi, true);	767	send_auth_request (dsi, true);
750	else	768	else
751	send_ping (dsi, 0);	769	send_ping (dsi, 0);
752	}	770	}
753	}	771	}
		772
		773	retry_int *= slow ? 8. : 0.7;
		774
		775	if (retry_int < conf->max_retry)
		776	retry_cnt++;
		777	else
		778	retry_int = conf->max_retry;
		779
		780	w.start (NOW + retry_int);
754	}	781	}
755	}	782	}
756		783
757	void	784	void
758	connection::reset_connection ()	785	connection::reset_connection ()
…		…
766	run_script (run_script_cb (this, &connection::script_node_down), false);	793	run_script (run_script_cb (this, &connection::script_node_down), false);
767	}	794	}
768		795
769	delete ictx; ictx = 0;	796	delete ictx; ictx = 0;
770	delete octx; octx = 0;	797	delete octx; octx = 0;
		798	#if ENABLE_DNS
		799	dnsv4_reset_connection ();
		800	#endif
771		801
772	si.host= 0;	802	si.host = 0;
773		803
774	last_activity = 0;	804	last_activity = 0;
775	retry_cnt = 0;	805	retry_cnt = 0;
776		806
777	rekey.stop ();	807	rekey.stop ();
…		…
832	{	862	{
833	if (ictx && octx)	863	if (ictx && octx)
834	send_vpn_packet (pkt, si, tos);	864	send_vpn_packet (pkt, si, tos);
835	else	865	else
836	{	866	{
837	vpn_queue.put (new vpn_packet (*pkt));	867	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
838		868
839	establish_connection ();	869	establish_connection ();
840	}	870	}
841	}	871	}
842		872
…		…
915		945
916	octx = new crypto_ctx (k, 1);	946	octx = new crypto_ctx (k, 1);
917	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	947	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
918		948
919	conf->protocols = p->protocols;	949	conf->protocols = p->protocols;
		950	features = p->features & config_packet::get_features ();
920		951
921	send_auth_response (rsi, p->id, k);	952	send_auth_response (rsi, p->id, k);
922		953
923	connection_established ();	954	connection_established ();
924		955
…		…
960	crypto_ctx *cctx = new crypto_ctx (chg, 0);	991	crypto_ctx *cctx = new crypto_ctx (chg, 0);
961		992
962	if (!p->hmac_chk (cctx))	993	if (!p->hmac_chk (cctx))
963	{	994	{
964	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	995	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
965	"could be an attack, or just corruption or an synchronization error"),	996	"could be an attack, or just corruption or a synchronization error"),
966	conf->nodename, (const char *)rsi);	997	conf->nodename, (const char *)rsi);
967	break;	998	break;
968	}	999	}
969	else	1000	else
970	{	1001	{
…		…
1019	{	1050	{
1020	vpndata_packet p = (vpndata_packet )pkt;	1051	vpndata_packet p = (vpndata_packet )pkt;
1021		1052
1022	if (!p->hmac_chk (ictx))	1053	if (!p->hmac_chk (ictx))
1023	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1054	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1024	"could be an attack, or just corruption or an synchronization error"),	1055	"could be an attack, or just corruption or a synchronization error"),
1025	conf->nodename, (const char *)rsi);	1056	conf->nodename, (const char *)rsi);
1026	else	1057	else
1027	{	1058	{
1028	u32 seqno;	1059	u32 seqno;
1029	tap_packet *d = p->unpack (this, seqno);	1060	tap_packet *d = p->unpack (this, seqno);
…		…
1038	si = rsi;	1069	si = rsi;
1039		1070
1040	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1071	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1041	conf->nodename, (const char )si, (const char )rsi);	1072	conf->nodename, (const char )si, (const char )rsi);
1042	}	1073	}
1043
1044	delete d;
1045
1046	break;
1047	}	1074	}
		1075
		1076	delete d;
		1077	break;
1048	}	1078	}
1049	}	1079	}
1050		1080
1051	send_reset (rsi);	1081	send_reset (rsi);
1052	break;	1082	break;
…		…
1077	break;	1107	break;
1078		1108
1079	case vpn_packet::PT_CONNECT_INFO:	1109	case vpn_packet::PT_CONNECT_INFO:
1080	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1110	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1081	{	1111	{
1082	connect_info_packet p = (connect_info_packet ) pkt;	1112	connect_info_packet p = (connect_info_packet )pkt;
1083		1113
1084	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1114	if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1085		1115	{
1086	connection *c = vpn->conns[p->id - 1];	1116	connection *c = vpn->conns[p->id - 1];
1087		1117
1088	c->conf->protocols = p->protocols;	1118	c->conf->protocols = p->protocols;
1089	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1119	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1090	p->si.upgrade_protocol (protocol, c->conf);	1120	p->si.upgrade_protocol (protocol, c->conf);
1091		1121
1092	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1122	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1093	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1123	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1094		1124
1095	const sockinfo &dsi = forward_si (p->si);	1125	const sockinfo &dsi = forward_si (p->si);
1096		1126
1097	if (dsi.valid ())	1127	if (dsi.valid ())
1098	c->send_auth_request (dsi, true);	1128	c->send_auth_request (dsi, true);
		1129	}
1099	}	1130	}
1100		1131
1101	break;	1132	break;
1102		1133
1103	default:	1134	default:
…		…
1167	putenv ("STATE=down");	1198	putenv ("STATE=down");
1168		1199
1169	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1200	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1170	}	1201	}
1171		1202
1172	connection::connection(struct vpn *vpn_)	1203	connection::connection (struct vpn vpn, conf_node conf)
1173	: vpn(vpn_)	1204	: vpn(vpn), conf(conf)
1174	, rekey (this, &connection::rekey_cb)	1205	, rekey (this, &connection::rekey_cb)
1175	, keepalive (this, &connection::keepalive_cb)	1206	, keepalive (this, &connection::keepalive_cb)
1176	, establish_connection (this, &connection::establish_connection_cb)	1207	, establish_connection (this, &connection::establish_connection_cb)
		1208	#if ENABLE_DNS
		1209	, dns (0)
		1210	#endif
1177	{	1211	{
1178	octx = ictx = 0;	1212	octx = ictx = 0;
1179	retry_cnt = 0;	1213	retry_cnt = 0;
1180		1214
		1215	if (!conf->protocols) // make sure some protocol is enabled
		1216	conf->protocols = PROT_UDPv4;
		1217
1181	connectmode = conf_node::C_ALWAYS; // initial setting	1218	connectmode = conf_node::C_ALWAYS; // initial setting
1182	reset_connection ();	1219	reset_connection ();
1183	}	1220	}
1184		1221
1185	connection::~connection ()	1222	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.26 by pcg, Sat Jan 17 14:08:57 2004 UTC vs. Revision 1.49 by pcg, Sat Mar 12 18:10:40 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.26 by pcg, Sat Jan 17 14:08:57 2004 UTC vs.
Revision 1.49 by pcg, Sat Mar 12 18:10:40 2005 UTC