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

Comparing gvpe/src/connection.C (file contents):
Revision 1.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
6	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
7	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	10	(at your option) any later version.
9		11
10	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	GNU General Public License for more details.	15	GNU General Public License for more details.
14		16
15	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
16	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
17	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
18	*/	20	*/
19		21
20	#include "config.h"	22	#include "config.h"
21
22	extern "C" {
23	# include "lzf/lzf.h"
24	}
25		23
26	#include <cassert>	24	#include <cassert>
27		25
28	#include <list>	26	#include <list>
29		27
30	#include <openssl/rand.h>	28	#include <openssl/rand.h>
31	#include <openssl/evp.h>	29	#include <openssl/evp.h>
32	#include <openssl/rsa.h>	30	#include <openssl/rsa.h>
33	#include <openssl/err.h>	31	#include <openssl/err.h>
34
35	#include "gettext.h"
36		32
37	#include "conf.h"	33	#include "conf.h"
38	#include "slog.h"	34	#include "slog.h"
39	#include "device.h"	35	#include "device.h"
40	#include "vpn.h"	36	#include "vpn.h"
45	#if !HAVE_RAND_PSEUDO_BYTES	41	#if !HAVE_RAND_PSEUDO_BYTES
46	# define RAND_pseudo_bytes RAND_bytes	42	# define RAND_pseudo_bytes RAND_bytes
47	#endif	43	#endif
48		44
49	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	45	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
		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"
50		52
51	struct crypto_ctx	53	struct crypto_ctx
52	{	54	{
53	EVP_CIPHER_CTX cctx;	55	EVP_CIPHER_CTX cctx;
54	HMAC_CTX hctx;	56	HMAC_CTX hctx;
…		…
93	struct rsa_cache : list<rsa_entry>	95	struct rsa_cache : list<rsa_entry>
94	{	96	{
95	void cleaner_cb (time_watcher &w); time_watcher cleaner;	97	void cleaner_cb (time_watcher &w); time_watcher cleaner;
96		98
97	bool find (const rsaid &id, rsachallenge &chg)	99	bool find (const rsaid &id, rsachallenge &chg)
98	{	100	{
99	for (iterator i = begin (); i != end (); ++i)	101	for (iterator i = begin (); i != end (); ++i)
100	{	102	{
101	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	103	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
102	{	104	{
103	memcpy (&chg, &i->chg, sizeof chg);	105	memcpy (&chg, &i->chg, sizeof chg);
104		106
105	erase (i);	107	erase (i);
106	return true;	108	return true;
107	}	109	}
108	}	110	}
109		111
110	if (cleaner.at < NOW)	112	if (cleaner.at < NOW)
111	cleaner.start (NOW + RSA_TTL);	113	cleaner.start (NOW + RSA_TTL);
112		114
113	return false;	115	return false;
114	}	116	}
115		117
116	void gen (rsaid &id, rsachallenge &chg)	118	void gen (rsaid &id, rsachallenge &chg)
117	{	119	{
118	rsa_entry e;	120	rsa_entry e;
119		121
120	RAND_bytes ((unsigned char *)&id, sizeof id);	122	RAND_bytes ((unsigned char *)&id, sizeof id);
121	RAND_bytes ((unsigned char *)&chg, sizeof chg);	123	RAND_bytes ((unsigned char *)&chg, sizeof chg);
122		124
123	e.expire = NOW + RSA_TTL;	125	e.expire = NOW + RSA_TTL;
124	e.id = id;	126	e.id = id;
125	memcpy (&e.chg, &chg, sizeof chg);	127	memcpy (&e.chg, &chg, sizeof chg);
126		128
127	push_back (e);	129	push_back (e);
128		130
129	if (cleaner.at < NOW)	131	if (cleaner.at < NOW)
130	cleaner.start (NOW + RSA_TTL);	132	cleaner.start (NOW + RSA_TTL);
131	}	133	}
132		134
133	rsa_cache ()	135	rsa_cache ()
134	: cleaner (this, &rsa_cache::cleaner_cb)	136	: cleaner (this, &rsa_cache::cleaner_cb)
135	{ }	137	{ }
136		138
137	} rsa_cache;	139	} rsa_cache;
138		140
139	void rsa_cache::cleaner_cb (time_watcher &w)	141	void rsa_cache::cleaner_cb (time_watcher &w)
140	{	142	{
…		…
200	// 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.
201	// this implementation ("splay list" ;) is inefficient,	203	// this implementation ("splay list" ;) is inefficient,
202	// but low on resources.	204	// but low on resources.
203	struct net_rate_limiter : list<net_rateinfo>	205	struct net_rate_limiter : list<net_rateinfo>
204	{	206	{
205	static const double ALPHA = 1. - 1. / 600.; // allow bursts	207	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206	static const double CUTOFF = 10.; // one event every CUTOFF seconds	208	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	209	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208	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
209		211
210	bool can (const sockinfo &si) { return can((u32)si.host); }	212	bool can (const sockinfo &si) { return can((u32)si.host); }
211	bool can (u32 host);	213	bool can (u32 host);
212	};	214	};
213		215
…		…
218	iterator i;	220	iterator i;
219		221
220	for (i = begin (); i != end (); )	222	for (i = begin (); i != end (); )
221	if (i->host == host)	223	if (i->host == host)
222	break;	224	break;
223	else if (i->last < NOW - EXPIRE)	225	else if (i->last < NOW - NRL_EXPIRE)
224	i = erase (i);	226	i = erase (i);
225	else	227	else
226	i++;	228	i++;
227		229
228	if (i == end ())	230	if (i == end ())
229	{	231	{
230	net_rateinfo ri;	232	net_rateinfo ri;
231		233
232	ri.host = host;	234	ri.host = host;
233	ri.pcnt = 1.;	235	ri.pcnt = 1.;
234	ri.diff = MAXDIF;	236	ri.diff = NRL_MAXDIF;
235	ri.last = NOW;	237	ri.last = NOW;
236		238
237	push_front (ri);	239	push_front (ri);
238		240
239	return true;	241	return true;
…		…
241	else	243	else
242	{	244	{
243	net_rateinfo ri (*i);	245	net_rateinfo ri (*i);
244	erase (i);	246	erase (i);
245		247
246	ri.pcnt = ri.pcnt * ALPHA;	248	ri.pcnt = ri.pcnt * NRL_ALPHA;
247	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	249	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
248		250
249	ri.last = NOW;	251	ri.last = NOW;
250		252
251	double dif = ri.diff / ri.pcnt;	253	double dif = ri.diff / ri.pcnt;
252		254
253	bool send = dif > CUTOFF;	255	bool send = dif > NRL_CUTOFF;
254		256
255	if (dif > MAXDIF)	257	if (dif > NRL_MAXDIF)
256	{	258	{
257	ri.pcnt = 1.;	259	ri.pcnt = 1.;
258	ri.diff = MAXDIF;	260	ri.diff = NRL_MAXDIF;
259	}	261	}
260	else if (send)	262	else if (send)
261	ri.pcnt++;	263	ri.pcnt++;
262		264
263	push_front (ri);	265	push_front (ri);
…		…
333	int outl = 0, outl2;	335	int outl = 0, outl2;
334	ptype type = PT_DATA_UNCOMPRESSED;	336	ptype type = PT_DATA_UNCOMPRESSED;
335		337
336	#if ENABLE_COMPRESSION	338	#if ENABLE_COMPRESSION
337	u8 cdata[MAX_MTU];	339	u8 cdata[MAX_MTU];
338	u32 cl;
339		340
		341	if (conn->features & ENABLE_COMPRESSION)
		342	{
340	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	343	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		344
341	if (cl)	345	if (cl)
342	{	346	{
343	type = PT_DATA_COMPRESSED;	347	type = PT_DATA_COMPRESSED;
344	d = cdata;	348	d = cdata;
345	l = cl + 2;	349	l = cl + 2;
346		350
347	d[0] = cl >> 8;	351	d[0] = cl >> 8;
348	d[1] = cl;	352	d[1] = cl;
		353	}
349	}	354	}
350	#endif	355	#endif
351		356
352	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));	357	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353		358
…		…
446	{	451	{
447	// actually, hmaclen cannot be checked because the hmac	452	// actually, hmaclen cannot be checked because the hmac
448	// field comes before this data, so peers with other	453	// field comes before this data, so peers with other
449	// hmacs simply will not work.	454	// hmacs simply will not work.
450	u8 prot_major, prot_minor, randsize, hmaclen;	455	u8 prot_major, prot_minor, randsize, hmaclen;
451	u8 flags, challengelen, pad2, pad3;	456	u8 flags, challengelen, features, pad3;
452	u32 cipher_nid, digest_nid, hmac_nid;	457	u32 cipher_nid, digest_nid, hmac_nid;
453
454	const u8 curflags () const
455	{
456	return 0x80
457	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
458	}
459		458
460	void setup (ptype type, int dst);	459	void setup (ptype type, int dst);
461	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	}
462	};	473	};
463		474
464	void config_packet::setup (ptype type, int dst)	475	void config_packet::setup (ptype type, int dst)
465	{	476	{
466	prot_major = PROTOCOL_MAJOR;	477	prot_major = PROTOCOL_MAJOR;
467	prot_minor = PROTOCOL_MINOR;	478	prot_minor = PROTOCOL_MINOR;
468	randsize = RAND_SIZE;	479	randsize = RAND_SIZE;
469	hmaclen = HMACLENGTH;	480	hmaclen = HMACLENGTH;
470	flags = curflags ();	481	flags = 0;
471	challengelen = sizeof (rsachallenge);	482	challengelen = sizeof (rsachallenge);
		483	features = get_features ();
472		484
473	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	485	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474	digest_nid = htonl (EVP_MD_type (RSA_HASH));	486	digest_nid = htonl (EVP_MD_type (RSA_HASH));
475	hmac_nid = htonl (EVP_MD_type (DIGEST));	487	hmac_nid = htonl (EVP_MD_type (DIGEST));
476		488
…		…
484	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);	496	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485	else if (randsize != RAND_SIZE)	497	else if (randsize != RAND_SIZE)
486	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);	498	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487	else if (hmaclen != HMACLENGTH)	499	else if (hmaclen != HMACLENGTH)
488	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);	500	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489	else if (flags != curflags ())
490	slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491	else if (challengelen != sizeof (rsachallenge))	501	else if (challengelen != sizeof (rsachallenge))
492	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));	502	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	503	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));	504	slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	505	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
…		…
575	{	585	{
576	if (ictx && octx)	586	if (ictx && octx)
577	{	587	{
578	connectmode = conf->connectmode;	588	connectmode = conf->connectmode;
579		589
		590	// make sure rekeying timeouts are slightly asymmetric
580	rekey.start (NOW + ::conf.rekey);	591	rekey.start (NOW + ::conf.rekey
		592	+ (conf->id > THISNODE->id ? 10 : 0));
581	keepalive.start (NOW + ::conf.keepalive);	593	keepalive.start (NOW + ::conf.keepalive);
582		594
583	// send queued packets	595	// send queued packets
584	if (ictx && octx)	596	if (ictx && octx)
585	{	597	{
…		…
611	protocol = best_protocol (THISNODE->protocols & conf->protocols);	623	protocol = best_protocol (THISNODE->protocols & conf->protocols);
612		624
613	// mask out protocols we cannot establish	625	// mask out protocols we cannot establish
614	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	626	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	627	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		628	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
616		629
617	si.set (conf, protocol);	630	si.set (conf, protocol);
618	}	631	}
619		632
620	// ensure sockinfo is valid, forward if necessary	633	// ensure sockinfo is valid, forward if necessary
…		…
625	{	638	{
626	connection *r = vpn->find_router ();	639	connection *r = vpn->find_router ();
627		640
628	if (r)	641	if (r)
629	{	642	{
630	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	643	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631	conf->nodename, r->conf->nodename);	644	conf->nodename, r->conf->nodename, (const char *)r->si);
632	return r->si;	645	return r->si;
633	}	646	}
634	else	647	else
635	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	648	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636	conf->nodename);	649	conf->nodename);
…		…
726	&& conf != THISNODE	739	&& conf != THISNODE
727	&& connectmode != conf_node::C_NEVER	740	&& connectmode != conf_node::C_NEVER
728	&& connectmode != conf_node::C_DISABLED	741	&& connectmode != conf_node::C_DISABLED
729	&& NOW > w.at)	742	&& NOW > w.at)
730	{	743	{
731	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
732		745
733	if (retry_int < 3600 * 8)	746	double retry_int = double (retry_cnt & 3
734	retry_cnt++;	747	? (retry_cnt & 3) + 1
735		748	: 1 << (retry_cnt >> 2));
736	w.start (NOW + retry_int);
737		749
738	reset_si ();	750	reset_si ();
		751
		752	bool slow = si.prot & PROT_SLOW;
739		753
740	if (si.prot && !si.host)	754	if (si.prot && !si.host)
741	vpn->send_connect_request (conf->id);	755	vpn->send_connect_request (conf->id);
742	else	756	else
743	{	757	{
744	const sockinfo &dsi = forward_si (si);	758	const sockinfo &dsi = forward_si (si);
		759
		760	slow = slow \|\| (dsi.prot & PROT_SLOW);
745		761
746	if (dsi.valid () && auth_rate_limiter.can (dsi))	762	if (dsi.valid () && auth_rate_limiter.can (dsi))
747	{	763	{
748	if (retry_cnt < 4)	764	if (retry_cnt < 4)
749	send_auth_request (dsi, true);	765	send_auth_request (dsi, true);
750	else	766	else
751	send_ping (dsi, 0);	767	send_ping (dsi, 0);
752	}	768	}
753	}	769	}
		770
		771	retry_int *= slow ? 8. : 0.7;
		772
		773	if (retry_int < conf->max_retry)
		774	retry_cnt++;
		775	else
		776	retry_int = conf->max_retry;
		777
		778	w.start (NOW + retry_int);
754	}	779	}
755	}	780	}
756		781
757	void	782	void
758	connection::reset_connection ()	783	connection::reset_connection ()
…		…
766	run_script (run_script_cb (this, &connection::script_node_down), false);	791	run_script (run_script_cb (this, &connection::script_node_down), false);
767	}	792	}
768		793
769	delete ictx; ictx = 0;	794	delete ictx; ictx = 0;
770	delete octx; octx = 0;	795	delete octx; octx = 0;
		796	#if ENABLE_DNS
		797	dnsv4_reset_connection ();
		798	#endif
771		799
772	si.host= 0;	800	si.host = 0;
773		801
774	last_activity = 0;	802	last_activity = 0;
775	retry_cnt = 0;	803	retry_cnt = 0;
776		804
777	rekey.stop ();	805	rekey.stop ();
…		…
915		943
916	octx = new crypto_ctx (k, 1);	944	octx = new crypto_ctx (k, 1);
917	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	945	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
918		946
919	conf->protocols = p->protocols;	947	conf->protocols = p->protocols;
		948	features = p->features & config_packet::get_features ();
920		949
921	send_auth_response (rsi, p->id, k);	950	send_auth_response (rsi, p->id, k);
922		951
923	connection_established ();	952	connection_established ();
924		953
…		…
1038	si = rsi;	1067	si = rsi;
1039		1068
1040	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1069	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1041	conf->nodename, (const char )si, (const char )rsi);	1070	conf->nodename, (const char )si, (const char )rsi);
1042	}	1071	}
1043
1044	delete d;
1045
1046	break;
1047	}	1072	}
		1073
		1074	delete d;
		1075	break;
1048	}	1076	}
1049	}	1077	}
1050		1078
1051	send_reset (rsi);	1079	send_reset (rsi);
1052	break;	1080	break;
…		…
1077	break;	1105	break;
1078		1106
1079	case vpn_packet::PT_CONNECT_INFO:	1107	case vpn_packet::PT_CONNECT_INFO:
1080	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1108	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1081	{	1109	{
1082	connect_info_packet p = (connect_info_packet ) pkt;	1110	connect_info_packet p = (connect_info_packet )pkt;
1083		1111
1084	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
1085		1113	{
1086	connection *c = vpn->conns[p->id - 1];	1114	connection *c = vpn->conns[p->id - 1];
1087		1115
1088	c->conf->protocols = p->protocols;	1116	c->conf->protocols = p->protocols;
1089	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1117	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1090	p->si.upgrade_protocol (protocol, c->conf);	1118	p->si.upgrade_protocol (protocol, c->conf);
1091		1119
1092	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1120	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1093	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);
1094		1122
1095	const sockinfo &dsi = forward_si (p->si);	1123	const sockinfo &dsi = forward_si (p->si);
1096		1124
1097	if (dsi.valid ())	1125	if (dsi.valid ())
1098	c->send_auth_request (dsi, true);	1126	c->send_auth_request (dsi, true);
		1127	}
1099	}	1128	}
1100		1129
1101	break;	1130	break;
1102		1131
1103	default:	1132	default:
…		…
1167	putenv ("STATE=down");	1196	putenv ("STATE=down");
1168		1197
1169	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1198	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1170	}	1199	}
1171		1200
1172	connection::connection(struct vpn *vpn_)	1201	connection::connection (struct vpn vpn, conf_node conf)
1173	: vpn(vpn_)	1202	: vpn(vpn), conf(conf)
1174	, rekey (this, &connection::rekey_cb)	1203	, rekey (this, &connection::rekey_cb)
1175	, keepalive (this, &connection::keepalive_cb)	1204	, keepalive (this, &connection::keepalive_cb)
1176	, establish_connection (this, &connection::establish_connection_cb)	1205	, establish_connection (this, &connection::establish_connection_cb)
		1206	#if ENABLE_DNS
		1207	, dns (0)
		1208	#endif
1177	{	1209	{
1178	octx = ictx = 0;	1210	octx = ictx = 0;
1179	retry_cnt = 0;	1211	retry_cnt = 0;
1180		1212
		1213	if (!conf->protocols) // make sure some protocol is enabled
		1214	conf->protocols = PROT_UDPv4;
		1215
1181	connectmode = conf_node::C_ALWAYS; // initial setting	1216	connectmode = conf_node::C_ALWAYS; // initial setting
1182	reset_connection ();	1217	reset_connection ();
1183	}	1218	}
1184		1219
1185	connection::~connection ()	1220	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs. Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC