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

Comparing gvpe/src/connection.C (file contents):
Revision 1.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	*/	20	*/
18		21
19	#include "config.h"	22	#include "config.h"
20
21	extern "C" {
22	# include "lzf/lzf.h"
23	}
24		23
25	#include <list>	24	#include <list>
26		25
27	#include <openssl/rand.h>	26	#include <openssl/rand.h>
28	#include <openssl/evp.h>	27	#include <openssl/evp.h>
29	#include <openssl/rsa.h>	28	#include <openssl/rsa.h>
30	#include <openssl/err.h>	29	#include <openssl/err.h>
31
32	#include "gettext.h"
33		30
34	#include "conf.h"	31	#include "conf.h"
35	#include "slog.h"	32	#include "slog.h"
36	#include "device.h"	33	#include "device.h"
37	#include "vpn.h"	34	#include "vpn.h"
38	#include "connection.h"	35	#include "connection.h"
39		36
		37	#include "netcompat.h"
		38
40	#if !HAVE_RAND_PSEUDO_BYTES	39	#if !HAVE_RAND_PSEUDO_BYTES
41	# define RAND_pseudo_bytes RAND_bytes	40	# define RAND_pseudo_bytes RAND_bytes
42	#endif	41	#endif
43		42
44	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	43	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45		44
		45	#define ULTRA_FAST 1
		46	#define HLOG 15
		47	#include "lzf/lzf.h"
		48	#include "lzf/lzf_c.c"
		49	#include "lzf/lzf_d.c"
		50
46	struct crypto_ctx	51	struct crypto_ctx
47	{	52	{
48	EVP_CIPHER_CTX cctx;	53	EVP_CIPHER_CTX cctx;
49	HMAC_CTX hctx;	54	HMAC_CTX hctx;
50		55
53	};	58	};
54		59
55	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	60	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56	{	61	{
57	EVP_CIPHER_CTX_init (&cctx);	62	EVP_CIPHER_CTX_init (&cctx);
58	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	63	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59	HMAC_CTX_init (&hctx);	64	HMAC_CTX_init (&hctx);
60	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	65	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61	}	66	}
62		67
63	crypto_ctx::~crypto_ctx ()	68	crypto_ctx::~crypto_ctx ()
64	{	69	{
65	EVP_CIPHER_CTX_cleanup (&cctx);	70	require (EVP_CIPHER_CTX_cleanup (&cctx));
66	HMAC_CTX_cleanup (&hctx);	71	HMAC_CTX_cleanup (&hctx);
67	}	72	}
68		73
69	static void	74	static void
70	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	75	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71	{	76	{
72	EVP_MD_CTX ctx;	77	EVP_MD_CTX ctx;
73		78
74	EVP_MD_CTX_init (&ctx);	79	EVP_MD_CTX_init (&ctx);
75	EVP_DigestInit (&ctx, RSA_HASH);	80	require (EVP_DigestInit (&ctx, RSA_HASH));
76	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	81	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77	EVP_DigestUpdate(&ctx, &id, sizeof id);	82	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	83	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79	EVP_MD_CTX_cleanup (&ctx);	84	EVP_MD_CTX_cleanup (&ctx);
80	}	85	}
81		86
82	struct rsa_entry {	87	struct rsa_entry {
83	tstamp expire;	88	tstamp expire;
…		…
85	rsachallenge chg;	90	rsachallenge chg;
86	};	91	};
87		92
88	struct rsa_cache : list<rsa_entry>	93	struct rsa_cache : list<rsa_entry>
89	{	94	{
90	void cleaner_cb (time_watcher &w); time_watcher cleaner;	95	void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
91		96
92	bool find (const rsaid &id, rsachallenge &chg)	97	bool find (const rsaid &id, rsachallenge &chg)
93	{	98	{
94	for (iterator i = begin (); i != end (); ++i)	99	for (iterator i = begin (); i != end (); ++i)
95	{	100	{
96	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	101	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
97	{	102	{
98	memcpy (&chg, &i->chg, sizeof chg);	103	memcpy (&chg, &i->chg, sizeof chg);
99		104
100	erase (i);	105	erase (i);
101	return true;	106	return true;
102	}	107	}
103	}	108	}
104		109
105	if (cleaner.at < NOW)	110	if (!cleaner.is_active ())
106	cleaner.start (NOW + RSA_TTL);	111	cleaner.again ();
107		112
108	return false;	113	return false;
109	}	114	}
110		115
111	void gen (rsaid &id, rsachallenge &chg)	116	void gen (rsaid &id, rsachallenge &chg)
112	{	117	{
113	rsa_entry e;	118	rsa_entry e;
114		119
115	RAND_bytes ((unsigned char *)&id, sizeof id);	120	RAND_bytes ((unsigned char *)&id, sizeof id);
116	RAND_bytes ((unsigned char *)&chg, sizeof chg);	121	RAND_bytes ((unsigned char *)&chg, sizeof chg);
117		122
118	e.expire = NOW + RSA_TTL;	123	e.expire = ev::ev_now () + RSA_TTL;
119	e.id = id;	124	e.id = id;
120	memcpy (&e.chg, &chg, sizeof chg);	125	memcpy (&e.chg, &chg, sizeof chg);
121		126
122	push_back (e);	127	push_back (e);
123		128
124	if (cleaner.at < NOW)	129	if (!cleaner.is_active ())
125	cleaner.start (NOW + RSA_TTL);	130	cleaner.again ();
126	}	131	}
127		132
128	rsa_cache ()	133	rsa_cache ()
129	: cleaner (this, &rsa_cache::cleaner_cb)	134	: cleaner (this, &rsa_cache::cleaner_cb)
130	{ }	135	{
		136	cleaner.set (RSA_TTL, RSA_TTL);
		137	}
131		138
132	} rsa_cache;	139	} rsa_cache;
133		140
134	void rsa_cache::cleaner_cb (time_watcher &w)	141	void rsa_cache::cleaner_cb (ev::timer &w, int revents)
135	{	142	{
136	if (empty ())	143	if (empty ())
137	w.at = TSTAMP_CANCEL;	144	w.stop ();
138	else	145	else
139	{	146	{
140	w.at = NOW + RSA_TTL;
141
142	for (iterator i = begin (); i != end (); )	147	for (iterator i = begin (); i != end (); )
143	if (i->expire <= NOW)	148	if (i->expire <= ev::ev_now ())
144	i = erase (i);	149	i = erase (i);
145	else	150	else
146	++i;	151	++i;
147	}	152	}
148	}	153	}
…		…
197	// only do action once every x seconds per host whole allowing bursts.	202	// only do action once every x seconds per host whole allowing bursts.
198	// this implementation ("splay list" ;) is inefficient,	203	// this implementation ("splay list" ;) is inefficient,
199	// but low on resources.	204	// but low on resources.
200	struct net_rate_limiter : list<net_rateinfo>	205	struct net_rate_limiter : list<net_rateinfo>
201	{	206	{
202	static const double ALPHA = 1. - 1. / 600.; // allow bursts	207	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203	static const double CUTOFF = 10.; // one event every CUTOFF seconds	208	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	209	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205	static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value	210	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
206		211
207	bool can (const sockinfo &si) { return can((u32)si.host); }	212	bool can (const sockinfo &si) { return can((u32)si.host); }
208	bool can (u32 host);	213	bool can (u32 host);
209	};	214	};
210		215
…		…
215	iterator i;	220	iterator i;
216		221
217	for (i = begin (); i != end (); )	222	for (i = begin (); i != end (); )
218	if (i->host == host)	223	if (i->host == host)
219	break;	224	break;
220	else if (i->last < NOW - EXPIRE)	225	else if (i->last < ev::ev_now () - NRL_EXPIRE)
221	i = erase (i);	226	i = erase (i);
222	else	227	else
223	i++;	228	i++;
224		229
225	if (i == end ())	230	if (i == end ())
226	{	231	{
227	net_rateinfo ri;	232	net_rateinfo ri;
228		233
229	ri.host = host;	234	ri.host = host;
230	ri.pcnt = 1.;	235	ri.pcnt = 1.;
231	ri.diff = MAXDIF;	236	ri.diff = NRL_MAXDIF;
232	ri.last = NOW;	237	ri.last = ev::ev_now ();
233		238
234	push_front (ri);	239	push_front (ri);
235		240
236	return true;	241	return true;
237	}	242	}
238	else	243	else
239	{	244	{
240	net_rateinfo ri (*i);	245	net_rateinfo ri (*i);
241	erase (i);	246	erase (i);
242		247
243	ri.pcnt = ri.pcnt * ALPHA;	248	ri.pcnt = ri.pcnt * NRL_ALPHA;
244	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	249	ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
245		250
246	ri.last = NOW;	251	ri.last = ev::ev_now ();
247		252
248	double dif = ri.diff / ri.pcnt;	253	double dif = ri.diff / ri.pcnt;
249		254
250	bool send = dif > CUTOFF;	255	bool send = dif > NRL_CUTOFF;
251		256
252	if (dif > MAXDIF)	257	if (dif > NRL_MAXDIF)
253	{	258	{
254	ri.pcnt = 1.;	259	ri.pcnt = 1.;
255	ri.diff = MAXDIF;	260	ri.diff = NRL_MAXDIF;
256	}	261	}
257	else if (send)	262	else if (send)
258	ri.pcnt++;	263	ri.pcnt++;
259		264
260	push_front (ri);	265	push_front (ri);
…		…
307	}	312	}
308		313
309	#define MAXVPNDATA (MAX_MTU - 6 - 6)	314	#define MAXVPNDATA (MAX_MTU - 6 - 6)
310	#define DATAHDR (sizeof (u32) + RAND_SIZE)	315	#define DATAHDR (sizeof (u32) + RAND_SIZE)
311		316
312	struct vpndata_packet:vpn_packet	317	struct vpndata_packet : vpn_packet
313	{	318	{
314	u8 data[MAXVPNDATA + DATAHDR]; // seqno	319	u8 data[MAXVPNDATA + DATAHDR]; // seqno
315		320
316	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);	321	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
317	tap_packet unpack (connection conn, u32 &seqno);	322	tap_packet unpack (connection conn, u32 &seqno);
…		…
330	int outl = 0, outl2;	335	int outl = 0, outl2;
331	ptype type = PT_DATA_UNCOMPRESSED;	336	ptype type = PT_DATA_UNCOMPRESSED;
332		337
333	#if ENABLE_COMPRESSION	338	#if ENABLE_COMPRESSION
334	u8 cdata[MAX_MTU];	339	u8 cdata[MAX_MTU];
335	u32 cl;
336		340
		341	if (conn->features & ENABLE_COMPRESSION)
		342	{
337	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	343	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		344
338	if (cl)	345	if (cl)
339	{	346	{
340	type = PT_DATA_COMPRESSED;	347	type = PT_DATA_COMPRESSED;
341	d = cdata;	348	d = cdata;
342	l = cl + 2;	349	l = cl + 2;
343		350
344	d[0] = cl >> 8;	351	d[0] = cl >> 8;
345	d[1] = cl;	352	d[1] = cl;
		353	}
346	}	354	}
347	#endif	355	#endif
348		356
349	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	357	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350		358
351	struct {	359	struct {
352	#if RAND_SIZE	360	#if RAND_SIZE
353	u8 rnd[RAND_SIZE];	361	u8 rnd[RAND_SIZE];
354	#endif	362	#endif
…		…
358	datahdr.seqno = ntohl (seqno);	366	datahdr.seqno = ntohl (seqno);
359	#if RAND_SIZE	367	#if RAND_SIZE
360	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	368	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361	#endif	369	#endif
362		370
363	EVP_EncryptUpdate (cctx,	371	require (EVP_EncryptUpdate (cctx,
364	(unsigned char *) data + outl, &outl2,	372	(unsigned char *) data + outl, &outl2,
365	(unsigned char *) &datahdr, DATAHDR);	373	(unsigned char *) &datahdr, DATAHDR));
366	outl += outl2;	374	outl += outl2;
367		375
368	EVP_EncryptUpdate (cctx,	376	require (EVP_EncryptUpdate (cctx,
369	(unsigned char *) data + outl, &outl2,	377	(unsigned char *) data + outl, &outl2,
370	(unsigned char *) d, l);	378	(unsigned char *) d, l));
371	outl += outl2;	379	outl += outl2;
372		380
373	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	381	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374	outl += outl2;	382	outl += outl2;
375		383
376	len = outl + data_hdr_size ();	384	len = outl + data_hdr_size ();
377		385
378	set_hdr (type, dst);	386	set_hdr (type, dst);
…		…
387	int outl = 0, outl2;	395	int outl = 0, outl2;
388	tap_packet *p = new tap_packet;	396	tap_packet *p = new tap_packet;
389	u8 *d;	397	u8 *d;
390	u32 l = len - data_hdr_size ();	398	u32 l = len - data_hdr_size ();
391		399
392	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	400	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393		401
394	#if ENABLE_COMPRESSION	402	#if ENABLE_COMPRESSION
395	u8 cdata[MAX_MTU];	403	u8 cdata[MAX_MTU];
396		404
397	if (type == PT_DATA_COMPRESSED)	405	if (type == PT_DATA_COMPRESSED)
…		…
399	else	407	else
400	#endif	408	#endif
401	d = &(*p)[6 + 6 - DATAHDR];	409	d = &(*p)[6 + 6 - DATAHDR];
402		410
403	/* this overwrites part of the src mac, but we fix that later */	411	/* this overwrites part of the src mac, but we fix that later */
404	EVP_DecryptUpdate (cctx,	412	require (EVP_DecryptUpdate (cctx,
405	d, &outl2,	413	d, &outl2,
406	(unsigned char *)&data, len - data_hdr_size ());	414	(unsigned char *)&data, len - data_hdr_size ()));
407	outl += outl2;	415	outl += outl2;
408		416
409	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	417	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410	outl += outl2;	418	outl += outl2;
411		419
412	seqno = ntohl ((u32 )(d + RAND_SIZE));	420	seqno = ntohl ((u32 )(d + RAND_SIZE));
413		421
414	id2mac (dst () ? dst() : THISNODE->id, p->dst);	422	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
443	{	451	{
444	// actually, hmaclen cannot be checked because the hmac	452	// actually, hmaclen cannot be checked because the hmac
445	// field comes before this data, so peers with other	453	// field comes before this data, so peers with other
446	// hmacs simply will not work.	454	// hmacs simply will not work.
447	u8 prot_major, prot_minor, randsize, hmaclen;	455	u8 prot_major, prot_minor, randsize, hmaclen;
448	u8 flags, challengelen, pad2, pad3;	456	u8 flags, challengelen, features, pad3;
449	u32 cipher_nid, digest_nid, hmac_nid;	457	u32 cipher_nid, digest_nid, hmac_nid;
450
451	const u8 curflags () const
452	{
453	return 0x80
454	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
455	}
456		458
457	void setup (ptype type, int dst);	459	void setup (ptype type, int dst);
458	bool chk_config () const;	460	bool chk_config () const;
		461
		462	static u8 get_features ()
		463	{
		464	u8 f = 0;
		465	#if ENABLE_COMPRESSION
		466	f \|= FEATURE_COMPRESSION;
		467	#endif
		468	#if ENABLE_ROHC
		469	f \|= FEATURE_ROHC;
		470	#endif
		471	#if ENABLE_BRIDGING
		472	f \|= FEATURE_BRIDGING;
		473	#endif
		474	return f;
		475	}
459	};	476	};
460		477
461	void config_packet::setup (ptype type, int dst)	478	void config_packet::setup (ptype type, int dst)
462	{	479	{
463	prot_major = PROTOCOL_MAJOR;	480	prot_major = PROTOCOL_MAJOR;
464	prot_minor = PROTOCOL_MINOR;	481	prot_minor = PROTOCOL_MINOR;
465	randsize = RAND_SIZE;	482	randsize = RAND_SIZE;
466	hmaclen = HMACLENGTH;	483	hmaclen = HMACLENGTH;
467	flags = curflags ();	484	flags = 0;
468	challengelen = sizeof (rsachallenge);	485	challengelen = sizeof (rsachallenge);
		486	features = get_features ();
469		487
470	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	488	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471	digest_nid = htonl (EVP_MD_type (RSA_HASH));	489	digest_nid = htonl (EVP_MD_type (RSA_HASH));
472	hmac_nid = htonl (EVP_MD_type (DIGEST));	490	hmac_nid = htonl (EVP_MD_type (DIGEST));
473		491
…		…
476	}	494	}
477		495
478	bool config_packet::chk_config () const	496	bool config_packet::chk_config () const
479	{	497	{
480	if (prot_major != PROTOCOL_MAJOR)	498	if (prot_major != PROTOCOL_MAJOR)
481	slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);	499	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482	else if (randsize != RAND_SIZE)	500	else if (randsize != RAND_SIZE)
483	slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);	501	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
484	else if (hmaclen != HMACLENGTH)	502	else if (hmaclen != HMACLENGTH)
485	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	503	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
486	else if (flags != curflags ())
487	slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
488	else if (challengelen != sizeof (rsachallenge))	504	else if (challengelen != sizeof (rsachallenge))
489	slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));	505	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
490	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	506	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491	slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	507	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
492	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	508	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
493	slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));	509	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
494	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	510	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495	slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	511	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
496	else	512	else
497	return true;	513	return true;
498		514
499	return false;	515	return false;
500	}	516	}
501		517
502	struct auth_req_packet : config_packet	518	struct auth_req_packet : config_packet
503	{	519	{
504	char magic[8];	520	char magic[8];
505	u8 initiate; // false if this is just an automatic reply	521	u8 initiate; // false if this is just an automatic reply
506	u8 protocols; // supported protocols (will get patches on forward)	522	u8 protocols; // supported protocols (will be patched on forward)
507	u8 pad2, pad3;	523	u8 pad2, pad3;
508	rsaid id;	524	rsaid id;
509	rsaencrdata encr;	525	rsaencrdata encr;
510		526
511	auth_req_packet (int dst, bool initiate_, u8 protocols_)	527	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
572	{	588	{
573	if (ictx && octx)	589	if (ictx && octx)
574	{	590	{
575	connectmode = conf->connectmode;	591	connectmode = conf->connectmode;
576		592
577	rekey.start (NOW + ::conf.rekey);	593	// make sure rekeying timeouts are slightly asymmetric
		594	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
		595	rekey.start (rekey_interval, rekey_interval);
578	keepalive.start (NOW + ::conf.keepalive);	596	keepalive.start (::conf.keepalive);
579		597
580	// send queued packets	598	// send queued packets
581	if (ictx && octx)	599	if (ictx && octx)
582	{	600	{
583	while (tap_packet p = (tap_packet )data_queue.get ())	601	while (tap_packet p = (tap_packet )data_queue.get ())
…		…
594	}	612	}
595	}	613	}
596	else	614	else
597	{	615	{
598	retry_cnt = 0;	616	retry_cnt = 0;
599	establish_connection.start (NOW + 5);	617	establish_connection.start (5);
600	keepalive.reset ();	618	keepalive.stop ();
601	rekey.reset ();	619	rekey.stop ();
602	}	620	}
603	}	621	}
604		622
605	void	623	void
606	connection::reset_si ()	624	connection::reset_si ()
…		…
608	protocol = best_protocol (THISNODE->protocols & conf->protocols);	626	protocol = best_protocol (THISNODE->protocols & conf->protocols);
609		627
610	// mask out protocols we cannot establish	628	// mask out protocols we cannot establish
611	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	629	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
612	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	630	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		631	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
		632
		633	if (protocol
		634	&& (!conf->can_direct (THISNODE)
		635	\|\| !THISNODE->can_direct (conf)))
		636	{
		637	slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
		638	protocol = 0;
		639	}
613		640
614	si.set (conf, protocol);	641	si.set (conf, protocol);
615	}	642	}
616		643
617	// ensure sockinfo is valid, forward if necessary	644	// ensure sockinfo is valid, forward if necessary
…		…
622	{	649	{
623	connection *r = vpn->find_router ();	650	connection *r = vpn->find_router ();
624		651
625	if (r)	652	if (r)
626	{	653	{
627	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	654	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
628	conf->nodename, r->conf->nodename);	655	conf->nodename, r->conf->nodename, (const char *)r->si);
629	return r->si;	656	return r->si;
630	}	657	}
631	else	658	else
632	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	659	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
633	conf->nodename);	660	conf->nodename);
…		…
672	connection::send_auth_request (const sockinfo &si, bool initiate)	699	connection::send_auth_request (const sockinfo &si, bool initiate)
673	{	700	{
674	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	701	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
675		702
676	rsachallenge chg;	703	rsachallenge chg;
677
678	rsa_cache.gen (pkt->id, chg);	704	rsa_cache.gen (pkt->id, chg);
679		705	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
680	if (0 > RSA_public_encrypt (sizeof chg,
681	(unsigned char )&chg, (unsigned char )&pkt->encr,
682	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683	fatal ("RSA_public_encrypt error");
684		706
685	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	707	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
686		708
687	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	709	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
688		710
…		…
708	}	730	}
709		731
710	void	732	void
711	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	733	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712	{	734	{
713	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	735	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
714	conf->id, rid, (const char *)rsi);	736	conf->id, rid, (const char *)rsi);
715		737
716	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	738	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
717		739
718	r->hmac_set (octx);	740	r->hmac_set (octx);
…		…
720		742
721	delete r;	743	delete r;
722	}	744	}
723		745
724	void	746	void
725	connection::establish_connection_cb (time_watcher &w)	747	connection::establish_connection_cb (ev::timer &w, int revents)
726	{	748	{
727	if (ictx \|\| conf == THISNODE	749	if (!ictx
		750	&& conf != THISNODE
728	\|\| connectmode == conf_node::C_NEVER	751	&& connectmode != conf_node::C_NEVER
729	\|\| connectmode == conf_node::C_DISABLED)	752	&& connectmode != conf_node::C_DISABLED
730	w.at = TSTAMP_CANCEL;	753	&& !w.is_active ())
731	else if (w.at <= NOW)
732	{	754	{
733	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	755	ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
734		756	? (retry_cnt & 3) + 1
735	if (retry_int < 3600 * 8)	757	: 1 << (retry_cnt >> 2));
736	retry_cnt++;
737
738	w.at = NOW + retry_int;
739		758
740	reset_si ();	759	reset_si ();
741		760
		761	bool slow = si.prot & PROT_SLOW;
		762
742	if (si.prot && !si.host)	763	if (si.prot && !si.host)
		764	{
		765	/TODO/ /* start the timer so we don't recurse endlessly */
		766	w.start (1);
743	vpn->send_connect_request (conf->id);	767	vpn->send_connect_request (conf->id);
		768	}
744	else	769	else
745	{	770	{
746	const sockinfo &dsi = forward_si (si);	771	const sockinfo &dsi = forward_si (si);
		772
		773	slow = slow \|\| (dsi.prot & PROT_SLOW);
747		774
748	if (dsi.valid () && auth_rate_limiter.can (dsi))	775	if (dsi.valid () && auth_rate_limiter.can (dsi))
749	{	776	{
750	if (retry_cnt < 4)	777	if (retry_cnt < 4)
751	send_auth_request (dsi, true);	778	send_auth_request (dsi, true);
752	else	779	else
753	send_ping (dsi, 0);	780	send_ping (dsi, 0);
754	}	781	}
755	}	782	}
		783
		784	retry_int *= slow ? 8. : 0.7;
		785
		786	if (retry_int < conf->max_retry)
		787	retry_cnt++;
		788	else
		789	retry_int = conf->max_retry;
		790
		791	w.start (retry_int);
756	}	792	}
757	}	793	}
758		794
759	void	795	void
760	connection::reset_connection ()	796	connection::reset_connection ()
…		…
763	{	799	{
764	slog (L_INFO, _("%s(%s): connection lost"),	800	slog (L_INFO, _("%s(%s): connection lost"),
765	conf->nodename, (const char *)si);	801	conf->nodename, (const char *)si);
766		802
767	if (::conf.script_node_down)	803	if (::conf.script_node_down)
768	run_script (run_script_cb (this, &connection::script_node_down), false);	804	if (!run_script (run_script_cb (this, &connection::script_node_down), false))
		805	slog (L_WARN, _("node-down command execution failed, continuing."));
769	}	806	}
770		807
771	delete ictx; ictx = 0;	808	delete ictx; ictx = 0;
772	delete octx; octx = 0;	809	delete octx; octx = 0;
		810	#if ENABLE_DNS
		811	dnsv4_reset_connection ();
		812	#endif
