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

Comparing gvpe/src/connection.C (file contents):
Revision 1.6 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.50 by pcg, Fri Mar 18 01:53:05 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17	*/	20	*/
18		21
19	#include "config.h"	22	#include "config.h"
20		23
21	extern "C" {	24	#include <cassert>
22	# include "lzf/lzf.h"
23	}
24		25
25	#include <list>	26	#include <list>
26		27
27	#include <openssl/rand.h>	28	#include <openssl/rand.h>
28	#include <openssl/evp.h>	29	#include <openssl/evp.h>
29	#include <openssl/rsa.h>	30	#include <openssl/rsa.h>
30	#include <openssl/err.h>	31	#include <openssl/err.h>
31
32	#include "gettext.h"
33		32
34	#include "conf.h"	33	#include "conf.h"
35	#include "slog.h"	34	#include "slog.h"
36	#include "device.h"	35	#include "device.h"
37	#include "vpn.h"	36	#include "vpn.h"
38	#include "connection.h"	37	#include "connection.h"
39		38
		39	#include "netcompat.h"
		40
40	#if !HAVE_RAND_PSEUDO_BYTES	41	#if !HAVE_RAND_PSEUDO_BYTES
41	# define RAND_pseudo_bytes RAND_bytes	42	# define RAND_pseudo_bytes RAND_bytes
42	#endif	43	#endif
43		44
44	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	45	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45		46
		47	#define ULTRA_FAST 1
		48	#define HLOG 15
		49	#include "lzf/lzf.h"
		50	#include "lzf/lzf_c.c"
		51	#include "lzf/lzf_d.c"
		52
46	struct crypto_ctx	53	struct crypto_ctx
47	{	54	{
48	EVP_CIPHER_CTX cctx;	55	EVP_CIPHER_CTX cctx;
49	HMAC_CTX hctx;	56	HMAC_CTX hctx;
50		57
53	};	60	};
54		61
55	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	62	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56	{	63	{
57	EVP_CIPHER_CTX_init (&cctx);	64	EVP_CIPHER_CTX_init (&cctx);
58	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	65	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59	HMAC_CTX_init (&hctx);	66	HMAC_CTX_init (&hctx);
60	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	67	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61	}	68	}
62		69
63	crypto_ctx::~crypto_ctx ()	70	crypto_ctx::~crypto_ctx ()
64	{	71	{
65	EVP_CIPHER_CTX_cleanup (&cctx);	72	require (EVP_CIPHER_CTX_cleanup (&cctx));
66	HMAC_CTX_cleanup (&hctx);	73	HMAC_CTX_cleanup (&hctx);
67	}	74	}
68		75
69	static void	76	static void
70	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	77	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71	{	78	{
72	EVP_MD_CTX ctx;	79	EVP_MD_CTX ctx;
73		80
74	EVP_MD_CTX_init (&ctx);	81	EVP_MD_CTX_init (&ctx);
75	EVP_DigestInit (&ctx, RSA_HASH);	82	require (EVP_DigestInit (&ctx, RSA_HASH));
76	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	83	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77	EVP_DigestUpdate(&ctx, &id, sizeof id);	84	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	85	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79	EVP_MD_CTX_cleanup (&ctx);	86	EVP_MD_CTX_cleanup (&ctx);
80	}	87	}
81		88
82	struct rsa_entry {	89	struct rsa_entry {
83	tstamp expire;	90	tstamp expire;
…		…
131		138
132	} rsa_cache;	139	} rsa_cache;
133		140
134	void rsa_cache::cleaner_cb (time_watcher &w)	141	void rsa_cache::cleaner_cb (time_watcher &w)
135	{	142	{
136	if (empty ())	143	if (!empty ())
137	w.at = TSTAMP_CANCEL;
138	else
139	{	144	{
140	w.at = NOW + RSA_TTL;	145	w.start (NOW + RSA_TTL);
141		146
142	for (iterator i = begin (); i != end (); )	147	for (iterator i = begin (); i != end (); )
143	if (i->expire <= NOW)	148	if (i->expire <= NOW)
144	i = erase (i);	149	i = erase (i);
145	else	150	else
…		…
147	}	152	}
148	}	153	}
149		154
150	//////////////////////////////////////////////////////////////////////////////	155	//////////////////////////////////////////////////////////////////////////////
151		156
152	void pkt_queue::put (tap_packet *p)	157	void pkt_queue::put (net_packet *p)
153	{	158	{
154	if (queue[i])	159	if (queue[i])
155	{	160	{
156	delete queue[i];	161	delete queue[i];
157	j = (j + 1) % QUEUEDEPTH;	162	j = (j + 1) % QUEUEDEPTH;
…		…
160	queue[i] = p;	165	queue[i] = p;
161		166
162	i = (i + 1) % QUEUEDEPTH;	167	i = (i + 1) % QUEUEDEPTH;
163	}	168	}
164		169
165	tap_packet *pkt_queue::get ()	170	net_packet *pkt_queue::get ()
166	{	171	{
167	tap_packet *p = queue[j];	172	net_packet *p = queue[j];
168		173
169	if (p)	174	if (p)
170	{	175	{
171	queue[j] = 0;	176	queue[j] = 0;
172	j = (j + 1) % QUEUEDEPTH;	177	j = (j + 1) % QUEUEDEPTH;
…		…
197	// only do action once every x seconds per host whole allowing bursts.	202	// only do action once every x seconds per host whole allowing bursts.
198	// this implementation ("splay list" ;) is inefficient,	203	// this implementation ("splay list" ;) is inefficient,
199	// but low on resources.	204	// but low on resources.
200	struct net_rate_limiter : list<net_rateinfo>	205	struct net_rate_limiter : list<net_rateinfo>
201	{	206	{
202	static const double ALPHA = 1. - 1. / 90.; // allow bursts	207	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203	static const double CUTOFF = 20.; // one event every CUTOFF seconds	208	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	209	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
		210	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
205		211
206	bool can (const sockinfo &si) { return can((u32)si.host); }	212	bool can (const sockinfo &si) { return can((u32)si.host); }
207	bool can (u32 host);	213	bool can (u32 host);
208	};	214	};
209		215
210	net_rate_limiter auth_rate_limiter, reset_rate_limiter;	216	net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211		217
…		…
214	iterator i;	220	iterator i;
215		221
216	for (i = begin (); i != end (); )	222	for (i = begin (); i != end (); )
217	if (i->host == host)	223	if (i->host == host)
218	break;	224	break;
219	else if (i->last < NOW - EXPIRE)	225	else if (i->last < NOW - NRL_EXPIRE)
220	i = erase (i);	226	i = erase (i);
221	else	227	else
222	i++;	228	i++;
223		229
224	if (i == end ())	230	if (i == end ())
225	{	231	{
226	net_rateinfo ri;	232	net_rateinfo ri;
227		233
228	ri.host = host;	234	ri.host = host;
229	ri.pcnt = 1.;	235	ri.pcnt = 1.;
230	ri.diff = CUTOFF * (1. / (1. - ALPHA));	236	ri.diff = NRL_MAXDIF;
231	ri.last = NOW;	237	ri.last = NOW;
232		238
233	push_front (ri);	239	push_front (ri);
234		240
235	return true;	241	return true;
…		…
237	else	243	else
238	{	244	{
239	net_rateinfo ri (*i);	245	net_rateinfo ri (*i);
240	erase (i);	246	erase (i);
241		247
242	ri.pcnt = ri.pcnt * ALPHA;	248	ri.pcnt = ri.pcnt * NRL_ALPHA;
243	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	249	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
244		250
245	ri.last = NOW;	251	ri.last = NOW;
246		252
		253	double dif = ri.diff / ri.pcnt;
		254
247	bool send = ri.diff / ri.pcnt > CUTOFF;	255	bool send = dif > NRL_CUTOFF;
248		256
		257	if (dif > NRL_MAXDIF)
		258	{
		259	ri.pcnt = 1.;
		260	ri.diff = NRL_MAXDIF;
		261	}
249	if (send)	262	else if (send)
250	ri.pcnt++;	263	ri.pcnt++;
251		264
252	push_front (ri);	265	push_front (ri);
253		266
254	return send;	267	return send;
…		…
299	}	312	}
300		313
301	#define MAXVPNDATA (MAX_MTU - 6 - 6)	314	#define MAXVPNDATA (MAX_MTU - 6 - 6)
302	#define DATAHDR (sizeof (u32) + RAND_SIZE)	315	#define DATAHDR (sizeof (u32) + RAND_SIZE)
303		316
304	struct vpndata_packet:vpn_packet	317	struct vpndata_packet : vpn_packet
305	{	318	{
306	u8 data[MAXVPNDATA + DATAHDR]; // seqno	319	u8 data[MAXVPNDATA + DATAHDR]; // seqno
307		320
308	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);
309	tap_packet unpack (connection conn, u32 &seqno);	322	tap_packet unpack (connection conn, u32 &seqno);
…		…
322	int outl = 0, outl2;	335	int outl = 0, outl2;
323	ptype type = PT_DATA_UNCOMPRESSED;	336	ptype type = PT_DATA_UNCOMPRESSED;
324		337
325	#if ENABLE_COMPRESSION	338	#if ENABLE_COMPRESSION
326	u8 cdata[MAX_MTU];	339	u8 cdata[MAX_MTU];
327	u32 cl;
328		340
		341	if (conn->features & ENABLE_COMPRESSION)
		342	{
329	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	343	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		344
330	if (cl)	345	if (cl)
331	{	346	{
332	type = PT_DATA_COMPRESSED;	347	type = PT_DATA_COMPRESSED;
333	d = cdata;	348	d = cdata;
334	l = cl + 2;	349	l = cl + 2;
335		350
336	d[0] = cl >> 8;	351	d[0] = cl >> 8;
337	d[1] = cl;	352	d[1] = cl;
		353	}
338	}	354	}
339	#endif	355	#endif
340		356
341	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	357	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342		358
343	struct {	359	struct {
344	#if RAND_SIZE	360	#if RAND_SIZE
345	u8 rnd[RAND_SIZE];	361	u8 rnd[RAND_SIZE];
346	#endif	362	#endif
…		…
350	datahdr.seqno = ntohl (seqno);	366	datahdr.seqno = ntohl (seqno);
351	#if RAND_SIZE	367	#if RAND_SIZE
352	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	368	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353	#endif	369	#endif
354		370
355	EVP_EncryptUpdate (cctx,	371	require (EVP_EncryptUpdate (cctx,
356	(unsigned char *) data + outl, &outl2,	372	(unsigned char *) data + outl, &outl2,
357	(unsigned char *) &datahdr, DATAHDR);	373	(unsigned char *) &datahdr, DATAHDR));
358	outl += outl2;	374	outl += outl2;
359		375
360	EVP_EncryptUpdate (cctx,	376	require (EVP_EncryptUpdate (cctx,
361	(unsigned char *) data + outl, &outl2,	377	(unsigned char *) data + outl, &outl2,
362	(unsigned char *) d, l);	378	(unsigned char *) d, l));
363	outl += outl2;	379	outl += outl2;
364		380
365	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	381	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366	outl += outl2;	382	outl += outl2;
367		383
368	len = outl + data_hdr_size ();	384	len = outl + data_hdr_size ();
369		385
370	set_hdr (type, dst);	386	set_hdr (type, dst);
…		…
379	int outl = 0, outl2;	395	int outl = 0, outl2;
380	tap_packet *p = new tap_packet;	396	tap_packet *p = new tap_packet;
381	u8 *d;	397	u8 *d;
382	u32 l = len - data_hdr_size ();	398	u32 l = len - data_hdr_size ();
383		399
384	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	400	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385		401
386	#if ENABLE_COMPRESSION	402	#if ENABLE_COMPRESSION
387	u8 cdata[MAX_MTU];	403	u8 cdata[MAX_MTU];
388		404
389	if (type == PT_DATA_COMPRESSED)	405	if (type == PT_DATA_COMPRESSED)
…		…
391	else	407	else
392	#endif	408	#endif
393	d = &(*p)[6 + 6 - DATAHDR];	409	d = &(*p)[6 + 6 - DATAHDR];
394		410
395	/* 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 */
396	EVP_DecryptUpdate (cctx,	412	require (EVP_DecryptUpdate (cctx,
397	d, &outl2,	413	d, &outl2,
398	(unsigned char *)&data, len - data_hdr_size ());	414	(unsigned char *)&data, len - data_hdr_size ()));
399	outl += outl2;	415	outl += outl2;
400		416
401	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	417	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402	outl += outl2;	418	outl += outl2;
403		419
404	seqno = ntohl ((u32 )(d + RAND_SIZE));	420	seqno = ntohl ((u32 )(d + RAND_SIZE));
405		421
406	id2mac (dst () ? dst() : THISNODE->id, p->dst);	422	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
435	{	451	{
436	// actually, hmaclen cannot be checked because the hmac	452	// actually, hmaclen cannot be checked because the hmac
437	// field comes before this data, so peers with other	453	// field comes before this data, so peers with other
438	// hmacs simply will not work.	454	// hmacs simply will not work.
439	u8 prot_major, prot_minor, randsize, hmaclen;	455	u8 prot_major, prot_minor, randsize, hmaclen;
440	u8 flags, challengelen, pad2, pad3;	456	u8 flags, challengelen, features, pad3;
441	u32 cipher_nid, digest_nid, hmac_nid;	457	u32 cipher_nid, digest_nid, hmac_nid;
442
443	const u8 curflags () const
444	{
445	return 0x80
446	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
447	}
448		458
449	void setup (ptype type, int dst);	459	void setup (ptype type, int dst);
450	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	return f;
		472	}
451	};	473	};
452		474
453	void config_packet::setup (ptype type, int dst)	475	void config_packet::setup (ptype type, int dst)
454	{	476	{
455	prot_major = PROTOCOL_MAJOR;	477	prot_major = PROTOCOL_MAJOR;
456	prot_minor = PROTOCOL_MINOR;	478	prot_minor = PROTOCOL_MINOR;
457	randsize = RAND_SIZE;	479	randsize = RAND_SIZE;
458	hmaclen = HMACLENGTH;	480	hmaclen = HMACLENGTH;
459	flags = curflags ();	481	flags = 0;
460	challengelen = sizeof (rsachallenge);	482	challengelen = sizeof (rsachallenge);
		483	features = get_features ();
461		484
462	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	485	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463	digest_nid = htonl (EVP_MD_type (RSA_HASH));	486	digest_nid = htonl (EVP_MD_type (RSA_HASH));
464	hmac_nid = htonl (EVP_MD_type (DIGEST));	487	hmac_nid = htonl (EVP_MD_type (DIGEST));
465		488
…		…
467	set_hdr (type, dst);	490	set_hdr (type, dst);
468	}	491	}
469		492
470	bool config_packet::chk_config () const	493	bool config_packet::chk_config () const
471	{	494	{
472	return prot_major == PROTOCOL_MAJOR	495	if (prot_major != PROTOCOL_MAJOR)
473	&& randsize == RAND_SIZE	496	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474	&& hmaclen == HMACLENGTH	497	else if (randsize != RAND_SIZE)
475	&& flags == curflags ()	498	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
		499	else if (hmaclen != HMACLENGTH)
		500	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
476	&& challengelen == sizeof (rsachallenge)	501	else if (challengelen != sizeof (rsachallenge))
		502	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477	&& cipher_nid == htonl (EVP_CIPHER_nid (CIPHER))	503	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
		504	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
478	&& digest_nid == htonl (EVP_MD_type (RSA_HASH))	505	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
		506	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
479	&& hmac_nid == htonl (EVP_MD_type (DIGEST));	507	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
		508	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
		509	else
		510	return true;
		511
		512	return false;
480	}	513	}
481		514
482	struct auth_req_packet : config_packet	515	struct auth_req_packet : config_packet
483	{	516	{
484	char magic[8];	517	char magic[8];
485	u8 initiate; // false if this is just an automatic reply	518	u8 initiate; // false if this is just an automatic reply
486	u8 protocols; // supported protocols (will get patches on forward)	519	u8 protocols; // supported protocols (will be patched on forward)
487	u8 pad2, pad3;	520	u8 pad2, pad3;
488	rsaid id;	521	rsaid id;
489	rsaencrdata encr;	522	rsaencrdata encr;
490		523
491	auth_req_packet (int dst, bool initiate_, u8 protocols_)	524	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
546	};	579	};
547		580
548	/////////////////////////////////////////////////////////////////////////////	581	/////////////////////////////////////////////////////////////////////////////
549		582
550	void	583	void
		584	connection::connection_established ()
		585	{
		586	if (ictx && octx)
		587	{
		588	connectmode = conf->connectmode;
		589
		590	// make sure rekeying timeouts are slightly asymmetric
		591	rekey.start (NOW + ::conf.rekey
		592	+ (conf->id > THISNODE->id ? 10 : 0));
		593	keepalive.start (NOW + ::conf.keepalive);
		594
		595	// send queued packets
		596	if (ictx && octx)
		597	{
		598	while (tap_packet p = (tap_packet )data_queue.get ())
		599	{
		600	send_data_packet (p);
		601	delete p;
		602	}
		603
		604	while (vpn_packet p = (vpn_packet )vpn_queue.get ())
		605	{
		606	send_vpn_packet (p, si, IPTOS_RELIABILITY);
		607	delete p;
		608	}
		609	}
		610	}
		611	else
		612	{
		613	retry_cnt = 0;
		614	establish_connection.start (NOW + 5);
		615	keepalive.stop ();
		616	rekey.stop ();
		617	}
		618	}
		619
		620	void
551	connection::reset_dstaddr ()	621	connection::reset_si ()
552	{	622	{
553	protocol = best_protocol (THISNODE->protocols & conf->protocols);	623	protocol = best_protocol (THISNODE->protocols & conf->protocols);
554		624
555	// mask out protocols we cannot establish	625	// mask out protocols we cannot establish
556	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	626	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
557	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	627	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		628	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
558		629
559	si.set (conf, protocol);	630	si.set (conf, protocol);
560	}	631	}
561		632
		633	// ensure sockinfo is valid, forward if necessary
		634	const sockinfo &
		635	connection::forward_si (const sockinfo &si) const
		636	{
		637	if (!si.valid ())
		638	{
		639	connection *r = vpn->find_router ();
		640
		641	if (r)
		642	{
		643	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
		644	conf->nodename, r->conf->nodename, (const char *)r->si);
		645	return r->si;
		646	}
		647	else
		648	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
		649	conf->nodename);
		650	}
		651
		652	return si;
		653	}
		654
		655	void
		656	connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		657	{
		658	if (!vpn->send_vpn_packet (pkt, si, tos))
		659	reset_connection ();
		660	}
		661
562	void	662	void
563	connection::send_ping (const sockinfo &si, u8 pong)	663	connection::send_ping (const sockinfo &si, u8 pong)
564	{	664	{
565	ping_packet *pkt = new ping_packet;	665	ping_packet *pkt = new ping_packet;
566		666
567	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);	667	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
568	vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	668	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
569		669
570	delete pkt;	670	delete pkt;
571	}	671	}
572		672
573	void	673	void
…		…
576	if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)	676	if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
577	{	677	{
578	config_packet *pkt = new config_packet;	678	config_packet *pkt = new config_packet;
579		679
580	pkt->setup (vpn_packet::PT_RESET, conf->id);	680	pkt->setup (vpn_packet::PT_RESET, conf->id);
581	vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST);	681	send_vpn_packet (pkt, si, IPTOS_MINCOST);
582		682
583	delete pkt;	683	delete pkt;
584	}	684	}
585	}	685	}
586		686
…		…
588	connection::send_auth_request (const sockinfo &si, bool initiate)	688	connection::send_auth_request (const sockinfo &si, bool initiate)
589	{	689	{
590	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	690	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
591		691
592	rsachallenge chg;	692	rsachallenge chg;
593
594	rsa_cache.gen (pkt->id, chg);	693	rsa_cache.gen (pkt->id, chg);
595		694	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
596	if (0 > RSA_public_encrypt (sizeof chg,
597	(unsigned char )&chg, (unsigned char )&pkt->encr,
598	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
599	fatal ("RSA_public_encrypt error");
600		695
601	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	696	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
602		697
603	vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	698	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
604		699
605	delete pkt;	700	delete pkt;
606	}	701	}
607		702
608	void	703	void
…		…
616		711
617	pkt->hmac_set (octx);	712	pkt->hmac_set (octx);
618		713
619	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);	714	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
620		715
621	vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	716	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
622		717
623	delete pkt;	718	delete pkt;
624	}	719	}
625		720
626	void	721	void
…		…
630	conf->id, rid, (const char *)rsi);	725	conf->id, rid, (const char *)rsi);
631		726
632	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	727	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
633		728
634	r->hmac_set (octx);	729	r->hmac_set (octx);
635	vpn->send_vpn_packet (r, si);	730	send_vpn_packet (r, si);
636		731
637	delete r;	732	delete r;
638	}	733	}
639		734
640	void	735	void
641	connection::establish_connection_cb (time_watcher &w)	736	connection::establish_connection_cb (time_watcher &w)
642	{	737	{
643	if (ictx \|\| conf == THISNODE	738	if (!ictx
		739	&& conf != THISNODE
644	\|\| connectmode == conf_node::C_NEVER	740	&& connectmode != conf_node::C_NEVER
645	\|\| connectmode == conf_node::C_DISABLED)	741	&& connectmode != conf_node::C_DISABLED
646	w.at = TSTAMP_CANCEL;	742	&& NOW > w.at)
647	else if (w.at <= NOW)
648	{	743	{
649	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	744	w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
650		745
651	if (retry_int < 3600 * 8)	746	double retry_int = double (retry_cnt & 3
		747	? (retry_cnt & 3) + 1
		748	: 1 << (retry_cnt >> 2));
		749
		750	reset_si ();
		751
		752	bool slow = si.prot & PROT_SLOW;
		753
		754	if (si.prot && !si.host)
		755	vpn->send_connect_request (conf->id);
		756	else
		757	{
		758	const sockinfo &dsi = forward_si (si);
		759
		760	slow = slow \|\| (dsi.prot & PROT_SLOW);
		761
		762	if (dsi.valid () && auth_rate_limiter.can (dsi))
		763	{
		764	if (retry_cnt < 4)
		765	send_auth_request (dsi, true);
		766	else
		767	send_ping (dsi, 0);
		768	}
		769	}
		770
		771	retry_int *= slow ? 8. : 0.7;
		772
		773	if (retry_int < conf->max_retry)
652	retry_cnt++;	774	retry_cnt++;
653
654	w.at = NOW + retry_int;
655
656	if (conf->hostname)
657	{
658	reset_dstaddr ();
659
660	if (si.valid () && auth_rate_limiter.can (si))
661	{
662	if (retry_cnt < 4)
663	send_auth_request (si, true);
664	else
665	send_ping (si, 0);
666	}
667	}
668	else	775	else
669	vpn->connect_request (conf->id);	776	retry_int = conf->max_retry;
		777
		778	w.start (NOW + retry_int);
670	}	779	}
671	}	780	}
672		781
673	void	782	void
674	connection::reset_connection ()	783	connection::reset_connection ()
…		…
682	run_script (run_script_cb (this, &connection::script_node_down), false);	791	run_script (run_script_cb (this, &connection::script_node_down), false);
683	}	792	}
684		793
685	delete ictx; ictx = 0;	794	delete ictx; ictx = 0;
686	delete octx; octx = 0;	795	delete octx; octx = 0;
		796	#if ENABLE_DNS
		797	dnsv4_reset_connection ();
		798	#endif
687		799
688	si.host= 0;	800	si.host = 0;
689		801
690	last_activity = 0;	802	last_activity = 0;
691	retry_cnt = 0;	803	retry_cnt = 0;
692		804
693	rekey.reset ();	805	rekey.stop ();
694	keepalive.reset ();	806	keepalive.stop ();
695	establish_connection.reset ();	807	establish_connection.stop ();
696	}	808	}
697		809
698	void	810	void
699	connection::shutdown ()	811	connection::shutdown ()
700	{	812	{
…		…
705	}	817	}
706		818
707	void	819	void
708	connection::rekey_cb (time_watcher &w)	820	connection::rekey_cb (time_watcher &w)
709	{	821	{
710	w.at = TSTAMP_CANCEL;
711
712	reset_connection ();	822	reset_connection ();
713	establish_connection ();	823	establish_connection ();
714	}	824	}
715		825
716	void	826	void
717	connection::send_data_packet (tap_packet *pkt, bool broadcast)	827	connection::send_data_packet (tap_packet *pkt)
718	{	828	{
719	vpndata_packet *p = new vpndata_packet;	829	vpndata_packet *p = new vpndata_packet;
720	int tos = 0;	830	int tos = 0;
721		831
722	if (conf->inherit_tos	832	// I am not hilarious about peeking into packets, but so be it.
723	&& (pkt)[12] == 0x08 && (pkt)[13] == 0x00 // IP	833	if (conf->inherit_tos && pkt->is_ipv4 ())
724	&& ((*pkt)[14] & 0xf0) == 0x40) // IPv4
725	tos = (*pkt)[15] & IPTOS_TOS_MASK;	834	tos = (*pkt)[15] & IPTOS_TOS_MASK;
726		835
727	p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs	836	p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
728	vpn->send_vpn_packet (p, si, tos);	837	send_vpn_packet (p, si, tos);
729		838
730	delete p;	839	delete p;
731		840
732	if (oseqno > MAX_SEQNO)	841	if (oseqno > MAX_SEQNO)
733	rekey ();	842	rekey ();
734	}	843	}
735		844
736	void	845	void
737	connection::inject_data_packet (tap_packet *pkt, bool broadcast)	846	connection::inject_data_packet (tap_packet pkt, bool broadcast/TODO DDD*/)
738	{	847	{
739	if (ictx && octx)	848	if (ictx && octx)
740	send_data_packet (pkt, broadcast);	849	send_data_packet (pkt);
741	else	850	else
742	{	851	{
743	if (!broadcast)//DDDD	852	if (!broadcast)//DDDD
744	queue.put (new tap_packet (*pkt));	853	data_queue.put (new tap_packet (*pkt));
		854
		855	establish_connection ();
		856	}
		857	}
		858
		859	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
		860	{
		861	if (ictx && octx)
		862	send_vpn_packet (pkt, si, tos);
		863	else
		864	{
		865	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
745		866
746	establish_connection ();	867	establish_connection ();
747	}	868	}
748	}	869	}
749		870
…		…
808	if (p->initiate)	929	if (p->initiate)
809	send_auth_request (rsi, false);	930	send_auth_request (rsi, false);
810		931
811	rsachallenge k;	932	rsachallenge k;
812		933
813	if (0 > RSA_private_decrypt (sizeof (p->encr),	934	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
814	(unsigned char )&p->encr, (unsigned char )&k,	935	{
815	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
816	slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),	936	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
817	conf->nodename, (const char *)rsi);	937	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		938	break;
		939	}
818	else	940	else
819	{	941	{
820	retry_cnt = 0;
821	establish_connection.start (NOW + 8); //? ;)
822	keepalive.reset ();
823	rekey.reset ();
824
825	delete ictx;
826	ictx = 0;
827
828	delete octx;	942	delete octx;
829		943
830	octx = new crypto_ctx (k, 1);	944	octx = new crypto_ctx (k, 1);
831	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	945	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
832		946
833	conf->protocols = p->protocols;	947	conf->protocols = p->protocols;
		948	features = p->features & config_packet::get_features ();
		949
834	send_auth_response (rsi, p->id, k);	950	send_auth_response (rsi, p->id, k);
		951
		952	connection_established ();
835		953
836	break;	954	break;
837	}	955	}
838	}	956	}
		957	else
		958	slog (L_WARN, _("%s(%s): protocol mismatch"),
		959	conf->nodename, (const char *)rsi);
839		960
840	send_reset (rsi);	961	send_reset (rsi);
841	}	962	}
842		963
843	break;	964	break;
…		…
856	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	977	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
857		978
858	rsachallenge chg;	979	rsachallenge chg;
859		980
860	if (!rsa_cache.find (p->id, chg))	981	if (!rsa_cache.find (p->id, chg))
		982	{
861	slog (L_ERR, _("%s(%s): unrequested auth response"),	983	slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
862	conf->nodename, (const char *)rsi);	984	conf->nodename, (const char *)rsi);
		985	break;
		986	}
863	else	987	else
864	{	988	{
865	crypto_ctx *cctx = new crypto_ctx (chg, 0);	989	crypto_ctx *cctx = new crypto_ctx (chg, 0);
866		990
867	if (!p->hmac_chk (cctx))	991	if (!p->hmac_chk (cctx))
		992	{
868	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	993	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
869	"could be an attack, or just corruption or an synchronization error"),	994	"could be an attack, or just corruption or a synchronization error"),
870	conf->nodename, (const char *)rsi);	995	conf->nodename, (const char *)rsi);
		996	break;
		997	}
871	else	998	else
872	{	999	{
873	rsaresponse h;	1000	rsaresponse h;
874		1001
875	rsa_hash (p->id, chg, h);	1002	rsa_hash (p->id, chg, h);
…		…
881	delete ictx; ictx = cctx;	1008	delete ictx; ictx = cctx;
882		1009
883	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid	1010	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
884		1011
885	si = rsi;	1012	si = rsi;
		1013	protocol = rsi.prot;
886		1014
887	rekey.start (NOW + ::conf.rekey);	1015	connection_established ();
888	keepalive.start (NOW + ::conf.keepalive);
889		1016
890	// send queued packets
891	while (tap_packet *p = queue.get ())
892	{
893	send_data_packet (p);
894	delete p;
895	}
896
897	connectmode = conf->connectmode;
898
899	slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"),	1017	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
900	conf->nodename, (const char *)rsi,	1018	conf->nodename, (const char *)rsi,
901	strprotocol (protocol),
902	p->prot_major, p->prot_minor);	1019	p->prot_major, p->prot_minor);
903		1020
904	if (::conf.script_node_up)	1021	if (::conf.script_node_up)
905	run_script (run_script_cb (this, &connection::script_node_up), false);	1022	run_script (run_script_cb (this, &connection::script_node_up), false);
906		1023
…		…
929		1046
930	if (ictx && octx)	1047	if (ictx && octx)
931	{	1048	{
932	vpndata_packet p = (vpndata_packet )pkt;	1049	vpndata_packet p = (vpndata_packet )pkt;
933		1050
934	if (rsi == si)	1051	if (!p->hmac_chk (ictx))
		1052	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
		1053	"could be an attack, or just corruption or a synchronization error"),
		1054	conf->nodename, (const char *)rsi);
		1055	else
935	{	1056	{
936	if (!p->hmac_chk (ictx))
937	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
938	"could be an attack, or just corruption or an synchronization error"),
939	conf->nodename, (const char *)rsi);
940	else	1057	u32 seqno;
		1058	tap_packet *d = p->unpack (this, seqno);
		1059
		1060	if (iseqno.recv_ok (seqno))
941	{	1061	{
942	u32 seqno;	1062	vpn->tap->send (d);
943	tap_packet *d = p->unpack (this, seqno);
944		1063
945	if (iseqno.recv_ok (seqno))	1064	if (si != rsi)
946	{	1065	{
947	vpn->tap->send (d);	1066	// fast re-sync on connection changes, useful especially for tcp/ip
948
949	if (p->dst () == 0) // re-broadcast
950	for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
951	{
952	connection c = i;
953
954	if (c->conf != THISNODE && c->conf != conf)
955	c->inject_data_packet (d);
956	}
957
958	delete d;
959
960	break;	1067	si = rsi;
		1068
		1069	slog (L_INFO, _("%s(%s): socket address changed to %s"),
		1070	conf->nodename, (const char )si, (const char )rsi);
961	}	1071	}
962	}	1072	}
		1073
		1074	delete d;
		1075	break;
963	}	1076	}
964	else
965	slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
966	}	1077	}
967		1078
968	send_reset (rsi);	1079	send_reset (rsi);
969	break;	1080	break;
970		1081
…		…
972	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1083	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
973	{	1084	{
974	connect_req_packet p = (connect_req_packet ) pkt;	1085	connect_req_packet p = (connect_req_packet ) pkt;
975		1086
976	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1087	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
		1088	connection *c = vpn->conns[p->id - 1];
977	conf->protocols = p->protocols;	1089	conf->protocols = p->protocols;
978	connection *c = vpn->conns[p->id - 1];
979		1090
980	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",	1091	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
981	conf->id, p->id, c->ictx && c->octx);	1092	conf->id, p->id, c->ictx && c->octx);
982		1093
983	if (c->ictx && c->octx)	1094	if (c->ictx && c->octx)
…		…
985	// send connect_info packets to both sides, in case one is	1096	// send connect_info packets to both sides, in case one is
986	// behind a nat firewall (or both ;)	1097	// behind a nat firewall (or both ;)
987	c->send_connect_info (conf->id, si, conf->protocols);	1098	c->send_connect_info (conf->id, si, conf->protocols);
988	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1099	send_connect_info (c->conf->id, c->si, c->conf->protocols);
989	}	1100	}
		1101	else
		1102	c->establish_connection ();
990	}	1103	}
991		1104
992	break;	1105	break;
993		1106
994	case vpn_packet::PT_CONNECT_INFO:	1107	case vpn_packet::PT_CONNECT_INFO:
995	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1108	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
996	{	1109	{
997	connect_info_packet p = (connect_info_packet ) pkt;	1110	connect_info_packet p = (connect_info_packet )pkt;
998		1111
999	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1112	if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1000	conf->protocols = p->protocols;	1113	{
1001	connection *c = vpn->conns[p->id - 1];	1114	connection *c = vpn->conns[p->id - 1];
1002		1115
		1116	c->conf->protocols = p->protocols;
		1117	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
		1118	p->si.upgrade_protocol (protocol, c->conf);
		1119
1003	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1120	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1004	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1121	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1005		1122
		1123	const sockinfo &dsi = forward_si (p->si);
		1124
		1125	if (dsi.valid ())
1006	c->send_auth_request (p->si, true);	1126	c->send_auth_request (dsi, true);
		1127	}
1007	}	1128	}
1008		1129
1009	break;	1130	break;
1010		1131
1011	default:	1132	default:
…		…
1020	{	1141	{
1021	reset_connection ();	1142	reset_connection ();
1022	establish_connection ();	1143	establish_connection ();
1023	}	1144	}
1024	else if (NOW < last_activity + ::conf.keepalive)	1145	else if (NOW < last_activity + ::conf.keepalive)
1025	w.at = last_activity + ::conf.keepalive;	1146	w.start (last_activity + ::conf.keepalive);
1026	else if (conf->connectmode != conf_node::C_ONDEMAND	1147	else if (conf->connectmode != conf_node::C_ONDEMAND
1027	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1148	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1028	{	1149	{
1029	send_ping (si);	1150	send_ping (si);
1030	w.at = NOW + 5;	1151	w.start (NOW + 5);
1031	}	1152	}
		1153	else if (NOW < last_activity + ::conf.keepalive + 10)
		1154	// hold ondemand connections implicitly a few seconds longer
		1155	// should delete octx, though, or something like that ;)
		1156	w.start (last_activity + ::conf.keepalive + 10);
1032	else	1157	else
1033	reset_connection ();	1158	reset_connection ();
1034	}	1159	}
1035		1160
1036	void connection::connect_request (int id)	1161	void connection::send_connect_request (int id)
1037	{	1162	{
1038	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1163	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1039		1164
1040	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);	1165	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1041	p->hmac_set (octx);	1166	p->hmac_set (octx);
1042	vpn->send_vpn_packet (p, si);	1167	send_vpn_packet (p, si);
1043		1168
1044	delete p;	1169	delete p;
1045	}	1170	}
1046		1171
1047	void connection::script_node ()	1172	void connection::script_node ()
…		…
1071	putenv ("STATE=down");	1196	putenv ("STATE=down");
1072		1197
1073	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1198	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1074	}	1199	}
1075		1200
1076	connection::connection(struct vpn *vpn_)	1201	connection::connection (struct vpn vpn, conf_node conf)
1077	: vpn(vpn_)	1202	: vpn(vpn), conf(conf)
1078	, rekey (this, &connection::rekey_cb)	1203	, rekey (this, &connection::rekey_cb)
1079	, keepalive (this, &connection::keepalive_cb)	1204	, keepalive (this, &connection::keepalive_cb)
1080	, establish_connection (this, &connection::establish_connection_cb)	1205	, establish_connection (this, &connection::establish_connection_cb)
		1206	#if ENABLE_DNS
		1207	, dns (0)
		1208	#endif
1081	{	1209	{
1082	octx = ictx = 0;	1210	octx = ictx = 0;
1083	retry_cnt = 0;	1211	retry_cnt = 0;
1084		1212
		1213	if (!conf->protocols) // make sure some protocol is enabled
		1214	conf->protocols = PROT_UDPv4;
		1215
1085	connectmode = conf_node::C_ALWAYS; // initial setting	1216	connectmode = conf_node::C_ALWAYS; // initial setting
1086	reset_connection ();	1217	reset_connection ();
1087	}	1218	}
1088		1219
1089	connection::~connection ()	1220	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.6 by pcg, Sat Apr 5 02:32:40 2003 UTC vs. Revision 1.50 by pcg, Fri Mar 18 01:53:05 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.6 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.50 by pcg, Fri Mar 18 01:53:05 2005 UTC