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

Comparing gvpe/src/connection.C (file contents):
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.95 by root, Tue Mar 8 17:33:30 2011 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2008,2010,2011 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 it
6	it under the terms of the GNU General Public License as published by	8	under the terms of the GNU General Public License as published by the
7	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
8	(at your option) any later version.	10	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, but
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	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 GNU General
13	GNU General Public License for more details.	15	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 along
16	along with this program; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
17	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19
		20	Additional permission under GNU GPL version 3 section 7
		21
		22	If you modify this Program, or any covered work, by linking or
		23	combining it with the OpenSSL project's OpenSSL library (or a modified
		24	version of that library), containing parts covered by the terms of the
		25	OpenSSL or SSLeay licenses, the licensors of this Program grant you
		26	additional permission to convey the resulting work. Corresponding
		27	Source for a non-source form of such a combination shall include the
		28	source code for the parts of OpenSSL used as well as that of the
		29	covered work.
18	*/	30	*/
19		31
20	#include "config.h"	32	#include "config.h"
21		33
22	extern "C" {
23	# include "lzf/lzf.h"
24	}
25
26	#include <list>	34	#include <list>
		35	#include <queue>
		36	#include <utility>
27		37
28	#include <openssl/rand.h>	38	#include <openssl/rand.h>
29	#include <openssl/evp.h>	39	#include <openssl/evp.h>
30	#include <openssl/rsa.h>	40	#include <openssl/rsa.h>
31	#include <openssl/err.h>	41	#include <openssl/err.h>
32
33	#include "gettext.h"
34		42
35	#include "conf.h"	43	#include "conf.h"
36	#include "slog.h"	44	#include "slog.h"
37	#include "device.h"	45	#include "device.h"
38	#include "vpn.h"	46	#include "vpn.h"
42		50
43	#if !HAVE_RAND_PSEUDO_BYTES	51	#if !HAVE_RAND_PSEUDO_BYTES
44	# define RAND_pseudo_bytes RAND_bytes	52	# define RAND_pseudo_bytes RAND_bytes
45	#endif	53	#endif
46		54
47	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	55	#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
		56	#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
		57
		58	#define ULTRA_FAST 1
		59	#define HLOG 15
		60	#include "lzf/lzf.h"
		61	#include "lzf/lzf_c.c"
		62	#include "lzf/lzf_d.c"
		63
		64	//////////////////////////////////////////////////////////////////////////////
		65
		66	static std::queue< std::pair<run_script_cb , const char > > rs_queue;
		67	static ev::child rs_child_ev;
		68
		69	namespace
		70	{
		71	void // c++ requires external linkage here, apparently :(
		72	rs_child_cb (ev::child &w, int revents)
		73	{
		74	w.stop ();
		75
		76	if (rs_queue.empty ())
		77	return;
		78
		79	pid_t pid = run_script (*rs_queue.front ().first, false);
		80	if (pid)
		81	{
		82	w.set (pid);
		83	w.start ();
		84	}
		85	else
		86	slog (L_WARN, rs_queue.front ().second);
		87
		88	delete rs_queue.front ().first;
		89	rs_queue.pop ();
		90	}
		91	};
		92
		93	// despite the fancy name, this is quite a hack
		94	static void
		95	run_script_queued (run_script_cb cb, const char warnmsg)
		96	{
		97	rs_queue.push (std::make_pair (cb, warnmsg));
		98
		99	if (!rs_child_ev.is_active ())
		100	{
		101	rs_child_ev.set<rs_child_cb> ();
		102	rs_child_ev ();
		103	}
		104	}
		105
		106	//////////////////////////////////////////////////////////////////////////////
48		107
49	struct crypto_ctx	108	struct crypto_ctx
50	{	109	{
51	EVP_CIPHER_CTX cctx;	110	EVP_CIPHER_CTX cctx;
52	HMAC_CTX hctx;	111	HMAC_CTX hctx;
…		…
56	};	115	};
57		116
58	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	117	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59	{	118	{
60	EVP_CIPHER_CTX_init (&cctx);	119	EVP_CIPHER_CTX_init (&cctx);
61	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	120	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62	HMAC_CTX_init (&hctx);	121	HMAC_CTX_init (&hctx);
63	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	122	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64	}	123	}
65		124
66	crypto_ctx::~crypto_ctx ()	125	crypto_ctx::~crypto_ctx ()
67	{	126	{
68	EVP_CIPHER_CTX_cleanup (&cctx);	127	require (EVP_CIPHER_CTX_cleanup (&cctx));
69	HMAC_CTX_cleanup (&hctx);	128	HMAC_CTX_cleanup (&hctx);
70	}	129	}
71		130
72	static void	131	static void
73	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	132	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74	{	133	{
75	EVP_MD_CTX ctx;	134	EVP_MD_CTX ctx;
76		135
77	EVP_MD_CTX_init (&ctx);	136	EVP_MD_CTX_init (&ctx);
78	EVP_DigestInit (&ctx, RSA_HASH);	137	require (EVP_DigestInit (&ctx, RSA_HASH));
79	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	138	require (EVP_DigestUpdate (&ctx, &chg, sizeof chg));
80	EVP_DigestUpdate(&ctx, &id, sizeof id);	139	require (EVP_DigestUpdate (&ctx, &id, sizeof id));
81	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	140	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82	EVP_MD_CTX_cleanup (&ctx);	141	EVP_MD_CTX_cleanup (&ctx);
83	}	142	}
84		143
85	struct rsa_entry {	144	struct rsa_entry
		145	{
86	tstamp expire;	146	tstamp expire;
87	rsaid id;	147	rsaid id;
88	rsachallenge chg;	148	rsachallenge chg;
89	};	149	};
90		150
91	struct rsa_cache : list<rsa_entry>	151	struct rsa_cache : list<rsa_entry>
92	{	152	{
93	void cleaner_cb (time_watcher &w); time_watcher cleaner;	153	inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
94		154
95	bool find (const rsaid &id, rsachallenge &chg)	155	bool find (const rsaid &id, rsachallenge &chg)
96	{	156	{
97	for (iterator i = begin (); i != end (); ++i)	157	for (iterator i = begin (); i != end (); ++i)
98	{	158	{
99	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	159	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
100	{	160	{
101	memcpy (&chg, &i->chg, sizeof chg);	161	memcpy (&chg, &i->chg, sizeof chg);
102		162
103	erase (i);	163	erase (i);
104	return true;	164	return true;
105	}	165	}
106	}	166	}
107		167
108	if (cleaner.at < NOW)	168	if (!cleaner.is_active ())
109	cleaner.start (NOW + RSA_TTL);	169	cleaner.again ();
110		170
111	return false;	171	return false;
112	}	172	}
113		173
114	void gen (rsaid &id, rsachallenge &chg)	174	void gen (rsaid &id, rsachallenge &chg)
115	{	175	{
116	rsa_entry e;	176	rsa_entry e;
117		177
118	RAND_bytes ((unsigned char *)&id, sizeof id);	178	RAND_bytes ((unsigned char *)&id, sizeof id);
119	RAND_bytes ((unsigned char *)&chg, sizeof chg);	179	RAND_bytes ((unsigned char *)&chg, sizeof chg);
120		180
121	e.expire = NOW + RSA_TTL;	181	e.expire = ev_now () + RSA_TTL;
122	e.id = id;	182	e.id = id;
123	memcpy (&e.chg, &chg, sizeof chg);	183	memcpy (&e.chg, &chg, sizeof chg);
124		184
125	push_back (e);	185	push_back (e);
126		186
127	if (cleaner.at < NOW)	187	if (!cleaner.is_active ())
128	cleaner.start (NOW + RSA_TTL);	188	cleaner.again ();
129	}	189	}
130		190
131	rsa_cache ()	191	rsa_cache ()
132	: cleaner (this, &rsa_cache::cleaner_cb)	192	{
133	{ }	193	cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
		194	cleaner.set (RSA_TTL, RSA_TTL);
		195	}
134		196
135	} rsa_cache;	197	} rsa_cache;
136		198
137	void rsa_cache::cleaner_cb (time_watcher &w)	199	void
		200	rsa_cache::cleaner_cb (ev::timer &w, int revents)
138	{	201	{
139	if (empty ())	202	if (empty ())
140	w.at = TSTAMP_CANCEL;	203	w.stop ();
141	else	204	else
142	{	205	{
143	w.at = NOW + RSA_TTL;
144
145	for (iterator i = begin (); i != end (); )	206	for (iterator i = begin (); i != end (); )
146	if (i->expire <= NOW)	207	if (i->expire <= ev_now ())
147	i = erase (i);	208	i = erase (i);
148	else	209	else
149	++i;	210	++i;
150	}	211	}
151	}	212	}
152		213
153	//////////////////////////////////////////////////////////////////////////////	214	//////////////////////////////////////////////////////////////////////////////
154		215
155	void pkt_queue::put (net_packet *p)	216	pkt_queue::pkt_queue (double max_ttl, int max_queue)
		217	: max_ttl (max_ttl), max_queue (max_queue)
156	{	218	{
157	if (queue[i])	219	queue = new pkt [max_queue];
158	{
159	delete queue[i];
160	j = (j + 1) % QUEUEDEPTH;
161	}
162		220
163	queue[i] = p;
164
165	i = (i + 1) % QUEUEDEPTH;
166	}
167
168	net_packet *pkt_queue::get ()
169	{
170	net_packet *p = queue[j];
171
172	if (p)
173	{
174	queue[j] = 0;
175	j = (j + 1) % QUEUEDEPTH;
176	}
177
178	return p;
179	}
180
181	pkt_queue::pkt_queue ()
182	{
183	memset (queue, 0, sizeof (queue));
184	i = 0;	221	i = 0;
185	j = 0;	222	j = 0;
		223
		224	expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
186	}	225	}
187		226
188	pkt_queue::~pkt_queue ()	227	pkt_queue::~pkt_queue ()
189	{	228	{
190	for (i = QUEUEDEPTH; --i > 0; )	229	while (net_packet *p = get ())
		230	delete p;
		231
191	delete queue[i];	232	delete [] queue;
192	}	233	}
193		234
		235	void
		236	pkt_queue::expire_cb (ev::timer &w, int revents)
		237	{
		238	ev_tstamp expire = ev_now () - max_ttl;
		239
		240	for (;;)
		241	{
		242	if (empty ())
		243	break;
		244
		245	double diff = queue[j].tstamp - expire;
		246
		247	if (diff >= 0.)
		248	{
		249	w.start (diff > 0.5 ? diff : 0.5);
		250	break;
		251	}
		252
		253	delete get ();
		254	}
		255	}
		256
		257	void
		258	pkt_queue::put (net_packet *p)
		259	{
		260	ev_tstamp now = ev_now ();
		261
		262	// start expiry timer
		263	if (empty ())
		264	expire.start (max_ttl);
		265
		266	int ni = i + 1 == max_queue ? 0 : i + 1;
		267
		268	if (ni == j)
		269	delete get ();
		270
		271	queue[i].pkt = p;
		272	queue[i].tstamp = now;
		273
		274	i = ni;
		275	}
		276
		277	net_packet *
		278	pkt_queue::get ()
		279	{
		280	if (empty ())
		281	return 0;
		282
		283	net_packet *p = queue[j].pkt;
		284	queue[j].pkt = 0;
		285
		286	j = j + 1 == max_queue ? 0 : j + 1;
		287
		288	return p;
		289	}
		290
194	struct net_rateinfo {	291	struct net_rateinfo
		292	{
195	u32 host;	293	u32 host;
196	double pcnt, diff;	294	double pcnt, diff;
197	tstamp last;	295	tstamp last;
198	};	296	};
199		297
200	// only do action once every x seconds per host whole allowing bursts.	298	// only do action once every x seconds per host whole allowing bursts.
201	// this implementation ("splay list" ;) is inefficient,	299	// this implementation ("splay list" ;) is inefficient,
202	// but low on resources.	300	// but low on resources.
203	struct net_rate_limiter : list<net_rateinfo>	301	struct net_rate_limiter : list<net_rateinfo>
204	{	302	{
205	static const double ALPHA = 1. - 1. / 600.; // allow bursts	303	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206	static const double CUTOFF = 10.; // one event every CUTOFF seconds	304	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	305	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208	static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value	306	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
209		307
210	bool can (const sockinfo &si) { return can((u32)si.host); }	308	bool can (const sockinfo &si) { return can((u32)si.host); }
211	bool can (u32 host);	309	bool can (u32 host);
212	};	310	};
213		311
214	net_rate_limiter auth_rate_limiter, reset_rate_limiter;	312	static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
215		313
		314	bool
216	bool net_rate_limiter::can (u32 host)	315	net_rate_limiter::can (u32 host)
217	{	316	{
218	iterator i;	317	iterator i;
219		318
220	for (i = begin (); i != end (); )	319	for (i = begin (); i != end (); )
221	if (i->host == host)	320	if (i->host == host)
222	break;	321	break;
223	else if (i->last < NOW - EXPIRE)	322	else if (i->last < ev_now () - NRL_EXPIRE)
224	i = erase (i);	323	i = erase (i);
225	else	324	else
226	i++;	325	i++;
227		326
228	if (i == end ())	327	if (i == end ())
229	{	328	{
230	net_rateinfo ri;	329	net_rateinfo ri;
231		330
232	ri.host = host;	331	ri.host = host;
233	ri.pcnt = 1.;	332	ri.pcnt = 1.;
234	ri.diff = MAXDIF;	333	ri.diff = NRL_MAXDIF;
235	ri.last = NOW;	334	ri.last = ev_now ();
236		335
237	push_front (ri);	336	push_front (ri);
238		337
239	return true;	338	return true;
240	}	339	}
241	else	340	else
242	{	341	{
243	net_rateinfo ri (*i);	342	net_rateinfo ri (*i);
244	erase (i);	343	erase (i);
245		344
246	ri.pcnt = ri.pcnt * ALPHA;	345	ri.pcnt = ri.pcnt * NRL_ALPHA;
247	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	346	ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248		347
249	ri.last = NOW;	348	ri.last = ev_now ();
250		349
251	double dif = ri.diff / ri.pcnt;	350	double dif = ri.diff / ri.pcnt;
252		351
253	bool send = dif > CUTOFF;	352	bool send = dif > NRL_CUTOFF;
254		353
255	if (dif > MAXDIF)	354	if (dif > NRL_MAXDIF)
256	{	355	{
257	ri.pcnt = 1.;	356	ri.pcnt = 1.;
258	ri.diff = MAXDIF;	357	ri.diff = NRL_MAXDIF;
259	}	358	}
260	else if (send)	359	else if (send)
261	ri.pcnt++;	360	ri.pcnt++;
262		361
263	push_front (ri);	362	push_front (ri);
…		…
268		367
269	/////////////////////////////////////////////////////////////////////////////	368	/////////////////////////////////////////////////////////////////////////////
270		369
271	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];	370	unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
272		371
		372	void
273	void hmac_packet::hmac_gen (crypto_ctx *ctx)	373	hmac_packet::hmac_gen (crypto_ctx *ctx)
274	{	374	{
275	unsigned int xlen;	375	unsigned int xlen;
276		376
277	HMAC_CTX *hctx = &ctx->hctx;	377	HMAC_CTX *hctx = &ctx->hctx;
278		378
…		…
296	hmac_gen (ctx);	396	hmac_gen (ctx);
297		397
298	return !memcmp (hmac, hmac_digest, HMACLENGTH);	398	return !memcmp (hmac, hmac_digest, HMACLENGTH);
299	}	399	}
300		400
		401	void
301	void vpn_packet::set_hdr (ptype type_, unsigned int dst)	402	vpn_packet::set_hdr (ptype type_, unsigned int dst)
302	{	403	{
303	type = type_;	404	type = type_;
304		405
305	int src = THISNODE->id;	406	int src = THISNODE->id;
306		407
…		…
310	}	411	}
311		412
312	#define MAXVPNDATA (MAX_MTU - 6 - 6)	413	#define MAXVPNDATA (MAX_MTU - 6 - 6)
313	#define DATAHDR (sizeof (u32) + RAND_SIZE)	414	#define DATAHDR (sizeof (u32) + RAND_SIZE)
314		415
315	struct vpndata_packet:vpn_packet	416	struct vpndata_packet : vpn_packet
		417	{
		418	u8 data[MAXVPNDATA + DATAHDR]; // seqno
		419
		420	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
		421	tap_packet unpack (connection conn, u32 &seqno);
		422
		423	private:
		424	const u32 data_hdr_size () const
316	{	425	{
317	u8 data[MAXVPNDATA + DATAHDR]; // seqno
318
319	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
320	tap_packet unpack (connection conn, u32 &seqno);
321	private:
322
323	const u32 data_hdr_size () const
324	{
325	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;	426	return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
326	}
327	};	427	}
		428	};
328		429
329	void	430	void
330	vpndata_packet::setup (connection conn, int dst, u8 d, u32 l, u32 seqno)	431	vpndata_packet::setup (connection conn, int dst, u8 d, u32 l, u32 seqno)
331	{	432	{
332	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;	433	EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
333	int outl = 0, outl2;	434	int outl = 0, outl2;
334	ptype type = PT_DATA_UNCOMPRESSED;	435	ptype type = PT_DATA_UNCOMPRESSED;
335		436
336	#if ENABLE_COMPRESSION	437	#if ENABLE_COMPRESSION
337	u8 cdata[MAX_MTU];	438	u8 cdata[MAX_MTU];
338	u32 cl;
339		439
		440	if (conn->features & FEATURE_COMPRESSION)
		441	{
340	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	442	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		443
341	if (cl)	444	if (cl)
342	{	445	{
343	type = PT_DATA_COMPRESSED;	446	type = PT_DATA_COMPRESSED;
344	d = cdata;	447	d = cdata;
345	l = cl + 2;	448	l = cl + 2;
346		449
347	d[0] = cl >> 8;	450	d[0] = cl >> 8;
348	d[1] = cl;	451	d[1] = cl;
		452	}
349	}	453	}
350	#endif	454	#endif
351		455
352	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	456	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353		457
354	struct {	458	struct {
355	#if RAND_SIZE	459	#if RAND_SIZE
356	u8 rnd[RAND_SIZE];	460	u8 rnd[RAND_SIZE];
357	#endif	461	#endif
…		…
361	datahdr.seqno = ntohl (seqno);	465	datahdr.seqno = ntohl (seqno);
362	#if RAND_SIZE	466	#if RAND_SIZE
363	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	467	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364	#endif	468	#endif
365		469
366	EVP_EncryptUpdate (cctx,	470	require (EVP_EncryptUpdate (cctx,
367	(unsigned char *) data + outl, &outl2,	471	(unsigned char *) data + outl, &outl2,
368	(unsigned char *) &datahdr, DATAHDR);	472	(unsigned char *) &datahdr, DATAHDR));
369	outl += outl2;	473	outl += outl2;
370		474
371	EVP_EncryptUpdate (cctx,	475	require (EVP_EncryptUpdate (cctx,
372	(unsigned char *) data + outl, &outl2,	476	(unsigned char *) data + outl, &outl2,
373	(unsigned char *) d, l);	477	(unsigned char *) d, l));
374	outl += outl2;	478	outl += outl2;
375		479
376	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	480	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377	outl += outl2;	481	outl += outl2;
378		482
379	len = outl + data_hdr_size ();	483	len = outl + data_hdr_size ();
380		484
381	set_hdr (type, dst);	485	set_hdr (type, dst);
…		…
390	int outl = 0, outl2;	494	int outl = 0, outl2;
391	tap_packet *p = new tap_packet;	495	tap_packet *p = new tap_packet;
392	u8 *d;	496	u8 *d;
393	u32 l = len - data_hdr_size ();	497	u32 l = len - data_hdr_size ();
394		498
395	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	499	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396		500
397	#if ENABLE_COMPRESSION	501	#if ENABLE_COMPRESSION
398	u8 cdata[MAX_MTU];	502	u8 cdata[MAX_MTU];
399		503
400	if (type == PT_DATA_COMPRESSED)	504	if (type == PT_DATA_COMPRESSED)
…		…
402	else	506	else
403	#endif	507	#endif
404	d = &(*p)[6 + 6 - DATAHDR];	508	d = &(*p)[6 + 6 - DATAHDR];
405		509
406	/* this overwrites part of the src mac, but we fix that later */	510	/* this overwrites part of the src mac, but we fix that later */
407	EVP_DecryptUpdate (cctx,	511	require (EVP_DecryptUpdate (cctx,
408	d, &outl2,	512	d, &outl2,
409	(unsigned char *)&data, len - data_hdr_size ());	513	(unsigned char *)&data, len - data_hdr_size ()));
410	outl += outl2;	514	outl += outl2;
411		515
412	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	516	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413	outl += outl2;	517	outl += outl2;
414		518
415	seqno = ntohl ((u32 )(d + RAND_SIZE));	519	seqno = ntohl ((u32 )(d + RAND_SIZE));
416		520
417	id2mac (dst () ? dst() : THISNODE->id, p->dst);	521	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
446	{	550	{
447	// actually, hmaclen cannot be checked because the hmac	551	// actually, hmaclen cannot be checked because the hmac
448	// field comes before this data, so peers with other	552	// field comes before this data, so peers with other
449	// hmacs simply will not work.	553	// hmacs simply will not work.
450	u8 prot_major, prot_minor, randsize, hmaclen;	554	u8 prot_major, prot_minor, randsize, hmaclen;
451	u8 flags, challengelen, pad2, pad3;	555	u8 flags, challengelen, features, pad3;
452	u32 cipher_nid, digest_nid, hmac_nid;	556	u32 cipher_nid, digest_nid, hmac_nid;
453
454	const u8 curflags () const
455	{
456	return 0x80
457	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
458	}
459		557
460	void setup (ptype type, int dst);	558	void setup (ptype type, int dst);
461	bool chk_config () const;	559	bool chk_config () const;
		560
		561	static u8 get_features ()
		562	{
		563	u8 f = 0;
		564	#if ENABLE_COMPRESSION
		565	f \|= FEATURE_COMPRESSION;
		566	#endif
		567	#if ENABLE_ROHC
		568	f \|= FEATURE_ROHC;
		569	#endif
		570	#if ENABLE_BRIDGING
		571	f \|= FEATURE_BRIDGING;
		572	#endif
		573	return f;
		574	}
462	};	575	};
463		576
		577	void
464	void config_packet::setup (ptype type, int dst)	578	config_packet::setup (ptype type, int dst)
465	{	579	{
466	prot_major = PROTOCOL_MAJOR;	580	prot_major = PROTOCOL_MAJOR;
467	prot_minor = PROTOCOL_MINOR;	581	prot_minor = PROTOCOL_MINOR;
468	randsize = RAND_SIZE;	582	randsize = RAND_SIZE;
469	hmaclen = HMACLENGTH;	583	hmaclen = HMACLENGTH;
470	flags = curflags ();	584	flags = 0;
471	challengelen = sizeof (rsachallenge);	585	challengelen = sizeof (rsachallenge);
		586	features = get_features ();
472		587
473	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	588	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474	digest_nid = htonl (EVP_MD_type (RSA_HASH));	589	digest_nid = htonl (EVP_MD_type (RSA_HASH));
475	hmac_nid = htonl (EVP_MD_type (DIGEST));	590	hmac_nid = htonl (EVP_MD_type (DIGEST));
476		591
477	len = sizeof (*this) - sizeof (net_packet);	592	len = sizeof (*this) - sizeof (net_packet);
478	set_hdr (type, dst);	593	set_hdr (type, dst);
479	}	594	}
480		595
		596	bool
481	bool config_packet::chk_config () const	597	config_packet::chk_config () const
482	{	598	{
483	if (prot_major != PROTOCOL_MAJOR)	599	if (prot_major != PROTOCOL_MAJOR)
484	slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);	600	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485	else if (randsize != RAND_SIZE)	601	else if (randsize != RAND_SIZE)
486	slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);	602	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487	else if (hmaclen != HMACLENGTH)	603	else if (hmaclen != HMACLENGTH)
488	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	604	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489	else if (flags != curflags ())
490	slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
491	else if (challengelen != sizeof (rsachallenge))	605	else if (challengelen != sizeof (rsachallenge))
492	slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));	606	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	607	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494	slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	608	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)))	609	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
496	slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));	610	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
497	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	611	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
498	slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	612	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
499	else	613	else
500	return true;	614	return true;
501		615
502	return false;	616	return false;
503	}	617	}
504		618
505	struct auth_req_packet : config_packet	619	struct auth_req_packet : config_packet
506	{	620	{
507	char magic[8];	621	char magic[8];
508	u8 initiate; // false if this is just an automatic reply	622	u8 initiate; // false if this is just an automatic reply
509	u8 protocols; // supported protocols (will get patches on forward)	623	u8 protocols; // supported protocols (will be patched on forward)
510	u8 pad2, pad3;	624	u8 pad2, pad3;
511	rsaid id;	625	rsaid id;
512	rsaencrdata encr;	626	rsaencrdata encr;
513		627
514	auth_req_packet (int dst, bool initiate_, u8 protocols_)	628	auth_req_packet (int dst, bool initiate_, u8 protocols_)
515	{	629	{
516	config_packet::setup (PT_AUTH_REQ, dst);	630	config_packet::setup (PT_AUTH_REQ, dst);
517	strncpy (magic, MAGIC, 8);	631	strncpy (magic, MAGIC_OLD, 8);
518	initiate = !!initiate_;	632	initiate = !!initiate_;
519	protocols = protocols_;	633	protocols = protocols_;
520		634
521	len = sizeof (*this) - sizeof (net_packet);	635	len = sizeof (*this) - sizeof (net_packet);
522	}	636	}
…		…
571	/////////////////////////////////////////////////////////////////////////////	685	/////////////////////////////////////////////////////////////////////////////
572		686
573	void	687	void
574	connection::connection_established ()	688	connection::connection_established ()
575	{	689	{
		690	slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
		691
576	if (ictx && octx)	692	if (ictx && octx)
577	{	693	{
578	connectmode = conf->connectmode;	694	// make sure rekeying timeouts are slightly asymmetric
579		695	ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
580	rekey.start (NOW + ::conf.rekey);	696	rekey.start (rekey_interval, rekey_interval);
581	keepalive.start (NOW + ::conf.keepalive);	697	keepalive.start (::conf.keepalive);
582		698
583	// send queued packets	699	// send queued packets
584	if (ictx && octx)	700	if (ictx && octx)
585	{	701	{
586	while (tap_packet p = (tap_packet )data_queue.get ())	702	while (tap_packet p = (tap_packet )data_queue.get ())
587	{	703	{
588	send_data_packet (p);	704	if (p->len) send_data_packet (p);
589	delete p;	705	delete p;
590	}	706	}
591		707
592	while (vpn_packet p = (vpn_packet )vpn_queue.get ())	708	while (vpn_packet p = (vpn_packet )vpn_queue.get ())
593	{	709	{
594	send_vpn_packet (p, si, IPTOS_RELIABILITY);	710	if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
595	delete p;	711	delete p;
596	}	712	}
597	}	713	}
		714
		715	vpn->connection_established (this);
598	}	716	}
599	else	717	else
600	{	718	{
601	retry_cnt = 0;	719	retry_cnt = 0;
602	establish_connection.start (NOW + 5);	720	establish_connection.start (5);
603	keepalive.reset ();	721	keepalive.stop ();
604	rekey.reset ();	722	rekey.stop ();
605	}	723	}
606	}	724	}
607		725
608	void	726	void
609	connection::reset_si ()	727	connection::reset_si ()
610	{	728	{
		729	if (vpn->can_direct (THISNODE, conf))
611	protocol = best_protocol (THISNODE->protocols & conf->protocols);	730	protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
612		731	else
613	// mask out protocols we cannot establish	732	{
614	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	733	slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
615	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	734	protocol = 0;
		735	}
616		736
617	si.set (conf, protocol);	737	si.set (conf, protocol);
		738
		739	is_direct = si.valid ();
618	}	740	}
619		741
620	// ensure sockinfo is valid, forward if necessary	742	// ensure sockinfo is valid, forward if necessary
621	const sockinfo &	743	const sockinfo &
622	connection::forward_si (const sockinfo &si) const	744	connection::forward_si (const sockinfo &si) const
623	{	745	{
624	if (!si.valid ())	746	if (!si.valid ())
625	{	747	{
626	connection *r = vpn->find_router ();	748	connection *r = vpn->find_router_for (this);
627		749
628	if (r)	750	if (r)
629	{	751	{
630	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	752	slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
631	conf->nodename, r->conf->nodename);	753	conf->nodename, r->conf->nodename);
632	return r->si;	754	return r->si;
633	}	755	}
634	else	756	else
635	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	757	slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
636	conf->nodename);	758	conf->nodename);
637	}	759	}
638		760
639	return si;	761	return si;
640	}	762	}
…		…
650	connection::send_ping (const sockinfo &si, u8 pong)	772	connection::send_ping (const sockinfo &si, u8 pong)
651	{	773	{
652	ping_packet *pkt = new ping_packet;	774	ping_packet *pkt = new ping_packet;
653		775
654	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);	776	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
		777
		778	slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
		779
655	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	780	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
656		781
657	delete pkt;	782	delete pkt;
658	}	783	}
659		784
…		…
675	connection::send_auth_request (const sockinfo &si, bool initiate)	800	connection::send_auth_request (const sockinfo &si, bool initiate)
676	{	801	{
677	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	802	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678		803
679	rsachallenge chg;	804	rsachallenge chg;
680
681	rsa_cache.gen (pkt->id, chg);	805	rsa_cache.gen (pkt->id, chg);
		806	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
682		807
683	if (0 > RSA_public_encrypt (sizeof chg,
684	(unsigned char )&chg, (unsigned char )&pkt->encr,
685	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686	fatal ("RSA_public_encrypt error");
687
688	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	808	slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
689		809
690	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	810	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
691		811
692	delete pkt;	812	delete pkt;
693	}	813	}
…		…
701		821
702	rsa_hash (id, chg, pkt->response);	822	rsa_hash (id, chg, pkt->response);
703		823
704	pkt->hmac_set (octx);	824	pkt->hmac_set (octx);
705		825
706	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);	826	slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
707		827
708	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	828	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
709		829
710	delete pkt;	830	delete pkt;
711	}	831	}
712		832
713	void	833	void
714	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	834	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
715	{	835	{
716	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	836	slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
717	conf->id, rid, (const char *)rsi);	837	vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
		838	conf->protocols);
718		839
719	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	840	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
720		841
721	r->hmac_set (octx);	842	r->hmac_set (octx);
722	send_vpn_packet (r, si);	843	send_vpn_packet (r, si);
723		844
724	delete r;	845	delete r;
725	}	846	}
726		847
727	void	848	inline void
728	connection::establish_connection_cb (time_watcher &w)	849	connection::establish_connection_cb (ev::timer &w, int revents)
729	{	850	{
730	if (ictx \|\| conf == THISNODE	851	if (!(ictx && octx)
		852	&& conf != THISNODE
731	\|\| connectmode == conf_node::C_NEVER	853	&& connectmode != conf_node::C_NEVER
732	\|\| connectmode == conf_node::C_DISABLED)	854	&& connectmode != conf_node::C_DISABLED
733	w.at = TSTAMP_CANCEL;	855	&& !w.is_active ())
734	else if (w.at <= NOW)
735	{	856	{
736	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	857	// a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
737		858	// and stop trying. should probably be handled by a per-connection expire handler.
738	if (retry_int < 3600 * 8)	859	if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
		860	{
		861	reset_connection ();
739	retry_cnt++;	862	return;
		863	}
740		864
741	w.at = NOW + retry_int;	865	last_establish_attempt = ev_now ();
		866
		867	ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
		868	? (retry_cnt & 3) + 1
		869	: 1 << (retry_cnt >> 2));
742		870
743	reset_si ();	871	reset_si ();
744		872
745	if (si.prot && !si.host)	873	bool slow = si.prot & PROT_SLOW;
		874
		875	if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
		876	{
		877	/TODO/ /* start the timer so we don't recurse endlessly */
		878	w.start (1);
746	vpn->send_connect_request (conf->id);	879	vpn->send_connect_request (this);
		880	}
747	else	881	else
748	{	882	{
		883	if (si.valid ())
		884	slog (L_DEBUG, _("%s: sending direct connection request to %s."),
		885	conf->nodename, (const char *)si);
		886
749	const sockinfo &dsi = forward_si (si);	887	const sockinfo &dsi = forward_si (si);
		888
		889	slow = slow \|\| (dsi.prot & PROT_SLOW);
750		890
751	if (dsi.valid () && auth_rate_limiter.can (dsi))	891	if (dsi.valid () && auth_rate_limiter.can (dsi))
752	{	892	{
753	if (retry_cnt < 4)	893	if (retry_cnt < 4)
754	send_auth_request (dsi, true);	894	send_auth_request (dsi, true);
755	else	895	else
756	send_ping (dsi, 0);	896	send_ping (dsi, 0);
757	}	897	}
758	}	898	}
		899
		900	retry_int *= slow ? 8. : 0.9;
		901
		902	if (retry_int < conf->max_retry)
		903	retry_cnt++;
		904	else
		905	retry_int = conf->max_retry;
		906
		907	w.start (retry_int);
759	}	908	}
760	}	909	}
761		910
762	void	911	void
763	connection::reset_connection ()	912	connection::reset_connection ()
…		…
766	{	915	{
767	slog (L_INFO, _("%s(%s): connection lost"),	916	slog (L_INFO, _("%s(%s): connection lost"),
768	conf->nodename, (const char *)si);	917	conf->nodename, (const char *)si);
769		918
770	if (::conf.script_node_down)	919	if (::conf.script_node_down)
771	run_script (run_script_cb (this, &connection::script_node_down), false);	920	{
		921	run_script_cb *cb = new run_script_cb;
		922	cb->set<connection, &connection::script_node_down> (this);
		923	run_script_queued (cb, _("node-down command execution failed, continuing."));
		924	}
772	}	925	}
773		926
774	delete ictx; ictx = 0;	927	delete ictx; ictx = 0;
775	delete octx; octx = 0;	928	delete octx; octx = 0;
776		929
777	si.host= 0;	930	si.host = 0;
778		931
779	last_activity = 0;	932	last_activity = 0.;
		933	//last_si_change = 0.;
780	retry_cnt = 0;	934	retry_cnt = 0;
781		935
782	rekey.reset ();	936	rekey.stop ();
783	keepalive.reset ();	937	keepalive.stop ();
784	establish_connection.reset ();	938	establish_connection.stop ();
785	}	939	}
786		940
787	void	941	void
788	connection::shutdown ()	942	connection::shutdown ()
789	{	943	{
…		…
791	send_reset (si);	945	send_reset (si);
792		946
793	reset_connection ();	947	reset_connection ();
794	}	948	}
795		949
796	void	950	// poor-man's rekeying
797	connection::rekey_cb (time_watcher &w)	951	inline void
		952	connection::rekey_cb (ev::timer &w, int revents)
798	{	953	{
799	w.at = TSTAMP_CANCEL;
800
801	reset_connection ();	954	reset_connection ();
802	establish_connection ();	955	establish_connection ();
803	}	956	}
804		957
805	void	958	void
…		…
820	if (oseqno > MAX_SEQNO)	973	if (oseqno > MAX_SEQNO)
821	rekey ();	974	rekey ();
822	}	975	}
823		976
824	void	977	void
		978	connection::post_inject_queue ()
		979	{
		980	// force a connection every now and when when packets are sent (max 1/s)
		981	if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
		982	establish_connection.stop ();
		983
		984	establish_connection ();
		985	}
		986
		987	void
825	connection::inject_data_packet (tap_packet pkt, bool broadcast/TODO DDD*/)	988	connection::inject_data_packet (tap_packet *pkt)
826	{	989	{
827	if (ictx && octx)	990	if (ictx && octx)
828	send_data_packet (pkt);	991	send_data_packet (pkt);
829	else	992	else
830	{	993	{
831	if (!broadcast)//DDDD
832	data_queue.put (new tap_packet (*pkt));	994	data_queue.put (new tap_packet (*pkt));
833		995	post_inject_queue ();
834	establish_connection ();
835	}	996	}
836	}	997	}
837		998
		999	void
838	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)	1000	connection::inject_vpn_packet (vpn_packet *pkt, int tos)
839	{	1001	{
840	if (ictx && octx)	1002	if (ictx && octx)
841	send_vpn_packet (pkt, si, tos);	1003	send_vpn_packet (pkt, si, tos);
842	else	1004	else
843	{	1005	{
844	vpn_queue.put (new vpn_packet (*pkt));	1006	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
845		1007	post_inject_queue ();
846	establish_connection ();
847	}	1008	}
848	}	1009	}
849		1010
850	void	1011	void
851	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	1012	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
852	{	1013	{
853	last_activity = NOW;	1014	last_activity = ev_now ();
854		1015
855	slog (L_NOISE, "<<%d received packet type %d from %d to %d",	1016	slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
856	conf->id, pkt->typ (), pkt->src (), pkt->dst ());	1017	conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
		1018
		1019	if (connectmode == conf_node::C_DISABLED)
		1020	return;
857		1021
858	switch (pkt->typ ())	1022	switch (pkt->typ ())
859	{	1023	{
860	case vpn_packet::PT_PING:	1024	case vpn_packet::PT_PING:
		1025	slog (L_TRACE, "%s >> PT_PING", conf->nodename);
		1026
861	// we send pings instead of auth packets after some retries,	1027	// we send pings instead of auth packets after some retries,
862	// so reset the retry counter and establish a connection	1028	// so reset the retry counter and establish a connection
863	// when we receive a ping.	1029	// when we receive a ping.
864	if (!ictx)	1030	if (!ictx)
865	{	1031	{
866	if (auth_rate_limiter.can (rsi))	1032	if (auth_rate_limiter.can (rsi))
867	send_auth_request (rsi, true);	1033	send_auth_request (rsi, true);
868	}	1034	}
869	else	1035	else
		1036	// we would love to change the socket address here, but ping's aren't
		1037	// authenticated, so we best ignore it.
870	send_ping (rsi, 1); // pong	1038	send_ping (rsi, 1); // pong
871		1039
872	break;	1040	break;
873		1041
874	case vpn_packet::PT_PONG:	1042	case vpn_packet::PT_PONG:
		1043	slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
		1044
		1045	// a PONG might mean that the other side doesn't really know
		1046	// about our desire for communication.
		1047	establish_connection ();
875	break;	1048	break;
876		1049
877	case vpn_packet::PT_RESET:	1050	case vpn_packet::PT_RESET:
878	{	1051	{
879	reset_connection ();	1052	reset_connection ();
880		1053
881	config_packet p = (config_packet ) pkt;	1054	config_packet p = (config_packet ) pkt;
882		1055
883	if (!p->chk_config ())	1056	if (!p->chk_config ())
884	{	1057	{
885	slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),	1058	slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
886	conf->nodename, (const char *)rsi);	1059	conf->nodename, (const char *)rsi);
887	connectmode = conf_node::C_DISABLED;	1060	connectmode = conf_node::C_DISABLED;
888	}	1061	}
889	else if (connectmode == conf_node::C_ALWAYS)	1062	else if (connectmode == conf_node::C_ALWAYS)
890	establish_connection ();	1063	establish_connection ();
…		…
892	break;	1065	break;
893		1066
894	case vpn_packet::PT_AUTH_REQ:	1067	case vpn_packet::PT_AUTH_REQ:
895	if (auth_rate_limiter.can (rsi))	1068	if (auth_rate_limiter.can (rsi))
896	{	1069	{
897	auth_req_packet p = (auth_req_packet ) pkt;	1070	auth_req_packet p = (auth_req_packet )pkt;
898		1071
899	slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);	1072	slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
		1073	conf->nodename, p->initiate ? "initiate" : "reply",
		1074	p->protocols, p->features);
900		1075
901	if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))	1076	if (p->chk_config ()
		1077	&& (!memcmp (p->magic, MAGIC_OLD, 8) \|\| !memcmp (p->magic, MAGIC, 8)))
902	{	1078	{
903	if (p->prot_minor != PROTOCOL_MINOR)	1079	if (p->prot_minor != PROTOCOL_MINOR)
904	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),	1080	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
905	conf->nodename, (const char *)rsi,	1081	conf->nodename, (const char *)rsi,
906	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1082	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
…		…
908	if (p->initiate)	1084	if (p->initiate)
909	send_auth_request (rsi, false);	1085	send_auth_request (rsi, false);
910		1086
911	rsachallenge k;	1087	rsachallenge k;
912		1088
913	if (0 > RSA_private_decrypt (sizeof (p->encr),	1089	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914	(unsigned char )&p->encr, (unsigned char )&k,	1090	{
915	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	1091	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
917	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));	1092	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		1093	break;
		1094	}
918	else	1095	else
919	{	1096	{
920	delete octx;	1097	delete octx;
921		1098
922	octx = new crypto_ctx (k, 1);	1099	octx = new crypto_ctx (k, 1);
923	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	1100	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
924		1101
925	conf->protocols = p->protocols;	1102	conf->protocols = p->protocols;
		1103	features = p->features & config_packet::get_features ();
926		1104
927	send_auth_response (rsi, p->id, k);	1105	send_auth_response (rsi, p->id, k);
928		1106
929	connection_established ();	1107	connection_established ();
930		1108
931	break;	1109	break;
932	}	1110	}
933	}	1111	}
934	else	1112	else
935	slog (L_WARN, _("%s(%s): protocol mismatch"),	1113	slog (L_WARN, _("%s(%s): protocol mismatch."),
936	conf->nodename, (const char *)rsi);	1114	conf->nodename, (const char *)rsi);
937		1115
938	send_reset (rsi);	1116	send_reset (rsi);
939	}	1117	}
940		1118
941	break;	1119	break;
942		1120
943	case vpn_packet::PT_AUTH_RES:	1121	case vpn_packet::PT_AUTH_RES:
944	{	1122	{
945	auth_res_packet p = (auth_res_packet ) pkt;	1123	auth_res_packet p = (auth_res_packet )pkt;
946		1124
947	slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);	1125	slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
948		1126
949	if (p->chk_config ())	1127	if (p->chk_config ())
950	{	1128	{
951	if (p->prot_minor != PROTOCOL_MINOR)	1129	if (p->prot_minor != PROTOCOL_MINOR)
952	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),	1130	slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
…		…
955		1133
956	rsachallenge chg;	1134	rsachallenge chg;
957		1135
958	if (!rsa_cache.find (p->id, chg))	1136	if (!rsa_cache.find (p->id, chg))
959	{	1137	{
960	slog (L_ERR, _("%s(%s): unrequested auth response ignored"),	1138	slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
961	conf->nodename, (const char *)rsi);	1139	conf->nodename, (const char *)rsi);
962	break;	1140	break;
963	}	1141	}
964	else	1142	else
965	{	1143	{
966	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1144	crypto_ctx *cctx = new crypto_ctx (chg, 0);
967		1145
968	if (!p->hmac_chk (cctx))	1146	if (!p->hmac_chk (cctx))
969	{	1147	{
970	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1148	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
971	"could be an attack, or just corruption or an synchronization error"),	1149	"could be an attack, or just corruption or a synchronization error."),
972	conf->nodename, (const char *)rsi);	1150	conf->nodename, (const char *)rsi);
973	break;	1151	break;
974	}	1152	}
975	else	1153	else
976	{	1154	{
…		…
987	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid	1165	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
988		1166
989	si = rsi;	1167	si = rsi;
990	protocol = rsi.prot;	1168	protocol = rsi.prot;
991		1169
		1170	slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
		1171	conf->nodename, (const char *)rsi,
		1172	is_direct ? "direct" : "forwarded",
		1173	p->prot_major, p->prot_minor);
		1174
992	connection_established ();	1175	connection_established ();
993		1176
994	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
995	conf->nodename, (const char *)rsi,
996	p->prot_major, p->prot_minor);
997
998	if (::conf.script_node_up)	1177	if (::conf.script_node_up)
999	run_script (run_script_cb (this, &connection::script_node_up), false);	1178	{
		1179	run_script_cb *cb = new run_script_cb;
		1180	cb->set<connection, &connection::script_node_up> (this);
		1181	run_script_queued (cb, _("node-up command execution failed, continuing."));
		1182	}
1000		1183
1001	break;	1184	break;
1002	}	1185	}
1003	else	1186	else
1004	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1187	slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1005	conf->nodename, (const char *)rsi);	1188	conf->nodename, (const char *)rsi);
1006	}	1189	}
1007		1190
1008	delete cctx;	1191	delete cctx;
1009	}	1192	}
…		…
1025	{	1208	{
1026	vpndata_packet p = (vpndata_packet )pkt;	1209	vpndata_packet p = (vpndata_packet )pkt;
1027		1210
1028	if (!p->hmac_chk (ictx))	1211	if (!p->hmac_chk (ictx))
1029	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1212	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1030	"could be an attack, or just corruption or an synchronization error"),	1213	"could be an attack, or just corruption or a synchronization error."),
1031	conf->nodename, (const char *)rsi);	1214	conf->nodename, (const char *)rsi);
1032	else	1215	else
1033	{	1216	{
1034	u32 seqno;	1217	u32 seqno;
1035	tap_packet *d = p->unpack (this, seqno);	1218	tap_packet *d = p->unpack (this, seqno);
		1219	int seqclass = iseqno.seqno_classify (seqno);
1036		1220
1037	if (iseqno.recv_ok (seqno))	1221	if (seqclass == 0) // ok
1038	{	1222	{
1039	vpn->tap->send (d);	1223	vpn->tap->send (d);
1040		1224
1041	if (si != rsi)	1225	if (si != rsi)
1042	{	1226	{
1043	// fast re-sync on connection changes, useful especially for tcp/ip	1227	// fast re-sync on source address changes, useful especially for tcp/ip
		1228	//if (last_si_change < ev_now () + 5.)
1044	si = rsi;	1229	// {
1045
1046	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1230	slog (L_INFO, _("%s(%s): changing socket address to %s."),
1047	conf->nodename, (const char )si, (const char )rsi);	1231	conf->nodename, (const char )si, (const char )rsi);
		1232
		1233	si = rsi;
		1234
		1235	if (::conf.script_node_change)
		1236	{
		1237	run_script_cb *cb = new run_script_cb;
		1238	cb->set<connection, &connection::script_node_change> (this);
		1239	run_script_queued (cb, _("node-change command execution failed, continuing."));
		1240	}
		1241
		1242	// }
		1243	//else
		1244	// slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
		1245	// conf->nodename, (const char )si, (const char )rsi);
1048	}	1246	}
1049
1050	delete d;
1051
1052	break;
1053	}	1247	}
		1248	else if (seqclass == 1) // far history
		1249	slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
		1250	"possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
		1251	else if (seqclass == 2) // in-window duplicate, happens often on wireless
		1252	slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
		1253	"possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
		1254	else if (seqclass == 3) // reset
		1255	{
		1256	slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
		1257	"probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
		1258	send_reset (rsi);
		1259	}
		1260
		1261	delete d;
		1262	break;
1054	}	1263	}
1055	}	1264	}
1056		1265
1057	send_reset (rsi);	1266	send_reset (rsi);
1058	break;	1267	break;
1059		1268
1060	case vpn_packet::PT_CONNECT_REQ:	1269	case vpn_packet::PT_CONNECT_REQ:
1061	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1270	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1062	{	1271	{
1063	connect_req_packet p = (connect_req_packet ) pkt;	1272	connect_req_packet p = (connect_req_packet )pkt;
1064		1273
1065	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1274	if (p->id > 0 && p->id <= vpn->conns.size ())
1066	connection *c = vpn->conns[p->id - 1];
1067	conf->protocols = p->protocols;
1068
1069	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1070	conf->id, p->id, c->ictx && c->octx);
1071
1072	if (c->ictx && c->octx)
1073	{	1275	{
		1276	connection *c = vpn->conns[p->id - 1];
		1277	conf->protocols = p->protocols;
		1278
		1279	slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
		1280	conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
		1281	p->protocols,
		1282	c->ictx && c->octx);
		1283
		1284	if (c->ictx && c->octx)
		1285	{
1074	// send connect_info packets to both sides, in case one is	1286	// send connect_info packets to both sides, in case one is
1075	// behind a nat firewall (or both ;)	1287	// behind a nat firewall (or both ;)
1076	c->send_connect_info (conf->id, si, conf->protocols);	1288	c->send_connect_info (conf->id, si, conf->protocols);
1077	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1289	send_connect_info (c->conf->id, c->si, c->conf->protocols);
		1290	}
		1291	else
		1292	c->establish_connection ();
1078	}	1293	}
1079	else	1294	else
1080	c->establish_connection ();	1295	slog (L_WARN,
		1296	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1297	p->id);
1081	}	1298	}
1082		1299
1083	break;	1300	break;
1084		1301
1085	case vpn_packet::PT_CONNECT_INFO:	1302	case vpn_packet::PT_CONNECT_INFO:
1086	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1303	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1087	{	1304	{
1088	connect_info_packet p = (connect_info_packet ) pkt;	1305	connect_info_packet p = (connect_info_packet )pkt;
1089		1306
1090	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1307	if (p->id > 0 && p->id <= vpn->conns.size ())
1091		1308	{
1092	connection *c = vpn->conns[p->id - 1];	1309	connection *c = vpn->conns[p->id - 1];
1093		1310
1094	c->conf->protocols = p->protocols;	1311	c->conf->protocols = p->protocols;
1095	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1312	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1096	p->si.upgrade_protocol (protocol, c->conf);	1313	p->si.upgrade_protocol (protocol, c->conf);
1097		1314
1098	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1315	slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1099	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1316	conf->nodename,
		1317	vpn->conns[p->id - 1]->conf->nodename,
		1318	(const char *)p->si,
		1319	p->protocols,
		1320	!c->ictx && !c->octx);
1100		1321
1101	const sockinfo &dsi = forward_si (p->si);	1322	const sockinfo &dsi = forward_si (p->si);
1102		1323
1103	if (dsi.valid ())	1324	if (dsi.valid ())
1104	c->send_auth_request (dsi, true);	1325	c->send_auth_request (dsi, true);
		1326	}
		1327	else
		1328	slog (L_WARN,
		1329	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1330	p->id);
1105	}	1331	}
1106		1332
1107	break;	1333	break;
1108		1334
1109	default:	1335	default:
1110	send_reset (rsi);	1336	send_reset (rsi);
1111	break;	1337	break;
1112	}	1338	}
1113	}	1339	}
1114		1340
1115	void connection::keepalive_cb (time_watcher &w)	1341	inline void
		1342	connection::keepalive_cb (ev::timer &w, int revents)
1116	{	1343	{
1117	if (NOW >= last_activity + ::conf.keepalive + 30)	1344	if (ev_now () >= last_activity + ::conf.keepalive + 15)
1118	{	1345	{
1119	reset_connection ();	1346	reset_connection ();
1120	establish_connection ();	1347	establish_connection ();
1121	}	1348	}
1122	else if (NOW < last_activity + ::conf.keepalive)	1349	else if (ev_now () < last_activity + ::conf.keepalive)
1123	w.at = last_activity + ::conf.keepalive;	1350	w.start (last_activity + ::conf.keepalive - ev::now ());
1124	else if (conf->connectmode != conf_node::C_ONDEMAND	1351	else if (conf->connectmode != conf_node::C_ONDEMAND
1125	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1352	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1126	{	1353	{
1127	send_ping (si);	1354	send_ping (si);
1128	w.at = NOW + 5;	1355	w.start (3);
1129	}	1356	}
1130	else if (NOW < last_activity + ::conf.keepalive + 10)	1357	else if (ev_now () < last_activity + ::conf.keepalive + 10)
1131	// hold ondemand connections implicitly a few seconds longer	1358	// hold ondemand connections implicitly a few seconds longer
1132	// should delete octx, though, or something like that ;)	1359	// should delete octx, though, or something like that ;)
1133	w.at = last_activity + ::conf.keepalive + 10;	1360	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1134	else	1361	else
1135	reset_connection ();	1362	reset_connection ();
1136	}	1363	}
1137		1364
		1365	void
1138	void connection::send_connect_request (int id)	1366	connection::send_connect_request (int id)
1139	{	1367	{
1140	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1368	connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1141		1369
1142	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);	1370	slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
		1371	conf->nodename, vpn->conns[id - 1]->conf->nodename,
		1372	THISNODE->protocols);
1143	p->hmac_set (octx);	1373	p->hmac_set (octx);
1144	send_vpn_packet (p, si);	1374	send_vpn_packet (p, si);
1145		1375
1146	delete p;	1376	delete p;
1147	}	1377	}
1148		1378
1149	void connection::script_node ()	1379	void
		1380	connection::script_init_env (const char *ext)
1150	{	1381	{
1151	vpn->script_if_up ();
1152
1153	char *env;	1382	char *env;
		1383	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1384	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1385	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1386	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1387	conf->id & 0xff); putenv (env);
		1388	}
		1389
		1390	void
		1391	connection::script_init_connect_env ()
		1392	{
		1393	vpn->script_init_env ();
		1394
		1395	char *env;
1154	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1396	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
		1397	asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1155	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1398	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1156	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1399	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1157	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1400	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1158	}	1401	}
1159		1402
		1403	inline const char *
1160	const char *connection::script_node_up ()	1404	connection::script_node_up ()
1161	{	1405	{
1162	script_node ();	1406	script_init_connect_env ();
1163		1407
1164	putenv ("STATE=up");	1408	putenv ((char *)"STATE=up");
1165		1409
		1410	char *filename;
		1411	asprintf (&filename,
		1412	"%s/%s",
		1413	confbase,
1166	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1414	::conf.script_node_up ? ::conf.script_node_up : "node-up");
1167	}
1168		1415
		1416	return filename;
		1417	}
		1418
		1419	inline const char *
		1420	connection::script_node_change ()
		1421	{
		1422	script_init_connect_env ();
		1423
		1424	putenv ((char *)"STATE=change");
		1425
		1426	char *filename;
		1427	asprintf (&filename,
		1428	"%s/%s",
		1429	confbase,
		1430	::conf.script_node_change ? ::conf.script_node_change : "node-change");
		1431
		1432	return filename;
		1433	}
		1434
		1435	inline const char *
1169	const char *connection::script_node_down ()	1436	connection::script_node_down ()
1170	{	1437	{
1171	script_node ();	1438	script_init_connect_env ();
1172		1439
1173	putenv ("STATE=down");	1440	putenv ((char *)"STATE=down");
1174		1441
1175	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1442	char *filename;
1176	}	1443	asprintf (&filename,
		1444	"%s/%s",
		1445	confbase,
		1446	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1177		1447
		1448	return filename;
		1449	}
		1450
1178	connection::connection(struct vpn *vpn_)	1451	connection::connection (struct vpn vpn, conf_node conf)
1179	: vpn(vpn_)	1452	: vpn(vpn), conf(conf),
1180	, rekey (this, &connection::rekey_cb)	1453	#if ENABLE_DNS
1181	, keepalive (this, &connection::keepalive_cb)	1454	dns (0),
		1455	#endif
		1456	data_queue(conf->max_ttl, conf->max_queue + 1),
		1457	vpn_queue(conf->max_ttl, conf->max_queue + 1)
		1458	{
		1459	rekey .set<connection, &connection::rekey_cb > (this);
		1460	keepalive .set<connection, &connection::keepalive_cb > (this);
1182	, establish_connection (this, &connection::establish_connection_cb)	1461	establish_connection.set<connection, &connection::establish_connection_cb> (this);
1183	{	1462
		1463	last_establish_attempt = 0.;
1184	octx = ictx = 0;	1464	octx = ictx = 0;
1185	retry_cnt = 0;
1186		1465
1187	connectmode = conf_node::C_ALWAYS; // initial setting	1466	connectmode = conf->connectmode;
		1467
		1468	// queue a dummy packet to force an initial connection attempt
		1469	if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
		1470	vpn_queue.put (new net_packet);
		1471
1188	reset_connection ();	1472	reset_connection ();
1189	}	1473	}
1190		1474
1191	connection::~connection ()	1475	connection::~connection ()
1192	{	1476	{
1193	shutdown ();	1477	shutdown ();
1194	}	1478	}
1195		1479
		1480	void
1196	void connection_init ()	1481	connection_init ()
1197	{	1482	{
1198	auth_rate_limiter.clear ();	1483	auth_rate_limiter.clear ();
1199	reset_rate_limiter.clear ();	1484	reset_rate_limiter.clear ();
1200	}	1485	}
1201		1486

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs. Revision 1.95 by root, Tue Mar 8 17:33:30 2011 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.95 by root, Tue Mar 8 17:33:30 2011 UTC