773		813
774	si.host= 0;	814	si.host = 0;
775		815
776	last_activity = 0;	816	last_activity = 0;
777	retry_cnt = 0;	817	retry_cnt = 0;
778		818
779	rekey.reset ();	819	rekey.stop ();
780	keepalive.reset ();	820	keepalive.stop ();
781	establish_connection.reset ();	821	establish_connection.stop ();
782	}	822	}
783		823
784	void	824	void
785	connection::shutdown ()	825	connection::shutdown ()
786	{	826	{
…		…
789		829
790	reset_connection ();	830	reset_connection ();
791	}	831	}
792		832
793	void	833	void
794	connection::rekey_cb (time_watcher &w)	834	connection::rekey_cb (ev::timer &w, int revents)
795	{	835	{
796	w.at = TSTAMP_CANCEL;
797
798	reset_connection ();	836	reset_connection ();
799	establish_connection ();	837	establish_connection ();
800	}	838	}
801		839
802	void	840	void
803	connection::send_data_packet (tap_packet *pkt, bool broadcast)	841	connection::send_data_packet (tap_packet *pkt)
804	{	842	{
805	vpndata_packet *p = new vpndata_packet;	843	vpndata_packet *p = new vpndata_packet;
806	int tos = 0;	844	int tos = 0;
807		845
808	// I am not hilarious about peeking into packets, but so be it.	846	// I am not hilarious about peeking into packets, but so be it.
809	if (conf->inherit_tos	847	if (conf->inherit_tos && pkt->is_ipv4 ())
810	&& (pkt)[12] == 0x08 && (pkt)[13] == 0x00 // IP
811	&& ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812	tos = (*pkt)[15] & IPTOS_TOS_MASK;	848	tos = (*pkt)[15] & IPTOS_TOS_MASK;
813		849
814	p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs	850	p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815	send_vpn_packet (p, si, tos);	851	send_vpn_packet (p, si, tos);
816		852
817	delete p;	853	delete p;
818		854
819	if (oseqno > MAX_SEQNO)	855	if (oseqno > MAX_SEQNO)
820	rekey ();	856	rekey ();
821	}	857	}
822		858
823	void	859	void
824	connection::inject_data_packet (tap_packet *pkt, bool broadcast)	860	connection::inject_data_packet (tap_packet pkt, bool broadcast/TODO DDD*/)
825	{	861	{
826	if (ictx && octx)	862	if (ictx && octx)
827	send_data_packet (pkt, broadcast);	863	send_data_packet (pkt);
828	else	864	else
829	{	865	{
830	if (!broadcast)//DDDD	866	if (!broadcast)
831	data_queue.put (new tap_packet (*pkt));	867	data_queue.put (new tap_packet (*pkt));
832		868
833	establish_connection ();	869	establish_connection ();
834	}	870	}
835	}	871	}
…		…
838	{	874	{
839	if (ictx && octx)	875	if (ictx && octx)
840	send_vpn_packet (pkt, si, tos);	876	send_vpn_packet (pkt, si, tos);
841	else	877	else
842	{	878	{
843	vpn_queue.put (new vpn_packet (*pkt));	879	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
844		880
845	establish_connection ();	881	establish_connection ();
846	}	882	}
847	}	883	}
848		884
849	void	885	void
850	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	886	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
851	{	887	{
852	last_activity = NOW;	888	last_activity = ev::ev_now ();
853		889
854	slog (L_NOISE, "<<%d received packet type %d from %d to %d",	890	slog (L_NOISE, "<<%d received packet type %d from %d to %d",
855	conf->id, pkt->typ (), pkt->src (), pkt->dst ());	891	conf->id, pkt->typ (), pkt->src (), pkt->dst ());
856		892
857	switch (pkt->typ ())	893	switch (pkt->typ ())
…		…
907	if (p->initiate)	943	if (p->initiate)
908	send_auth_request (rsi, false);	944	send_auth_request (rsi, false);
909		945
910	rsachallenge k;	946	rsachallenge k;
911		947
912	if (0 > RSA_private_decrypt (sizeof (p->encr),	948	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913	(unsigned char )&p->encr, (unsigned char )&k,	949	{
914	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	950	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));	951	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		952	break;
		953	}
917	else	954	else
918	{	955	{
919	delete octx;	956	delete octx;
920		957
921	octx = new crypto_ctx (k, 1);	958	octx = new crypto_ctx (k, 1);
922	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	959	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
923		960
924	conf->protocols = p->protocols;	961	conf->protocols = p->protocols;
		962	features = p->features & config_packet::get_features ();
925		963
926	send_auth_response (rsi, p->id, k);	964	send_auth_response (rsi, p->id, k);
927		965
928	connection_established ();	966	connection_established ();
929		967
…		…
965	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1003	crypto_ctx *cctx = new crypto_ctx (chg, 0);
966		1004
967	if (!p->hmac_chk (cctx))	1005	if (!p->hmac_chk (cctx))
968	{	1006	{
969	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1007	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"),	1008	"could be an attack, or just corruption or a synchronization error"),
971	conf->nodename, (const char *)rsi);	1009	conf->nodename, (const char *)rsi);
972	break;	1010	break;
973	}	1011	}
974	else	1012	else
975	{	1013	{
…		…
993	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),	1031	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
994	conf->nodename, (const char *)rsi,	1032	conf->nodename, (const char *)rsi,
995	p->prot_major, p->prot_minor);	1033	p->prot_major, p->prot_minor);
996		1034
997	if (::conf.script_node_up)	1035	if (::conf.script_node_up)
998	run_script (run_script_cb (this, &connection::script_node_up), false);	1036	if (!run_script (run_script_cb (this, &connection::script_node_up), false))
		1037	slog (L_WARN, _("node-up command execution failed, continuing."));
999		1038
1000	break;	1039	break;
1001	}	1040	}
1002	else	1041	else
1003	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1042	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
…		…
1024	{	1063	{
1025	vpndata_packet p = (vpndata_packet )pkt;	1064	vpndata_packet p = (vpndata_packet )pkt;
1026		1065
1027	if (!p->hmac_chk (ictx))	1066	if (!p->hmac_chk (ictx))
1028	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1067	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1029	"could be an attack, or just corruption or an synchronization error"),	1068	"could be an attack, or just corruption or a synchronization error"),
1030	conf->nodename, (const char *)rsi);	1069	conf->nodename, (const char *)rsi);
1031	else	1070	else
1032	{	1071	{
1033	u32 seqno;	1072	u32 seqno;
1034	tap_packet *d = p->unpack (this, seqno);	1073	tap_packet *d = p->unpack (this, seqno);
1035		1074
1036	if (iseqno.recv_ok (seqno))	1075	if (iseqno.recv_ok (seqno))
1037	{	1076	{
1038	vpn->tap->send (d);	1077	vpn->tap->send (d);
1039		1078
1040	if (p->dst () == 0) // re-broadcast
1041	for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1042	{
1043	connection c = i;
1044
1045	if (c->conf != THISNODE && c->conf != conf)
1046	c->inject_data_packet (d);
1047	}
1048
1049	if (si != rsi)	1079	if (si != rsi)
1050	{	1080	{
1051	// fast re-sync on connection changes, useful especially for tcp/ip	1081	// fast re-sync on source address changes, useful especially for tcp/ip
1052	si = rsi;	1082	si = rsi;
1053		1083
1054	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1084	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1055	conf->nodename, (const char )si, (const char )rsi);	1085	conf->nodename, (const char )si, (const char )rsi);
1056	}	1086	}
1057
1058	delete d;
1059
1060	break;
1061	}	1087	}
		1088
		1089	delete d;
		1090	break;
1062	}	1091	}
1063	}	1092	}
1064		1093
1065	send_reset (rsi);	1094	send_reset (rsi);
1066	break;	1095	break;
…		…
1068	case vpn_packet::PT_CONNECT_REQ:	1097	case vpn_packet::PT_CONNECT_REQ:
1069	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1098	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1070	{	1099	{
1071	connect_req_packet p = (connect_req_packet ) pkt;	1100	connect_req_packet p = (connect_req_packet ) pkt;
1072		1101
1073	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1102	if (p->id > 0 && p->id <= vpn->conns.size ())
1074	connection *c = vpn->conns[p->id - 1];
1075	conf->protocols = p->protocols;
1076
1077	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1078	conf->id, p->id, c->ictx && c->octx);
1079
1080	if (c->ictx && c->octx)
1081	{	1103	{
		1104	connection *c = vpn->conns[p->id - 1];
		1105	conf->protocols = p->protocols;
		1106
		1107	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
		1108	conf->id, p->id, c->ictx && c->octx);
		1109
		1110	if (c->ictx && c->octx)
		1111	{
1082	// send connect_info packets to both sides, in case one is	1112	// send connect_info packets to both sides, in case one is
1083	// behind a nat firewall (or both ;)	1113	// behind a nat firewall (or both ;)
1084	c->send_connect_info (conf->id, si, conf->protocols);	1114	c->send_connect_info (conf->id, si, conf->protocols);
1085	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1115	send_connect_info (c->conf->id, c->si, c->conf->protocols);
		1116	}
		1117	else
		1118	c->establish_connection ();
1086	}	1119	}
1087	else	1120	else
1088	c->establish_connection ();	1121	slog (L_WARN,
		1122	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1123	p->id);
1089	}	1124	}
1090		1125
1091	break;	1126	break;
1092		1127
1093	case vpn_packet::PT_CONNECT_INFO:	1128	case vpn_packet::PT_CONNECT_INFO:
1094	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1129	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1095	{	1130	{
1096	connect_info_packet p = (connect_info_packet ) pkt;	1131	connect_info_packet p = (connect_info_packet )pkt;
1097		1132
1098	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1133	if (p->id > 0 && p->id <= vpn->conns.size ())
1099		1134	{
1100	connection *c = vpn->conns[p->id - 1];	1135	connection *c = vpn->conns[p->id - 1];
1101		1136
1102	c->conf->protocols = p->protocols;	1137	c->conf->protocols = p->protocols;
1103	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1138	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1104	p->si.upgrade_protocol (protocol, c->conf);	1139	p->si.upgrade_protocol (protocol, c->conf);
1105		1140
1106	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1141	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1107	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1142	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1108		1143
1109	const sockinfo &dsi = forward_si (p->si);	1144	const sockinfo &dsi = forward_si (p->si);
1110		1145
1111	if (dsi.valid ())	1146	if (dsi.valid ())
1112	c->send_auth_request (dsi, true);	1147	c->send_auth_request (dsi, true);
		1148	}
		1149	else
		1150	slog (L_WARN,
		1151	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1152	p->id);
1113	}	1153	}
1114		1154
1115	break;	1155	break;
1116		1156
1117	default:	1157	default:
1118	send_reset (rsi);	1158	send_reset (rsi);
1119	break;	1159	break;
1120	}	1160	}
1121	}	1161	}
1122		1162
1123	void connection::keepalive_cb (time_watcher &w)	1163	void connection::keepalive_cb (ev::timer &w, int revents)
1124	{	1164	{
1125	if (NOW >= last_activity + ::conf.keepalive + 30)	1165	if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1126	{	1166	{
1127	reset_connection ();	1167	reset_connection ();
1128	establish_connection ();	1168	establish_connection ();
1129	}	1169	}
1130	else if (NOW < last_activity + ::conf.keepalive)	1170	else if (ev::ev_now () < last_activity + ::conf.keepalive)
1131	w.at = last_activity + ::conf.keepalive;	1171	w.start (last_activity + ::conf.keepalive - ev::now ());
1132	else if (conf->connectmode != conf_node::C_ONDEMAND	1172	else if (conf->connectmode != conf_node::C_ONDEMAND
1133	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1173	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1134	{	1174	{
1135	send_ping (si);	1175	send_ping (si);
1136	w.at = NOW + 5;	1176	w.start (5);
1137	}	1177	}
1138	else if (NOW < last_activity + ::conf.keepalive + 10)	1178	else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1139	// hold ondemand connections implicitly a few seconds longer	1179	// hold ondemand connections implicitly a few seconds longer
1140	// should delete octx, though, or something like that ;)	1180	// should delete octx, though, or something like that ;)
1141	w.at = last_activity + ::conf.keepalive + 10;	1181	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1142	else	1182	else
1143	reset_connection ();	1183	reset_connection ();
1144	}	1184	}
1145		1185
1146	void connection::send_connect_request (int id)	1186	void connection::send_connect_request (int id)
…		…
1152	send_vpn_packet (p, si);	1192	send_vpn_packet (p, si);
1153		1193
1154	delete p;	1194	delete p;
1155	}	1195	}
1156		1196
		1197	void connection::script_init_env (const char *ext)
		1198	{
		1199	char *env;
		1200	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1201	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1202	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1203	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1204	conf->id & 0xff); putenv (env);
		1205	}
		1206
1157	void connection::script_node ()	1207	void connection::script_init_connect_env ()
1158	{	1208	{
1159	vpn->script_if_up ();	1209	vpn->script_init_env ();
1160		1210
1161	char *env;	1211	char *env;
1162	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1212	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1163	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1213	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1164	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1214	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1165	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1215	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1166	}	1216	}
1167		1217
1168	const char *connection::script_node_up ()	1218	const char *connection::script_node_up ()
1169	{	1219	{
1170	script_node ();	1220	script_init_connect_env ();
1171		1221
1172	putenv ("STATE=up");	1222	putenv ((char *)"STATE=up");
1173		1223
		1224	char *filename;
		1225	asprintf (&filename,
		1226	"%s/%s",
		1227	confbase,
1174	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1228	::conf.script_node_up ? ::conf.script_node_up : "node-up");
		1229
		1230	return filename;
1175	}	1231	}
1176		1232
1177	const char *connection::script_node_down ()	1233	const char *connection::script_node_down ()
1178	{	1234	{
1179	script_node ();	1235	script_init_connect_env ();
1180		1236
1181	putenv ("STATE=down");	1237	putenv ((char *)"STATE=down");
1182		1238
1183	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1239	char *filename;
1184	}	1240	asprintf (&filename,
		1241	"%s/%s",
		1242	confbase,
		1243	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1185		1244
		1245	return filename;
		1246	}
		1247
1186	connection::connection(struct vpn *vpn_)	1248	connection::connection (struct vpn vpn, conf_node conf)
1187	: vpn(vpn_)	1249	: vpn(vpn), conf(conf)
1188	, rekey (this, &connection::rekey_cb)	1250	, rekey (this, &connection::rekey_cb)
1189	, keepalive (this, &connection::keepalive_cb)	1251	, keepalive (this, &connection::keepalive_cb)
1190	, establish_connection (this, &connection::establish_connection_cb)	1252	, establish_connection (this, &connection::establish_connection_cb)
		1253	#if ENABLE_DNS
		1254	, dns (0)
		1255	#endif
1191	{	1256	{
1192	octx = ictx = 0;	1257	octx = ictx = 0;
1193	retry_cnt = 0;	1258	retry_cnt = 0;
1194		1259
		1260	if (!conf->protocols) // make sure some protocol is enabled
		1261	conf->protocols = PROT_UDPv4;
		1262
1195	connectmode = conf_node::C_ALWAYS; // initial setting	1263	connectmode = conf_node::C_ALWAYS; // initial setting
1196	reset_connection ();	1264	reset_connection ();
1197	}	1265	}
1198		1266
1199	connection::~connection ()	1267	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs. Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC