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

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.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"
43	# define RAND_pseudo_bytes RAND_bytes	40	# define RAND_pseudo_bytes RAND_bytes
44	#endif	41	#endif
45		42
46	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	43	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
47		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
48	struct crypto_ctx	51	struct crypto_ctx
49	{	52	{
50	EVP_CIPHER_CTX cctx;	53	EVP_CIPHER_CTX cctx;
51	HMAC_CTX hctx;	54	HMAC_CTX hctx;
52		55
…		…
55	};	58	};
56		59
57	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	60	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
58	{	61	{
59	EVP_CIPHER_CTX_init (&cctx);	62	EVP_CIPHER_CTX_init (&cctx);
60	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));
61	HMAC_CTX_init (&hctx);	64	HMAC_CTX_init (&hctx);
62	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);
63	}	66	}
64		67
65	crypto_ctx::~crypto_ctx ()	68	crypto_ctx::~crypto_ctx ()
66	{	69	{
67	EVP_CIPHER_CTX_cleanup (&cctx);	70	require (EVP_CIPHER_CTX_cleanup (&cctx));
68	HMAC_CTX_cleanup (&hctx);	71	HMAC_CTX_cleanup (&hctx);
69	}	72	}
70		73
71	static void	74	static void
72	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	75	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
73	{	76	{
74	EVP_MD_CTX ctx;	77	EVP_MD_CTX ctx;
75		78
76	EVP_MD_CTX_init (&ctx);	79	EVP_MD_CTX_init (&ctx);
77	EVP_DigestInit (&ctx, RSA_HASH);	80	require (EVP_DigestInit (&ctx, RSA_HASH));
78	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	81	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
79	EVP_DigestUpdate(&ctx, &id, sizeof id);	82	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
80	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	83	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
81	EVP_MD_CTX_cleanup (&ctx);	84	EVP_MD_CTX_cleanup (&ctx);
82	}	85	}
83		86
84	struct rsa_entry {	87	struct rsa_entry {
85	tstamp expire;	88	tstamp expire;
…		…
87	rsachallenge chg;	90	rsachallenge chg;
88	};	91	};
89		92
90	struct rsa_cache : list<rsa_entry>	93	struct rsa_cache : list<rsa_entry>
91	{	94	{
92	void cleaner_cb (time_watcher &w); time_watcher cleaner;	95	void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
93		96
94	bool find (const rsaid &id, rsachallenge &chg)	97	bool find (const rsaid &id, rsachallenge &chg)
95	{	98	{
96	for (iterator i = begin (); i != end (); ++i)	99	for (iterator i = begin (); i != end (); ++i)
97	{	100	{
98	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	101	if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
99	{	102	{
100	memcpy (&chg, &i->chg, sizeof chg);	103	memcpy (&chg, &i->chg, sizeof chg);
101		104
102	erase (i);	105	erase (i);
103	return true;	106	return true;
104	}	107	}
105	}	108	}
106		109
107	if (cleaner.at < NOW)	110	if (!cleaner.is_active ())
108	cleaner.start (NOW + RSA_TTL);	111	cleaner.again ();
109		112
110	return false;	113	return false;
111	}	114	}
112		115
113	void gen (rsaid &id, rsachallenge &chg)	116	void gen (rsaid &id, rsachallenge &chg)
114	{	117	{
115	rsa_entry e;	118	rsa_entry e;
116		119
117	RAND_bytes ((unsigned char *)&id, sizeof id);	120	RAND_bytes ((unsigned char *)&id, sizeof id);
118	RAND_bytes ((unsigned char *)&chg, sizeof chg);	121	RAND_bytes ((unsigned char *)&chg, sizeof chg);
119		122
120	e.expire = NOW + RSA_TTL;	123	e.expire = ev::ev_now () + RSA_TTL;
121	e.id = id;	124	e.id = id;
122	memcpy (&e.chg, &chg, sizeof chg);	125	memcpy (&e.chg, &chg, sizeof chg);
123		126
124	push_back (e);	127	push_back (e);
125		128
126	if (cleaner.at < NOW)	129	if (!cleaner.is_active ())
127	cleaner.start (NOW + RSA_TTL);	130	cleaner.again ();
128	}	131	}
129		132
130	rsa_cache ()	133	rsa_cache ()
131	: cleaner (this, &rsa_cache::cleaner_cb)	134	: cleaner (this, &rsa_cache::cleaner_cb)
132	{ }	135	{
		136	cleaner.set (RSA_TTL, RSA_TTL);
		137	}
133		138
134	} rsa_cache;	139	} rsa_cache;
135		140
136	void rsa_cache::cleaner_cb (time_watcher &w)	141	void rsa_cache::cleaner_cb (ev::timer &w, int revents)
137	{	142	{
138	if (empty ())	143	if (empty ())
139	w.at = TSTAMP_CANCEL;	144	w.stop ();
140	else	145	else
141	{	146	{
142	w.at = NOW + RSA_TTL;
143
144	for (iterator i = begin (); i != end (); )	147	for (iterator i = begin (); i != end (); )
145	if (i->expire <= NOW)	148	if (i->expire <= ev::ev_now ())
146	i = erase (i);	149	i = erase (i);
147	else	150	else
148	++i;	151	++i;
149	}	152	}
150	}	153	}
…		…
199	// 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.
200	// this implementation ("splay list" ;) is inefficient,	203	// this implementation ("splay list" ;) is inefficient,
201	// but low on resources.	204	// but low on resources.
202	struct net_rate_limiter : list<net_rateinfo>	205	struct net_rate_limiter : list<net_rateinfo>
203	{	206	{
204	static const double ALPHA = 1. - 1. / 600.; // allow bursts	207	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
205	static const double CUTOFF = 10.; // one event every CUTOFF seconds	208	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
206	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	209	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
207	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
208		211
209	bool can (const sockinfo &si) { return can((u32)si.host); }	212	bool can (const sockinfo &si) { return can((u32)si.host); }
210	bool can (u32 host);	213	bool can (u32 host);
211	};	214	};
212		215
…		…
217	iterator i;	220	iterator i;
218		221
219	for (i = begin (); i != end (); )	222	for (i = begin (); i != end (); )
220	if (i->host == host)	223	if (i->host == host)
221	break;	224	break;
222	else if (i->last < NOW - EXPIRE)	225	else if (i->last < ev::ev_now () - NRL_EXPIRE)
223	i = erase (i);	226	i = erase (i);
224	else	227	else
225	i++;	228	i++;
226		229
227	if (i == end ())	230	if (i == end ())
228	{	231	{
229	net_rateinfo ri;	232	net_rateinfo ri;
230		233
231	ri.host = host;	234	ri.host = host;
232	ri.pcnt = 1.;	235	ri.pcnt = 1.;
233	ri.diff = MAXDIF;	236	ri.diff = NRL_MAXDIF;
234	ri.last = NOW;	237	ri.last = ev::ev_now ();
235		238
236	push_front (ri);	239	push_front (ri);
237		240
238	return true;	241	return true;
239	}	242	}
240	else	243	else
241	{	244	{
242	net_rateinfo ri (*i);	245	net_rateinfo ri (*i);
243	erase (i);	246	erase (i);
244		247
245	ri.pcnt = ri.pcnt * ALPHA;	248	ri.pcnt = ri.pcnt * NRL_ALPHA;
246	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	249	ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
247		250
248	ri.last = NOW;	251	ri.last = ev::ev_now ();
249		252
250	double dif = ri.diff / ri.pcnt;	253	double dif = ri.diff / ri.pcnt;
251		254
252	bool send = dif > CUTOFF;	255	bool send = dif > NRL_CUTOFF;
253		256
254	if (dif > MAXDIF)	257	if (dif > NRL_MAXDIF)
255	{	258	{
256	ri.pcnt = 1.;	259	ri.pcnt = 1.;
257	ri.diff = MAXDIF;	260	ri.diff = NRL_MAXDIF;
258	}	261	}
259	else if (send)	262	else if (send)
260	ri.pcnt++;	263	ri.pcnt++;
261		264
262	push_front (ri);	265	push_front (ri);
…		…
309	}	312	}
310		313
311	#define MAXVPNDATA (MAX_MTU - 6 - 6)	314	#define MAXVPNDATA (MAX_MTU - 6 - 6)
312	#define DATAHDR (sizeof (u32) + RAND_SIZE)	315	#define DATAHDR (sizeof (u32) + RAND_SIZE)
313		316
314	struct vpndata_packet:vpn_packet	317	struct vpndata_packet : vpn_packet
315	{	318	{
316	u8 data[MAXVPNDATA + DATAHDR]; // seqno	319	u8 data[MAXVPNDATA + DATAHDR]; // seqno
317		320
318	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);
319	tap_packet unpack (connection conn, u32 &seqno);	322	tap_packet unpack (connection conn, u32 &seqno);
…		…
332	int outl = 0, outl2;	335	int outl = 0, outl2;
333	ptype type = PT_DATA_UNCOMPRESSED;	336	ptype type = PT_DATA_UNCOMPRESSED;
334		337
335	#if ENABLE_COMPRESSION	338	#if ENABLE_COMPRESSION
336	u8 cdata[MAX_MTU];	339	u8 cdata[MAX_MTU];
337	u32 cl;
338		340
		341	if (conn->features & ENABLE_COMPRESSION)
		342	{
339	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	343	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		344
340	if (cl)	345	if (cl)
341	{	346	{
342	type = PT_DATA_COMPRESSED;	347	type = PT_DATA_COMPRESSED;
343	d = cdata;	348	d = cdata;
344	l = cl + 2;	349	l = cl + 2;
345		350
346	d[0] = cl >> 8;	351	d[0] = cl >> 8;
347	d[1] = cl;	352	d[1] = cl;
		353	}
348	}	354	}
349	#endif	355	#endif
350		356
351	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	357	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
352		358
353	struct {	359	struct {
354	#if RAND_SIZE	360	#if RAND_SIZE
355	u8 rnd[RAND_SIZE];	361	u8 rnd[RAND_SIZE];
356	#endif	362	#endif
…		…
360	datahdr.seqno = ntohl (seqno);	366	datahdr.seqno = ntohl (seqno);
361	#if RAND_SIZE	367	#if RAND_SIZE
362	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	368	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
363	#endif	369	#endif
364		370
365	EVP_EncryptUpdate (cctx,	371	require (EVP_EncryptUpdate (cctx,
366	(unsigned char *) data + outl, &outl2,	372	(unsigned char *) data + outl, &outl2,
367	(unsigned char *) &datahdr, DATAHDR);	373	(unsigned char *) &datahdr, DATAHDR));
368	outl += outl2;	374	outl += outl2;
369		375
370	EVP_EncryptUpdate (cctx,	376	require (EVP_EncryptUpdate (cctx,
371	(unsigned char *) data + outl, &outl2,	377	(unsigned char *) data + outl, &outl2,
372	(unsigned char *) d, l);	378	(unsigned char *) d, l));
373	outl += outl2;	379	outl += outl2;
374		380
375	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	381	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
376	outl += outl2;	382	outl += outl2;
377		383
378	len = outl + data_hdr_size ();	384	len = outl + data_hdr_size ();
379		385
380	set_hdr (type, dst);	386	set_hdr (type, dst);
…		…
389	int outl = 0, outl2;	395	int outl = 0, outl2;
390	tap_packet *p = new tap_packet;	396	tap_packet *p = new tap_packet;
391	u8 *d;	397	u8 *d;
392	u32 l = len - data_hdr_size ();	398	u32 l = len - data_hdr_size ();
393		399
394	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	400	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
395		401
396	#if ENABLE_COMPRESSION	402	#if ENABLE_COMPRESSION
397	u8 cdata[MAX_MTU];	403	u8 cdata[MAX_MTU];
398		404
399	if (type == PT_DATA_COMPRESSED)	405	if (type == PT_DATA_COMPRESSED)
…		…
401	else	407	else
402	#endif	408	#endif
403	d = &(*p)[6 + 6 - DATAHDR];	409	d = &(*p)[6 + 6 - DATAHDR];
404		410
405	/* 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 */
406	EVP_DecryptUpdate (cctx,	412	require (EVP_DecryptUpdate (cctx,
407	d, &outl2,	413	d, &outl2,
408	(unsigned char *)&data, len - data_hdr_size ());	414	(unsigned char *)&data, len - data_hdr_size ()));
409	outl += outl2;	415	outl += outl2;
410		416
411	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	417	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
412	outl += outl2;	418	outl += outl2;
413		419
414	seqno = ntohl ((u32 )(d + RAND_SIZE));	420	seqno = ntohl ((u32 )(d + RAND_SIZE));
415		421
416	id2mac (dst () ? dst() : THISNODE->id, p->dst);	422	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
445	{	451	{
446	// actually, hmaclen cannot be checked because the hmac	452	// actually, hmaclen cannot be checked because the hmac
447	// field comes before this data, so peers with other	453	// field comes before this data, so peers with other
448	// hmacs simply will not work.	454	// hmacs simply will not work.
449	u8 prot_major, prot_minor, randsize, hmaclen;	455	u8 prot_major, prot_minor, randsize, hmaclen;
450	u8 flags, challengelen, pad2, pad3;	456	u8 flags, challengelen, features, pad3;
451	u32 cipher_nid, digest_nid, hmac_nid;	457	u32 cipher_nid, digest_nid, hmac_nid;
452
453	const u8 curflags () const
454	{
455	return 0x80
456	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
457	}
458		458
459	void setup (ptype type, int dst);	459	void setup (ptype type, int dst);
460	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	}
461	};	476	};
462		477
463	void config_packet::setup (ptype type, int dst)	478	void config_packet::setup (ptype type, int dst)
464	{	479	{
465	prot_major = PROTOCOL_MAJOR;	480	prot_major = PROTOCOL_MAJOR;
466	prot_minor = PROTOCOL_MINOR;	481	prot_minor = PROTOCOL_MINOR;
467	randsize = RAND_SIZE;	482	randsize = RAND_SIZE;
468	hmaclen = HMACLENGTH;	483	hmaclen = HMACLENGTH;
469	flags = curflags ();	484	flags = 0;
470	challengelen = sizeof (rsachallenge);	485	challengelen = sizeof (rsachallenge);
		486	features = get_features ();
471		487
472	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	488	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
473	digest_nid = htonl (EVP_MD_type (RSA_HASH));	489	digest_nid = htonl (EVP_MD_type (RSA_HASH));
474	hmac_nid = htonl (EVP_MD_type (DIGEST));	490	hmac_nid = htonl (EVP_MD_type (DIGEST));
475		491
…		…
478	}	494	}
479		495
480	bool config_packet::chk_config () const	496	bool config_packet::chk_config () const
481	{	497	{
482	if (prot_major != PROTOCOL_MAJOR)	498	if (prot_major != PROTOCOL_MAJOR)
483	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);
484	else if (randsize != RAND_SIZE)	500	else if (randsize != RAND_SIZE)
485	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);
486	else if (hmaclen != HMACLENGTH)	502	else if (hmaclen != HMACLENGTH)
487	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	503	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
488	else if (flags != curflags ())
489	slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
490	else if (challengelen != sizeof (rsachallenge))	504	else if (challengelen != sizeof (rsachallenge))
491	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));
492	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	506	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
493	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));
494	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	508	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
495	slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));	509	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
496	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	510	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
497	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));
498	else	512	else
499	return true;	513	return true;
500		514
501	return false;	515	return false;
502	}	516	}
503		517
504	struct auth_req_packet : config_packet	518	struct auth_req_packet : config_packet
505	{	519	{
506	char magic[8];	520	char magic[8];
507	u8 initiate; // false if this is just an automatic reply	521	u8 initiate; // false if this is just an automatic reply
508	u8 protocols; // supported protocols (will get patches on forward)	522	u8 protocols; // supported protocols (will be patched on forward)
509	u8 pad2, pad3;	523	u8 pad2, pad3;
510	rsaid id;	524	rsaid id;
511	rsaencrdata encr;	525	rsaencrdata encr;
512		526
513	auth_req_packet (int dst, bool initiate_, u8 protocols_)	527	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
574	{	588	{
575	if (ictx && octx)	589	if (ictx && octx)
576	{	590	{
577	connectmode = conf->connectmode;	591	connectmode = conf->connectmode;
578		592
579	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);
580	keepalive.start (NOW + ::conf.keepalive);	596	keepalive.start (::conf.keepalive);
581		597
582	// send queued packets	598	// send queued packets
583	if (ictx && octx)	599	if (ictx && octx)
584	{	600	{
585	while (tap_packet p = (tap_packet )data_queue.get ())	601	while (tap_packet p = (tap_packet )data_queue.get ())
…		…
596	}	612	}
597	}	613	}
598	else	614	else
599	{	615	{
600	retry_cnt = 0;	616	retry_cnt = 0;
601	establish_connection.start (NOW + 5);	617	establish_connection.start (5);
602	keepalive.reset ();	618	keepalive.stop ();
603	rekey.reset ();	619	rekey.stop ();
604	}	620	}
605	}	621	}
606		622
607	void	623	void
608	connection::reset_si ()	624	connection::reset_si ()
…		…
610	protocol = best_protocol (THISNODE->protocols & conf->protocols);	626	protocol = best_protocol (THISNODE->protocols & conf->protocols);
611		627
612	// mask out protocols we cannot establish	628	// mask out protocols we cannot establish
613	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	629	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
614	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	}
615		640
616	si.set (conf, protocol);	641	si.set (conf, protocol);
617	}	642	}
618		643
619	// ensure sockinfo is valid, forward if necessary	644	// ensure sockinfo is valid, forward if necessary
…		…
624	{	649	{
625	connection *r = vpn->find_router ();	650	connection *r = vpn->find_router ();
626		651
627	if (r)	652	if (r)
628	{	653	{
629	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	654	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
630	conf->nodename, r->conf->nodename);	655	conf->nodename, r->conf->nodename, (const char *)r->si);
631	return r->si;	656	return r->si;
632	}	657	}
633	else	658	else
634	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	659	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
635	conf->nodename);	660	conf->nodename);
…		…
674	connection::send_auth_request (const sockinfo &si, bool initiate)	699	connection::send_auth_request (const sockinfo &si, bool initiate)
675	{	700	{
676	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);
677		702
678	rsachallenge chg;	703	rsachallenge chg;
679
680	rsa_cache.gen (pkt->id, chg);	704	rsa_cache.gen (pkt->id, chg);
681		705	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
682	if (0 > RSA_public_encrypt (sizeof chg,
683	(unsigned char )&chg, (unsigned char )&pkt->encr,
684	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
685	fatal ("RSA_public_encrypt error");
686		706
687	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);
688		708
689	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
690		710
…		…
710	}	730	}
711		731
712	void	732	void
713	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	733	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
714	{	734	{
715	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	735	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
716	conf->id, rid, (const char *)rsi);	736	conf->id, rid, (const char *)rsi);
717		737
718	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);
719		739
720	r->hmac_set (octx);	740	r->hmac_set (octx);
…		…
722		742
723	delete r;	743	delete r;
724	}	744	}
725		745
726	void	746	void
727	connection::establish_connection_cb (time_watcher &w)	747	connection::establish_connection_cb (ev::timer &w, int revents)
728	{	748	{
729	if (ictx \|\| conf == THISNODE	749	if (!ictx
		750	&& conf != THISNODE
730	\|\| connectmode == conf_node::C_NEVER	751	&& connectmode != conf_node::C_NEVER
731	\|\| connectmode == conf_node::C_DISABLED)	752	&& connectmode != conf_node::C_DISABLED
732	w.at = TSTAMP_CANCEL;	753	&& !w.is_active ())
733	else if (w.at <= NOW)
734	{	754	{
735	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
736		756	? (retry_cnt & 3) + 1
737	if (retry_int < 3600 * 8)	757	: 1 << (retry_cnt >> 2));
738	retry_cnt++;
739
740	w.at = NOW + retry_int;
741		758
742	reset_si ();	759	reset_si ();
743		760
		761	bool slow = si.prot & PROT_SLOW;
		762
744	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);
745	vpn->send_connect_request (conf->id);	767	vpn->send_connect_request (conf->id);
		768	}
746	else	769	else
747	{	770	{
748	const sockinfo &dsi = forward_si (si);	771	const sockinfo &dsi = forward_si (si);
		772
		773	slow = slow \|\| (dsi.prot & PROT_SLOW);
749		774
750	if (dsi.valid () && auth_rate_limiter.can (dsi))	775	if (dsi.valid () && auth_rate_limiter.can (dsi))
751	{	776	{
752	if (retry_cnt < 4)	777	if (retry_cnt < 4)
753	send_auth_request (dsi, true);	778	send_auth_request (dsi, true);
754	else	779	else
755	send_ping (dsi, 0);	780	send_ping (dsi, 0);
756	}	781	}
757	}	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);
758	}	792	}
759	}	793	}
760		794
761	void	795	void
762	connection::reset_connection ()	796	connection::reset_connection ()
…		…
765	{	799	{
766	slog (L_INFO, _("%s(%s): connection lost"),	800	slog (L_INFO, _("%s(%s): connection lost"),
767	conf->nodename, (const char *)si);	801	conf->nodename, (const char *)si);
768		802
769	if (::conf.script_node_down)	803	if (::conf.script_node_down)
770	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."));
771	}	806	}
772		807
773	delete ictx; ictx = 0;	808	delete ictx; ictx = 0;
774	delete octx; octx = 0;	809	delete octx; octx = 0;
		810	#if ENABLE_DNS
		811	dnsv4_reset_connection ();
		812	#endif
775		813
776	si.host= 0;	814	si.host = 0;
777		815
778	last_activity = 0;	816	last_activity = 0;
779	retry_cnt = 0;	817	retry_cnt = 0;
780		818
781	rekey.reset ();	819	rekey.stop ();
782	keepalive.reset ();	820	keepalive.stop ();
783	establish_connection.reset ();	821	establish_connection.stop ();
784	}	822	}
785		823
786	void	824	void
787	connection::shutdown ()	825	connection::shutdown ()
788	{	826	{
…		…
791		829
792	reset_connection ();	830	reset_connection ();
793	}	831	}
794		832
795	void	833	void
796	connection::rekey_cb (time_watcher &w)	834	connection::rekey_cb (ev::timer &w, int revents)
797	{	835	{
798	w.at = TSTAMP_CANCEL;
799
800	reset_connection ();	836	reset_connection ();
801	establish_connection ();	837	establish_connection ();
802	}	838	}
803		839
804	void	840	void
…		…
825	{	861	{
826	if (ictx && octx)	862	if (ictx && octx)
827	send_data_packet (pkt);	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);
…		…
1037	{	1076	{
1038	vpn->tap->send (d);	1077	vpn->tap->send (d);
1039		1078
1040	if (si != rsi)	1079	if (si != rsi)
1041	{	1080	{
1042	// fast re-sync on connection changes, useful especially for tcp/ip	1081	// fast re-sync on source address changes, useful especially for tcp/ip
1043	si = rsi;	1082	si = rsi;
1044		1083
1045	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1084	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1046	conf->nodename, (const char )si, (const char )rsi);	1085	conf->nodename, (const char )si, (const char )rsi);
1047	}	1086	}
1048
1049	delete d;
1050
1051	break;
1052	}	1087	}
		1088
		1089	delete d;
		1090	break;
1053	}	1091	}
1054	}	1092	}
1055		1093
1056	send_reset (rsi);	1094	send_reset (rsi);
1057	break;	1095	break;
…		…
1059	case vpn_packet::PT_CONNECT_REQ:	1097	case vpn_packet::PT_CONNECT_REQ:
1060	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1098	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1061	{	1099	{
1062	connect_req_packet p = (connect_req_packet ) pkt;	1100	connect_req_packet p = (connect_req_packet ) pkt;
1063		1101
1064	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 ())
1065	connection *c = vpn->conns[p->id - 1];
1066	conf->protocols = p->protocols;
1067
1068	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1069	conf->id, p->id, c->ictx && c->octx);
1070
1071	if (c->ictx && c->octx)
1072	{	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	{
1073	// send connect_info packets to both sides, in case one is	1112	// send connect_info packets to both sides, in case one is
1074	// behind a nat firewall (or both ;)	1113	// behind a nat firewall (or both ;)
1075	c->send_connect_info (conf->id, si, conf->protocols);	1114	c->send_connect_info (conf->id, si, conf->protocols);
1076	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 ();
1077	}	1119	}
1078	else	1120	else
1079	c->establish_connection ();	1121	slog (L_WARN,
		1122	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1123	p->id);
1080	}	1124	}
1081		1125
1082	break;	1126	break;
1083		1127
1084	case vpn_packet::PT_CONNECT_INFO:	1128	case vpn_packet::PT_CONNECT_INFO:
1085	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1129	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086	{	1130	{
1087	connect_info_packet p = (connect_info_packet ) pkt;	1131	connect_info_packet p = (connect_info_packet )pkt;
1088		1132
1089	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 ())
1090		1134	{
1091	connection *c = vpn->conns[p->id - 1];	1135	connection *c = vpn->conns[p->id - 1];
1092		1136
1093	c->conf->protocols = p->protocols;	1137	c->conf->protocols = p->protocols;
1094	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));
1095	p->si.upgrade_protocol (protocol, c->conf);	1139	p->si.upgrade_protocol (protocol, c->conf);
1096		1140
1097	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1141	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1098	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);
1099		1143
1100	const sockinfo &dsi = forward_si (p->si);	1144	const sockinfo &dsi = forward_si (p->si);
1101		1145
1102	if (dsi.valid ())	1146	if (dsi.valid ())
1103	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);
1104	}	1153	}
1105		1154
1106	break;	1155	break;
1107		1156
1108	default:	1157	default:
1109	send_reset (rsi);	1158	send_reset (rsi);
1110	break;	1159	break;
1111	}	1160	}
1112	}	1161	}
1113		1162
1114	void connection::keepalive_cb (time_watcher &w)	1163	void connection::keepalive_cb (ev::timer &w, int revents)
1115	{	1164	{
1116	if (NOW >= last_activity + ::conf.keepalive + 30)	1165	if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1117	{	1166	{
1118	reset_connection ();	1167	reset_connection ();
1119	establish_connection ();	1168	establish_connection ();
1120	}	1169	}
1121	else if (NOW < last_activity + ::conf.keepalive)	1170	else if (ev::ev_now () < last_activity + ::conf.keepalive)
1122	w.at = last_activity + ::conf.keepalive;	1171	w.start (last_activity + ::conf.keepalive - ev::now ());
1123	else if (conf->connectmode != conf_node::C_ONDEMAND	1172	else if (conf->connectmode != conf_node::C_ONDEMAND
1124	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1173	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1125	{	1174	{
1126	send_ping (si);	1175	send_ping (si);
1127	w.at = NOW + 5;	1176	w.start (5);
1128	}	1177	}
1129	else if (NOW < last_activity + ::conf.keepalive + 10)	1178	else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1130	// hold ondemand connections implicitly a few seconds longer	1179	// hold ondemand connections implicitly a few seconds longer
1131	// should delete octx, though, or something like that ;)	1180	// should delete octx, though, or something like that ;)
1132	w.at = last_activity + ::conf.keepalive + 10;	1181	w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1133	else	1182	else
1134	reset_connection ();	1183	reset_connection ();
1135	}	1184	}
1136		1185
1137	void connection::send_connect_request (int id)	1186	void connection::send_connect_request (int id)
…		…
1143	send_vpn_packet (p, si);	1192	send_vpn_packet (p, si);
1144		1193
1145	delete p;	1194	delete p;
1146	}	1195	}
1147		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
1148	void connection::script_node ()	1207	void connection::script_init_connect_env ()
1149	{	1208	{
1150	vpn->script_if_up ();	1209	vpn->script_init_env ();
1151		1210
1152	char *env;	1211	char *env;
1153	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1212	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1154	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1213	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1155	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1214	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1156	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1215	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1157	}	1216	}
1158		1217
1159	const char *connection::script_node_up ()	1218	const char *connection::script_node_up ()
1160	{	1219	{
1161	script_node ();	1220	script_init_connect_env ();
1162		1221
1163	putenv ("STATE=up");	1222	putenv ((char *)"STATE=up");
1164		1223
		1224	char *filename;
		1225	asprintf (&filename,
		1226	"%s/%s",
		1227	confbase,
1165	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;
1166	}	1231	}
1167		1232
1168	const char *connection::script_node_down ()	1233	const char *connection::script_node_down ()
1169	{	1234	{
1170	script_node ();	1235	script_init_connect_env ();
1171		1236
1172	putenv ("STATE=down");	1237	putenv ((char *)"STATE=down");
1173		1238
1174	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1239	char *filename;
1175	}	1240	asprintf (&filename,
		1241	"%s/%s",
		1242	confbase,
		1243	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1176		1244
		1245	return filename;
		1246	}
		1247
1177	connection::connection(struct vpn *vpn_)	1248	connection::connection (struct vpn vpn, conf_node conf)
1178	: vpn(vpn_)	1249	: vpn(vpn), conf(conf)
1179	, rekey (this, &connection::rekey_cb)	1250	, rekey (this, &connection::rekey_cb)
1180	, keepalive (this, &connection::keepalive_cb)	1251	, keepalive (this, &connection::keepalive_cb)
1181	, establish_connection (this, &connection::establish_connection_cb)	1252	, establish_connection (this, &connection::establish_connection_cb)
		1253	#if ENABLE_DNS
		1254	, dns (0)
		1255	#endif
1182	{	1256	{
1183	octx = ictx = 0;	1257	octx = ictx = 0;
1184	retry_cnt = 0;	1258	retry_cnt = 0;
1185		1259
		1260	if (!conf->protocols) // make sure some protocol is enabled
		1261	conf->protocols = PROT_UDPv4;
		1262
1186	connectmode = conf_node::C_ALWAYS; // initial setting	1263	connectmode = conf_node::C_ALWAYS; // initial setting
1187	reset_connection ();	1264	reset_connection ();
1188	}	1265	}
1189		1266
1190	connection::~connection ()	1267	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs. Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC