[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.58 by pcg, Sat Jul 9 02:35:42 2005 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
		3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
3		4
		5	This file is part of GVPE.
		6
4	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
6	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
7	(at your option) any later version.	10	(at your option) any later version.
8		11
9	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
10	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	GNU General Public License for more details.	15	GNU General Public License for more details.
13		16
14	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
15	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
16	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 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;
…		…
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 (time_watcher &w); time_watcher 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 > 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.at < NOW)
108	cleaner.start (NOW + RSA_TTL);	111	cleaner.start (NOW + RSA_TTL);
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 = 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.at < NOW)
127	cleaner.start (NOW + RSA_TTL);	130	cleaner.start (NOW + RSA_TTL);
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	{ }
133		136
134	} rsa_cache;	137	} rsa_cache;
135		138
136	void rsa_cache::cleaner_cb (time_watcher &w)	139	void rsa_cache::cleaner_cb (time_watcher &w)
137	{	140	{
138	if (empty ())	141	if (!empty ())
139	w.at = TSTAMP_CANCEL;
140	else
141	{	142	{
142	w.at = NOW + RSA_TTL;	143	w.start (NOW + RSA_TTL);
143		144
144	for (iterator i = begin (); i != end (); )	145	for (iterator i = begin (); i != end (); )
145	if (i->expire <= NOW)	146	if (i->expire <= NOW)
146	i = erase (i);	147	i = erase (i);
147	else	148	else
…		…
199	// only do action once every x seconds per host whole allowing bursts.	200	// only do action once every x seconds per host whole allowing bursts.
200	// this implementation ("splay list" ;) is inefficient,	201	// this implementation ("splay list" ;) is inefficient,
201	// but low on resources.	202	// but low on resources.
202	struct net_rate_limiter : list<net_rateinfo>	203	struct net_rate_limiter : list<net_rateinfo>
203	{	204	{
204	static const double ALPHA = 1. - 1. / 600.; // allow bursts	205	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
205	static const double CUTOFF = 10.; // one event every CUTOFF seconds	206	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
206	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	207	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
207	static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value	208	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
208		209
209	bool can (const sockinfo &si) { return can((u32)si.host); }	210	bool can (const sockinfo &si) { return can((u32)si.host); }
210	bool can (u32 host);	211	bool can (u32 host);
211	};	212	};
212		213
…		…
217	iterator i;	218	iterator i;
218		219
219	for (i = begin (); i != end (); )	220	for (i = begin (); i != end (); )
220	if (i->host == host)	221	if (i->host == host)
221	break;	222	break;
222	else if (i->last < NOW - EXPIRE)	223	else if (i->last < NOW - NRL_EXPIRE)
223	i = erase (i);	224	i = erase (i);
224	else	225	else
225	i++;	226	i++;
226		227
227	if (i == end ())	228	if (i == end ())
228	{	229	{
229	net_rateinfo ri;	230	net_rateinfo ri;
230		231
231	ri.host = host;	232	ri.host = host;
232	ri.pcnt = 1.;	233	ri.pcnt = 1.;
233	ri.diff = MAXDIF;	234	ri.diff = NRL_MAXDIF;
234	ri.last = NOW;	235	ri.last = NOW;
235		236
236	push_front (ri);	237	push_front (ri);
237		238
238	return true;	239	return true;
…		…
240	else	241	else
241	{	242	{
242	net_rateinfo ri (*i);	243	net_rateinfo ri (*i);
243	erase (i);	244	erase (i);
244		245
245	ri.pcnt = ri.pcnt * ALPHA;	246	ri.pcnt = ri.pcnt * NRL_ALPHA;
246	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	247	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
247		248
248	ri.last = NOW;	249	ri.last = NOW;
249		250
250	double dif = ri.diff / ri.pcnt;	251	double dif = ri.diff / ri.pcnt;
251		252
252	bool send = dif > CUTOFF;	253	bool send = dif > NRL_CUTOFF;
253		254
254	if (dif > MAXDIF)	255	if (dif > NRL_MAXDIF)
255	{	256	{
256	ri.pcnt = 1.;	257	ri.pcnt = 1.;
257	ri.diff = MAXDIF;	258	ri.diff = NRL_MAXDIF;
258	}	259	}
259	else if (send)	260	else if (send)
260	ri.pcnt++;	261	ri.pcnt++;
261		262
262	push_front (ri);	263	push_front (ri);
…		…
309	}	310	}
310		311
311	#define MAXVPNDATA (MAX_MTU - 6 - 6)	312	#define MAXVPNDATA (MAX_MTU - 6 - 6)
312	#define DATAHDR (sizeof (u32) + RAND_SIZE)	313	#define DATAHDR (sizeof (u32) + RAND_SIZE)
313		314
314	struct vpndata_packet:vpn_packet	315	struct vpndata_packet : vpn_packet
315	{	316	{
316	u8 data[MAXVPNDATA + DATAHDR]; // seqno	317	u8 data[MAXVPNDATA + DATAHDR]; // seqno
317		318
318	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);	319	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
319	tap_packet unpack (connection conn, u32 &seqno);	320	tap_packet unpack (connection conn, u32 &seqno);
…		…
332	int outl = 0, outl2;	333	int outl = 0, outl2;
333	ptype type = PT_DATA_UNCOMPRESSED;	334	ptype type = PT_DATA_UNCOMPRESSED;
334		335
335	#if ENABLE_COMPRESSION	336	#if ENABLE_COMPRESSION
336	u8 cdata[MAX_MTU];	337	u8 cdata[MAX_MTU];
337	u32 cl;
338		338
		339	if (conn->features & ENABLE_COMPRESSION)
		340	{
339	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	341	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		342
340	if (cl)	343	if (cl)
341	{	344	{
342	type = PT_DATA_COMPRESSED;	345	type = PT_DATA_COMPRESSED;
343	d = cdata;	346	d = cdata;
344	l = cl + 2;	347	l = cl + 2;
345		348
346	d[0] = cl >> 8;	349	d[0] = cl >> 8;
347	d[1] = cl;	350	d[1] = cl;
		351	}
348	}	352	}
349	#endif	353	#endif
350		354
351	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	355	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
352		356
353	struct {	357	struct {
354	#if RAND_SIZE	358	#if RAND_SIZE
355	u8 rnd[RAND_SIZE];	359	u8 rnd[RAND_SIZE];
356	#endif	360	#endif
…		…
360	datahdr.seqno = ntohl (seqno);	364	datahdr.seqno = ntohl (seqno);
361	#if RAND_SIZE	365	#if RAND_SIZE
362	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	366	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
363	#endif	367	#endif
364		368
365	EVP_EncryptUpdate (cctx,	369	require (EVP_EncryptUpdate (cctx,
366	(unsigned char *) data + outl, &outl2,	370	(unsigned char *) data + outl, &outl2,
367	(unsigned char *) &datahdr, DATAHDR);	371	(unsigned char *) &datahdr, DATAHDR));
368	outl += outl2;	372	outl += outl2;
369		373
370	EVP_EncryptUpdate (cctx,	374	require (EVP_EncryptUpdate (cctx,
371	(unsigned char *) data + outl, &outl2,	375	(unsigned char *) data + outl, &outl2,
372	(unsigned char *) d, l);	376	(unsigned char *) d, l));
373	outl += outl2;	377	outl += outl2;
374		378
375	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	379	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
376	outl += outl2;	380	outl += outl2;
377		381
378	len = outl + data_hdr_size ();	382	len = outl + data_hdr_size ();
379		383
380	set_hdr (type, dst);	384	set_hdr (type, dst);
…		…
389	int outl = 0, outl2;	393	int outl = 0, outl2;
390	tap_packet *p = new tap_packet;	394	tap_packet *p = new tap_packet;
391	u8 *d;	395	u8 *d;
392	u32 l = len - data_hdr_size ();	396	u32 l = len - data_hdr_size ();
393		397
394	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	398	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
395		399
396	#if ENABLE_COMPRESSION	400	#if ENABLE_COMPRESSION
397	u8 cdata[MAX_MTU];	401	u8 cdata[MAX_MTU];
398		402
399	if (type == PT_DATA_COMPRESSED)	403	if (type == PT_DATA_COMPRESSED)
…		…
401	else	405	else
402	#endif	406	#endif
403	d = &(*p)[6 + 6 - DATAHDR];	407	d = &(*p)[6 + 6 - DATAHDR];
404		408
405	/* this overwrites part of the src mac, but we fix that later */	409	/* this overwrites part of the src mac, but we fix that later */
406	EVP_DecryptUpdate (cctx,	410	require (EVP_DecryptUpdate (cctx,
407	d, &outl2,	411	d, &outl2,
408	(unsigned char *)&data, len - data_hdr_size ());	412	(unsigned char *)&data, len - data_hdr_size ()));
409	outl += outl2;	413	outl += outl2;
410		414
411	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	415	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
412	outl += outl2;	416	outl += outl2;
413		417
414	seqno = ntohl ((u32 )(d + RAND_SIZE));	418	seqno = ntohl ((u32 )(d + RAND_SIZE));
415		419
416	id2mac (dst () ? dst() : THISNODE->id, p->dst);	420	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
445	{	449	{
446	// actually, hmaclen cannot be checked because the hmac	450	// actually, hmaclen cannot be checked because the hmac
447	// field comes before this data, so peers with other	451	// field comes before this data, so peers with other
448	// hmacs simply will not work.	452	// hmacs simply will not work.
449	u8 prot_major, prot_minor, randsize, hmaclen;	453	u8 prot_major, prot_minor, randsize, hmaclen;
450	u8 flags, challengelen, pad2, pad3;	454	u8 flags, challengelen, features, pad3;
451	u32 cipher_nid, digest_nid, hmac_nid;	455	u32 cipher_nid, digest_nid, hmac_nid;
452
453	const u8 curflags () const
454	{
455	return 0x80
456	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
457	}
458		456
459	void setup (ptype type, int dst);	457	void setup (ptype type, int dst);
460	bool chk_config () const;	458	bool chk_config () const;
		459
		460	static u8 get_features ()
		461	{
		462	u8 f = 0;
		463	#if ENABLE_COMPRESSION
		464	f \|= FEATURE_COMPRESSION;
		465	#endif
		466	#if ENABLE_ROHC
		467	f \|= FEATURE_ROHC;
		468	#endif
		469	return f;
		470	}
461	};	471	};
462		472
463	void config_packet::setup (ptype type, int dst)	473	void config_packet::setup (ptype type, int dst)
464	{	474	{
465	prot_major = PROTOCOL_MAJOR;	475	prot_major = PROTOCOL_MAJOR;
466	prot_minor = PROTOCOL_MINOR;	476	prot_minor = PROTOCOL_MINOR;
467	randsize = RAND_SIZE;	477	randsize = RAND_SIZE;
468	hmaclen = HMACLENGTH;	478	hmaclen = HMACLENGTH;
469	flags = curflags ();	479	flags = 0;
470	challengelen = sizeof (rsachallenge);	480	challengelen = sizeof (rsachallenge);
		481	features = get_features ();
471		482
472	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	483	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
473	digest_nid = htonl (EVP_MD_type (RSA_HASH));	484	digest_nid = htonl (EVP_MD_type (RSA_HASH));
474	hmac_nid = htonl (EVP_MD_type (DIGEST));	485	hmac_nid = htonl (EVP_MD_type (DIGEST));
475		486
…		…
478	}	489	}
479		490
480	bool config_packet::chk_config () const	491	bool config_packet::chk_config () const
481	{	492	{
482	if (prot_major != PROTOCOL_MAJOR)	493	if (prot_major != PROTOCOL_MAJOR)
483	slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);	494	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
484	else if (randsize != RAND_SIZE)	495	else if (randsize != RAND_SIZE)
485	slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);	496	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
486	else if (hmaclen != HMACLENGTH)	497	else if (hmaclen != HMACLENGTH)
487	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	498	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))	499	else if (challengelen != sizeof (rsachallenge))
491	slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));	500	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
492	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	501	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
493	slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	502	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)))	503	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));	504	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)))	505	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
497	slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	506	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
498	else	507	else
499	return true;	508	return true;
500		509
501	return false;	510	return false;
502	}	511	}
503		512
504	struct auth_req_packet : config_packet	513	struct auth_req_packet : config_packet
505	{	514	{
506	char magic[8];	515	char magic[8];
507	u8 initiate; // false if this is just an automatic reply	516	u8 initiate; // false if this is just an automatic reply
508	u8 protocols; // supported protocols (will get patches on forward)	517	u8 protocols; // supported protocols (will be patched on forward)
509	u8 pad2, pad3;	518	u8 pad2, pad3;
510	rsaid id;	519	rsaid id;
511	rsaencrdata encr;	520	rsaencrdata encr;
512		521
513	auth_req_packet (int dst, bool initiate_, u8 protocols_)	522	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
574	{	583	{
575	if (ictx && octx)	584	if (ictx && octx)
576	{	585	{
577	connectmode = conf->connectmode;	586	connectmode = conf->connectmode;
578		587
		588	// make sure rekeying timeouts are slightly asymmetric
579	rekey.start (NOW + ::conf.rekey);	589	rekey.start (NOW + ::conf.rekey
		590	+ (conf->id > THISNODE->id ? 10 : 0));
580	keepalive.start (NOW + ::conf.keepalive);	591	keepalive.start (NOW + ::conf.keepalive);
581		592
582	// send queued packets	593	// send queued packets
583	if (ictx && octx)	594	if (ictx && octx)
584	{	595	{
…		…
597	}	608	}
598	else	609	else
599	{	610	{
600	retry_cnt = 0;	611	retry_cnt = 0;
601	establish_connection.start (NOW + 5);	612	establish_connection.start (NOW + 5);
602	keepalive.reset ();	613	keepalive.stop ();
603	rekey.reset ();	614	rekey.stop ();
604	}	615	}
605	}	616	}
606		617
607	void	618	void
608	connection::reset_si ()	619	connection::reset_si ()
…		…
610	protocol = best_protocol (THISNODE->protocols & conf->protocols);	621	protocol = best_protocol (THISNODE->protocols & conf->protocols);
611		622
612	// mask out protocols we cannot establish	623	// mask out protocols we cannot establish
613	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	624	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
614	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	625	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		626	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
615		627
616	si.set (conf, protocol);	628	si.set (conf, protocol);
617	}	629	}
618		630
619	// ensure sockinfo is valid, forward if necessary	631	// ensure sockinfo is valid, forward if necessary
…		…
624	{	636	{
625	connection *r = vpn->find_router ();	637	connection *r = vpn->find_router ();
626		638
627	if (r)	639	if (r)
628	{	640	{
629	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	641	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
630	conf->nodename, r->conf->nodename);	642	conf->nodename, r->conf->nodename, (const char *)r->si);
631	return r->si;	643	return r->si;
632	}	644	}
633	else	645	else
634	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	646	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
635	conf->nodename);	647	conf->nodename);
…		…
674	connection::send_auth_request (const sockinfo &si, bool initiate)	686	connection::send_auth_request (const sockinfo &si, bool initiate)
675	{	687	{
676	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	688	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
677		689
678	rsachallenge chg;	690	rsachallenge chg;
679
680	rsa_cache.gen (pkt->id, chg);	691	rsa_cache.gen (pkt->id, chg);
681		692	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		693
687	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	694	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
688		695
689	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	696	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
690		697
…		…
710	}	717	}
711		718
712	void	719	void
713	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	720	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
714	{	721	{
715	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	722	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
716	conf->id, rid, (const char *)rsi);	723	conf->id, rid, (const char *)rsi);
717		724
718	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	725	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
719		726
720	r->hmac_set (octx);	727	r->hmac_set (octx);
…		…
724	}	731	}
725		732
726	void	733	void
727	connection::establish_connection_cb (time_watcher &w)	734	connection::establish_connection_cb (time_watcher &w)
728	{	735	{
729	if (ictx \|\| conf == THISNODE	736	if (!ictx
		737	&& conf != THISNODE
730	\|\| connectmode == conf_node::C_NEVER	738	&& connectmode != conf_node::C_NEVER
731	\|\| connectmode == conf_node::C_DISABLED)	739	&& connectmode != conf_node::C_DISABLED
732	w.at = TSTAMP_CANCEL;	740	&& NOW > w.at)
733	else if (w.at <= NOW)
734	{	741	{
735	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	742	w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
736		743
737	if (retry_int < 3600 * 8)	744	double retry_int = double (retry_cnt & 3
738	retry_cnt++;	745	? (retry_cnt & 3) + 1
739		746	: 1 << (retry_cnt >> 2));
740	w.at = NOW + retry_int;
741		747
742	reset_si ();	748	reset_si ();
		749
		750	bool slow = si.prot & PROT_SLOW;
743		751
744	if (si.prot && !si.host)	752	if (si.prot && !si.host)
745	vpn->send_connect_request (conf->id);	753	vpn->send_connect_request (conf->id);
746	else	754	else
747	{	755	{
748	const sockinfo &dsi = forward_si (si);	756	const sockinfo &dsi = forward_si (si);
		757
		758	slow = slow \|\| (dsi.prot & PROT_SLOW);
749		759
750	if (dsi.valid () && auth_rate_limiter.can (dsi))	760	if (dsi.valid () && auth_rate_limiter.can (dsi))
751	{	761	{
752	if (retry_cnt < 4)	762	if (retry_cnt < 4)
753	send_auth_request (dsi, true);	763	send_auth_request (dsi, true);
754	else	764	else
755	send_ping (dsi, 0);	765	send_ping (dsi, 0);
756	}	766	}
757	}	767	}
		768
		769	retry_int *= slow ? 8. : 0.7;
		770
		771	if (retry_int < conf->max_retry)
		772	retry_cnt++;
		773	else
		774	retry_int = conf->max_retry;
		775
		776	w.start (NOW + retry_int);
758	}	777	}
759	}	778	}
760		779
761	void	780	void
762	connection::reset_connection ()	781	connection::reset_connection ()
…		…
765	{	784	{
766	slog (L_INFO, _("%s(%s): connection lost"),	785	slog (L_INFO, _("%s(%s): connection lost"),
767	conf->nodename, (const char *)si);	786	conf->nodename, (const char *)si);
768		787
769	if (::conf.script_node_down)	788	if (::conf.script_node_down)
770	run_script (run_script_cb (this, &connection::script_node_down), false);	789	if (!run_script (run_script_cb (this, &connection::script_node_down), false))
		790	slog (L_WARN, _("node-down command execution failed, continuing."));
771	}	791	}
772		792
773	delete ictx; ictx = 0;	793	delete ictx; ictx = 0;
774	delete octx; octx = 0;	794	delete octx; octx = 0;
		795	#if ENABLE_DNS
		796	dnsv4_reset_connection ();
		797	#endif
775		798
776	si.host= 0;	799	si.host = 0;
777		800
778	last_activity = 0;	801	last_activity = 0;
779	retry_cnt = 0;	802	retry_cnt = 0;
780		803
781	rekey.reset ();	804	rekey.stop ();
782	keepalive.reset ();	805	keepalive.stop ();
783	establish_connection.reset ();	806	establish_connection.stop ();
784	}	807	}
785		808
786	void	809	void
787	connection::shutdown ()	810	connection::shutdown ()
788	{	811	{
…		…
793	}	816	}
794		817
795	void	818	void
796	connection::rekey_cb (time_watcher &w)	819	connection::rekey_cb (time_watcher &w)
797	{	820	{
798	w.at = TSTAMP_CANCEL;
799
800	reset_connection ();	821	reset_connection ();
801	establish_connection ();	822	establish_connection ();
802	}	823	}
803		824
804	void	825	void
…		…
825	{	846	{
826	if (ictx && octx)	847	if (ictx && octx)
827	send_data_packet (pkt);	848	send_data_packet (pkt);
828	else	849	else
829	{	850	{
830	if (!broadcast)//DDDD	851	if (!broadcast)
831	data_queue.put (new tap_packet (*pkt));	852	data_queue.put (new tap_packet (*pkt));
832		853
833	establish_connection ();	854	establish_connection ();
834	}	855	}
835	}	856	}
…		…
838	{	859	{
839	if (ictx && octx)	860	if (ictx && octx)
840	send_vpn_packet (pkt, si, tos);	861	send_vpn_packet (pkt, si, tos);
841	else	862	else
842	{	863	{
843	vpn_queue.put (new vpn_packet (*pkt));	864	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
844		865
845	establish_connection ();	866	establish_connection ();
846	}	867	}
847	}	868	}
848		869
…		…
907	if (p->initiate)	928	if (p->initiate)
908	send_auth_request (rsi, false);	929	send_auth_request (rsi, false);
909		930
910	rsachallenge k;	931	rsachallenge k;
911		932
912	if (0 > RSA_private_decrypt (sizeof (p->encr),	933	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913	(unsigned char )&p->encr, (unsigned char )&k,	934	{
914	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	935	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));	936	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		937	break;
		938	}
917	else	939	else
918	{	940	{
919	delete octx;	941	delete octx;
920		942
921	octx = new crypto_ctx (k, 1);	943	octx = new crypto_ctx (k, 1);
922	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	944	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
923		945
924	conf->protocols = p->protocols;	946	conf->protocols = p->protocols;
		947	features = p->features & config_packet::get_features ();
925		948
926	send_auth_response (rsi, p->id, k);	949	send_auth_response (rsi, p->id, k);
927		950
928	connection_established ();	951	connection_established ();
929		952
…		…
965	crypto_ctx *cctx = new crypto_ctx (chg, 0);	988	crypto_ctx *cctx = new crypto_ctx (chg, 0);
966		989
967	if (!p->hmac_chk (cctx))	990	if (!p->hmac_chk (cctx))
968	{	991	{
969	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	992	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
970	"could be an attack, or just corruption or an synchronization error"),	993	"could be an attack, or just corruption or a synchronization error"),
971	conf->nodename, (const char *)rsi);	994	conf->nodename, (const char *)rsi);
972	break;	995	break;
973	}	996	}
974	else	997	else
975	{	998	{
…		…
993	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),	1016	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
994	conf->nodename, (const char *)rsi,	1017	conf->nodename, (const char *)rsi,
995	p->prot_major, p->prot_minor);	1018	p->prot_major, p->prot_minor);
996		1019
997	if (::conf.script_node_up)	1020	if (::conf.script_node_up)
998	run_script (run_script_cb (this, &connection::script_node_up), false);	1021	if (!run_script (run_script_cb (this, &connection::script_node_up), false))
		1022	slog (L_WARN, _("node-up command execution failed, continuing."));
999		1023
1000	break;	1024	break;
1001	}	1025	}
1002	else	1026	else
1003	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1027	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
…		…
1024	{	1048	{
1025	vpndata_packet p = (vpndata_packet )pkt;	1049	vpndata_packet p = (vpndata_packet )pkt;
1026		1050
1027	if (!p->hmac_chk (ictx))	1051	if (!p->hmac_chk (ictx))
1028	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1052	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1029	"could be an attack, or just corruption or an synchronization error"),	1053	"could be an attack, or just corruption or a synchronization error"),
1030	conf->nodename, (const char *)rsi);	1054	conf->nodename, (const char *)rsi);
1031	else	1055	else
1032	{	1056	{
1033	u32 seqno;	1057	u32 seqno;
1034	tap_packet *d = p->unpack (this, seqno);	1058	tap_packet *d = p->unpack (this, seqno);
…		…
1037	{	1061	{
1038	vpn->tap->send (d);	1062	vpn->tap->send (d);
1039		1063
1040	if (si != rsi)	1064	if (si != rsi)
1041	{	1065	{
1042	// fast re-sync on connection changes, useful especially for tcp/ip	1066	// fast re-sync on source address changes, useful especially for tcp/ip
1043	si = rsi;	1067	si = rsi;
1044		1068
1045	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1069	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1046	conf->nodename, (const char )si, (const char )rsi);	1070	conf->nodename, (const char )si, (const char )rsi);
1047	}	1071	}
1048
1049	delete d;
1050
1051	break;
1052	}	1072	}
		1073
		1074	delete d;
		1075	break;
1053	}	1076	}
1054	}	1077	}
1055		1078
1056	send_reset (rsi);	1079	send_reset (rsi);
1057	break;	1080	break;
…		…
1059	case vpn_packet::PT_CONNECT_REQ:	1082	case vpn_packet::PT_CONNECT_REQ:
1060	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1083	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1061	{	1084	{
1062	connect_req_packet p = (connect_req_packet ) pkt;	1085	connect_req_packet p = (connect_req_packet ) pkt;
1063		1086
1064	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1087	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	{	1088	{
		1089	connection *c = vpn->conns[p->id - 1];
		1090	conf->protocols = p->protocols;
		1091
		1092	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
		1093	conf->id, p->id, c->ictx && c->octx);
		1094
		1095	if (c->ictx && c->octx)
		1096	{
1073	// send connect_info packets to both sides, in case one is	1097	// send connect_info packets to both sides, in case one is
1074	// behind a nat firewall (or both ;)	1098	// behind a nat firewall (or both ;)
1075	c->send_connect_info (conf->id, si, conf->protocols);	1099	c->send_connect_info (conf->id, si, conf->protocols);
1076	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1100	send_connect_info (c->conf->id, c->si, c->conf->protocols);
		1101	}
		1102	else
		1103	c->establish_connection ();
1077	}	1104	}
1078	else	1105	else
1079	c->establish_connection ();	1106	slog (L_WARN,
		1107	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1108	p->id);
1080	}	1109	}
1081		1110
1082	break;	1111	break;
1083		1112
1084	case vpn_packet::PT_CONNECT_INFO:	1113	case vpn_packet::PT_CONNECT_INFO:
1085	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1114	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086	{	1115	{
1087	connect_info_packet p = (connect_info_packet ) pkt;	1116	connect_info_packet p = (connect_info_packet )pkt;
1088		1117
1089	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1118	if (p->id > 0 && p->id <= vpn->conns.size ())
1090		1119	{
1091	connection *c = vpn->conns[p->id - 1];	1120	connection *c = vpn->conns[p->id - 1];
1092		1121
1093	c->conf->protocols = p->protocols;	1122	c->conf->protocols = p->protocols;
1094	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1123	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1095	p->si.upgrade_protocol (protocol, c->conf);	1124	p->si.upgrade_protocol (protocol, c->conf);
1096		1125
1097	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1126	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1098	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1127	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1099		1128
1100	const sockinfo &dsi = forward_si (p->si);	1129	const sockinfo &dsi = forward_si (p->si);
1101		1130
1102	if (dsi.valid ())	1131	if (dsi.valid ())
1103	c->send_auth_request (dsi, true);	1132	c->send_auth_request (dsi, true);
		1133	}
		1134	else
		1135	slog (L_WARN,
		1136	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1137	p->id);
1104	}	1138	}
1105		1139
1106	break;	1140	break;
1107		1141
1108	default:	1142	default:
…		…
1117	{	1151	{
1118	reset_connection ();	1152	reset_connection ();
1119	establish_connection ();	1153	establish_connection ();
1120	}	1154	}
1121	else if (NOW < last_activity + ::conf.keepalive)	1155	else if (NOW < last_activity + ::conf.keepalive)
1122	w.at = last_activity + ::conf.keepalive;	1156	w.start (last_activity + ::conf.keepalive);
1123	else if (conf->connectmode != conf_node::C_ONDEMAND	1157	else if (conf->connectmode != conf_node::C_ONDEMAND
1124	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1158	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1125	{	1159	{
1126	send_ping (si);	1160	send_ping (si);
1127	w.at = NOW + 5;	1161	w.start (NOW + 5);
1128	}	1162	}
1129	else if (NOW < last_activity + ::conf.keepalive + 10)	1163	else if (NOW < last_activity + ::conf.keepalive + 10)
1130	// hold ondemand connections implicitly a few seconds longer	1164	// hold ondemand connections implicitly a few seconds longer
1131	// should delete octx, though, or something like that ;)	1165	// should delete octx, though, or something like that ;)
1132	w.at = last_activity + ::conf.keepalive + 10;	1166	w.start (last_activity + ::conf.keepalive + 10);
1133	else	1167	else
1134	reset_connection ();	1168	reset_connection ();
1135	}	1169	}
1136		1170
1137	void connection::send_connect_request (int id)	1171	void connection::send_connect_request (int id)
…		…
1143	send_vpn_packet (p, si);	1177	send_vpn_packet (p, si);
1144		1178
1145	delete p;	1179	delete p;
1146	}	1180	}
1147		1181
		1182	void connection::script_init_env (const char *ext)
		1183	{
		1184	char *env;
		1185	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1186	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1187	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1188	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1189	conf->id & 0xff); putenv (env);
		1190	}
		1191
1148	void connection::script_node ()	1192	void connection::script_init_connect_env ()
1149	{	1193	{
1150	vpn->script_if_up ();	1194	vpn->script_init_env ();
1151		1195
1152	char *env;	1196	char *env;
1153	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1197	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1154	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1198	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1155	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1199	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1156	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1200	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1157	}	1201	}
1158		1202
1159	const char *connection::script_node_up ()	1203	const char *connection::script_node_up ()
1160	{	1204	{
1161	script_node ();	1205	script_init_connect_env ();
1162		1206
1163	putenv ("STATE=up");	1207	putenv ("STATE=up");
1164		1208
		1209	char *filename;
		1210	asprintf (&filename,
		1211	"%s/%s",
		1212	confbase,
1165	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1213	::conf.script_node_up ? ::conf.script_node_up : "node-up");
		1214
		1215	return filename;
1166	}	1216	}
1167		1217
1168	const char *connection::script_node_down ()	1218	const char *connection::script_node_down ()
1169	{	1219	{
1170	script_node ();	1220	script_init_connect_env ();
1171		1221
1172	putenv ("STATE=down");	1222	putenv ("STATE=down");
1173		1223
1174	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1224	char *filename;
1175	}	1225	asprintf (&filename,
		1226	"%s/%s",
		1227	confbase,
		1228	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1176		1229
		1230	return filename;
		1231	}
		1232
1177	connection::connection(struct vpn *vpn_)	1233	connection::connection (struct vpn vpn, conf_node conf)
1178	: vpn(vpn_)	1234	: vpn(vpn), conf(conf)
1179	, rekey (this, &connection::rekey_cb)	1235	, rekey (this, &connection::rekey_cb)
1180	, keepalive (this, &connection::keepalive_cb)	1236	, keepalive (this, &connection::keepalive_cb)
1181	, establish_connection (this, &connection::establish_connection_cb)	1237	, establish_connection (this, &connection::establish_connection_cb)
		1238	#if ENABLE_DNS
		1239	, dns (0)
		1240	#endif
1182	{	1241	{
1183	octx = ictx = 0;	1242	octx = ictx = 0;
1184	retry_cnt = 0;	1243	retry_cnt = 0;
1185		1244
		1245	if (!conf->protocols) // make sure some protocol is enabled
		1246	conf->protocols = PROT_UDPv4;
		1247
1186	connectmode = conf_node::C_ALWAYS; // initial setting	1248	connectmode = conf_node::C_ALWAYS; // initial setting
1187	reset_connection ();	1249	reset_connection ();
1188	}	1250	}
1189		1251
1190	connection::~connection ()	1252	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.58 by pcg, Sat Jul 9 02:35:42 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.58 by pcg, Sat Jul 9 02:35:42 2005 UTC