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

Comparing gvpe/src/connection.C (file contents):
Revision 1.17 by pcg, Mon Sep 1 21:23:35 2003 UTC vs.
Revision 1.54 by pcg, Tue Apr 19 03:22:46 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;
…		…
88	struct rsa_cache : list<rsa_entry>	95	struct rsa_cache : list<rsa_entry>
89	{	96	{
90	void cleaner_cb (time_watcher &w); time_watcher cleaner;	97	void cleaner_cb (time_watcher &w); time_watcher cleaner;
91		98
92	bool find (const rsaid &id, rsachallenge &chg)	99	bool find (const rsaid &id, rsachallenge &chg)
93	{	100	{
94	for (iterator i = begin (); i != end (); ++i)	101	for (iterator i = begin (); i != end (); ++i)
95	{	102	{
96	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	103	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
97	{	104	{
98	memcpy (&chg, &i->chg, sizeof chg);	105	memcpy (&chg, &i->chg, sizeof chg);
99		106
100	erase (i);	107	erase (i);
101	return true;	108	return true;
102	}	109	}
103	}	110	}
104		111
105	if (cleaner.at < NOW)	112	if (cleaner.at < NOW)
106	cleaner.start (NOW + RSA_TTL);	113	cleaner.start (NOW + RSA_TTL);
107		114
108	return false;	115	return false;
109	}	116	}
110		117
111	void gen (rsaid &id, rsachallenge &chg)	118	void gen (rsaid &id, rsachallenge &chg)
112	{	119	{
113	rsa_entry e;	120	rsa_entry e;
114		121
115	RAND_bytes ((unsigned char *)&id, sizeof id);	122	RAND_bytes ((unsigned char *)&id, sizeof id);
116	RAND_bytes ((unsigned char *)&chg, sizeof chg);	123	RAND_bytes ((unsigned char *)&chg, sizeof chg);
117		124
118	e.expire = NOW + RSA_TTL;	125	e.expire = NOW + RSA_TTL;
119	e.id = id;	126	e.id = id;
120	memcpy (&e.chg, &chg, sizeof chg);	127	memcpy (&e.chg, &chg, sizeof chg);
121		128
122	push_back (e);	129	push_back (e);
123		130
124	if (cleaner.at < NOW)	131	if (cleaner.at < NOW)
125	cleaner.start (NOW + RSA_TTL);	132	cleaner.start (NOW + RSA_TTL);
126	}	133	}
127		134
128	rsa_cache ()	135	rsa_cache ()
129	: cleaner (this, &rsa_cache::cleaner_cb)	136	: cleaner (this, &rsa_cache::cleaner_cb)
130	{ }	137	{ }
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
…		…
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. / 600.; // allow bursts	207	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203	static const double CUTOFF = 10.; // 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
205	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
206		211
207	bool can (const sockinfo &si) { return can((u32)si.host); }	212	bool can (const sockinfo &si) { return can((u32)si.host); }
208	bool can (u32 host);	213	bool can (u32 host);
209	};	214	};
210		215
…		…
215	iterator i;	220	iterator i;
216		221
217	for (i = begin (); i != end (); )	222	for (i = begin (); i != end (); )
218	if (i->host == host)	223	if (i->host == host)
219	break;	224	break;
220	else if (i->last < NOW - EXPIRE)	225	else if (i->last < NOW - NRL_EXPIRE)
221	i = erase (i);	226	i = erase (i);
222	else	227	else
223	i++;	228	i++;
224		229
225	if (i == end ())	230	if (i == end ())
226	{	231	{
227	net_rateinfo ri;	232	net_rateinfo ri;
228		233
229	ri.host = host;	234	ri.host = host;
230	ri.pcnt = 1.;	235	ri.pcnt = 1.;
231	ri.diff = MAXDIF;	236	ri.diff = NRL_MAXDIF;
232	ri.last = NOW;	237	ri.last = NOW;
233		238
234	push_front (ri);	239	push_front (ri);
235		240
236	return true;	241	return true;
…		…
238	else	243	else
239	{	244	{
240	net_rateinfo ri (*i);	245	net_rateinfo ri (*i);
241	erase (i);	246	erase (i);
242		247
243	ri.pcnt = ri.pcnt * ALPHA;	248	ri.pcnt = ri.pcnt * NRL_ALPHA;
244	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	249	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
245		250
246	ri.last = NOW;	251	ri.last = NOW;
247		252
248	double dif = ri.diff / ri.pcnt;	253	double dif = ri.diff / ri.pcnt;
249		254
250	bool send = dif > CUTOFF;	255	bool send = dif > NRL_CUTOFF;
251		256
252	if (dif > MAXDIF)	257	if (dif > NRL_MAXDIF)
253	{	258	{
254	ri.pcnt = 1.;	259	ri.pcnt = 1.;
255	ri.diff = MAXDIF;	260	ri.diff = NRL_MAXDIF;
256	}	261	}
257	else if (send)	262	else if (send)
258	ri.pcnt++;	263	ri.pcnt++;
259		264
260	push_front (ri);	265	push_front (ri);
…		…
307	}	312	}
308		313
309	#define MAXVPNDATA (MAX_MTU - 6 - 6)	314	#define MAXVPNDATA (MAX_MTU - 6 - 6)
310	#define DATAHDR (sizeof (u32) + RAND_SIZE)	315	#define DATAHDR (sizeof (u32) + RAND_SIZE)
311		316
312	struct vpndata_packet:vpn_packet	317	struct vpndata_packet : vpn_packet
313	{	318	{
314	u8 data[MAXVPNDATA + DATAHDR]; // seqno	319	u8 data[MAXVPNDATA + DATAHDR]; // seqno
315		320
316	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);
317	tap_packet unpack (connection conn, u32 &seqno);	322	tap_packet unpack (connection conn, u32 &seqno);
…		…
330	int outl = 0, outl2;	335	int outl = 0, outl2;
331	ptype type = PT_DATA_UNCOMPRESSED;	336	ptype type = PT_DATA_UNCOMPRESSED;
332		337
333	#if ENABLE_COMPRESSION	338	#if ENABLE_COMPRESSION
334	u8 cdata[MAX_MTU];	339	u8 cdata[MAX_MTU];
335	u32 cl;
336		340
		341	if (conn->features & ENABLE_COMPRESSION)
		342	{
337	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	343	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		344
338	if (cl)	345	if (cl)
339	{	346	{
340	type = PT_DATA_COMPRESSED;	347	type = PT_DATA_COMPRESSED;
341	d = cdata;	348	d = cdata;
342	l = cl + 2;	349	l = cl + 2;
343		350
344	d[0] = cl >> 8;	351	d[0] = cl >> 8;
345	d[1] = cl;	352	d[1] = cl;
		353	}
346	}	354	}
347	#endif	355	#endif
348		356
349	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	357	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350		358
351	struct {	359	struct {
352	#if RAND_SIZE	360	#if RAND_SIZE
353	u8 rnd[RAND_SIZE];	361	u8 rnd[RAND_SIZE];
354	#endif	362	#endif
…		…
358	datahdr.seqno = ntohl (seqno);	366	datahdr.seqno = ntohl (seqno);
359	#if RAND_SIZE	367	#if RAND_SIZE
360	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	368	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361	#endif	369	#endif
362		370
363	EVP_EncryptUpdate (cctx,	371	require (EVP_EncryptUpdate (cctx,
364	(unsigned char *) data + outl, &outl2,	372	(unsigned char *) data + outl, &outl2,
365	(unsigned char *) &datahdr, DATAHDR);	373	(unsigned char *) &datahdr, DATAHDR));
366	outl += outl2;	374	outl += outl2;
367		375
368	EVP_EncryptUpdate (cctx,	376	require (EVP_EncryptUpdate (cctx,
369	(unsigned char *) data + outl, &outl2,	377	(unsigned char *) data + outl, &outl2,
370	(unsigned char *) d, l);	378	(unsigned char *) d, l));
371	outl += outl2;	379	outl += outl2;
372		380
373	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	381	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374	outl += outl2;	382	outl += outl2;
375		383
376	len = outl + data_hdr_size ();	384	len = outl + data_hdr_size ();
377		385
378	set_hdr (type, dst);	386	set_hdr (type, dst);
…		…
387	int outl = 0, outl2;	395	int outl = 0, outl2;
388	tap_packet *p = new tap_packet;	396	tap_packet *p = new tap_packet;
389	u8 *d;	397	u8 *d;
390	u32 l = len - data_hdr_size ();	398	u32 l = len - data_hdr_size ();
391		399
392	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	400	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393		401
394	#if ENABLE_COMPRESSION	402	#if ENABLE_COMPRESSION
395	u8 cdata[MAX_MTU];	403	u8 cdata[MAX_MTU];
396		404
397	if (type == PT_DATA_COMPRESSED)	405	if (type == PT_DATA_COMPRESSED)
…		…
399	else	407	else
400	#endif	408	#endif
401	d = &(*p)[6 + 6 - DATAHDR];	409	d = &(*p)[6 + 6 - DATAHDR];
402		410
403	/* 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 */
404	EVP_DecryptUpdate (cctx,	412	require (EVP_DecryptUpdate (cctx,
405	d, &outl2,	413	d, &outl2,
406	(unsigned char *)&data, len - data_hdr_size ());	414	(unsigned char *)&data, len - data_hdr_size ()));
407	outl += outl2;	415	outl += outl2;
408		416
409	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	417	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410	outl += outl2;	418	outl += outl2;
411		419
412	seqno = ntohl ((u32 )(d + RAND_SIZE));	420	seqno = ntohl ((u32 )(d + RAND_SIZE));
413		421
414	id2mac (dst () ? dst() : THISNODE->id, p->dst);	422	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
443	{	451	{
444	// actually, hmaclen cannot be checked because the hmac	452	// actually, hmaclen cannot be checked because the hmac
445	// field comes before this data, so peers with other	453	// field comes before this data, so peers with other
446	// hmacs simply will not work.	454	// hmacs simply will not work.
447	u8 prot_major, prot_minor, randsize, hmaclen;	455	u8 prot_major, prot_minor, randsize, hmaclen;
448	u8 flags, challengelen, pad2, pad3;	456	u8 flags, challengelen, features, pad3;
449	u32 cipher_nid, digest_nid, hmac_nid;	457	u32 cipher_nid, digest_nid, hmac_nid;
450
451	const u8 curflags () const
452	{
453	return 0x80
454	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
455	}
456		458
457	void setup (ptype type, int dst);	459	void setup (ptype type, int dst);
458	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	}
459	};	473	};
460		474
461	void config_packet::setup (ptype type, int dst)	475	void config_packet::setup (ptype type, int dst)
462	{	476	{
463	prot_major = PROTOCOL_MAJOR;	477	prot_major = PROTOCOL_MAJOR;
464	prot_minor = PROTOCOL_MINOR;	478	prot_minor = PROTOCOL_MINOR;
465	randsize = RAND_SIZE;	479	randsize = RAND_SIZE;
466	hmaclen = HMACLENGTH;	480	hmaclen = HMACLENGTH;
467	flags = curflags ();	481	flags = 0;
468	challengelen = sizeof (rsachallenge);	482	challengelen = sizeof (rsachallenge);
		483	features = get_features ();
469		484
470	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	485	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471	digest_nid = htonl (EVP_MD_type (RSA_HASH));	486	digest_nid = htonl (EVP_MD_type (RSA_HASH));
472	hmac_nid = htonl (EVP_MD_type (DIGEST));	487	hmac_nid = htonl (EVP_MD_type (DIGEST));
473		488
…		…
476	}	491	}
477		492
478	bool config_packet::chk_config () const	493	bool config_packet::chk_config () const
479	{	494	{
480	if (prot_major != PROTOCOL_MAJOR)	495	if (prot_major != PROTOCOL_MAJOR)
481	slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);	496	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482	else if (randsize != RAND_SIZE)	497	else if (randsize != RAND_SIZE)
483	slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);	498	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
484	else if (hmaclen != HMACLENGTH)	499	else if (hmaclen != HMACLENGTH)
485	slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);	500	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
486	else if (flags != curflags ())
487	slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
488	else if (challengelen != sizeof (rsachallenge))	501	else if (challengelen != sizeof (rsachallenge))
489	slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));	502	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
490	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	503	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491	slog (L_WARN, _("cipher mismatch (%x <=> %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));
492	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))	505	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
493	slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));	506	slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
494	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))	507	else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495	slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));	508	slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
496	else	509	else
497	return true;	510	return true;
498		511
499	return false;	512	return false;
500	}	513	}
501		514
502	struct auth_req_packet : config_packet	515	struct auth_req_packet : config_packet
503	{	516	{
504	char magic[8];	517	char magic[8];
505	u8 initiate; // false if this is just an automatic reply	518	u8 initiate; // false if this is just an automatic reply
506	u8 protocols; // supported protocols (will get patches on forward)	519	u8 protocols; // supported protocols (will be patched on forward)
507	u8 pad2, pad3;	520	u8 pad2, pad3;
508	rsaid id;	521	rsaid id;
509	rsaencrdata encr;	522	rsaencrdata encr;
510		523
511	auth_req_packet (int dst, bool initiate_, u8 protocols_)	524	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
572	{	585	{
573	if (ictx && octx)	586	if (ictx && octx)
574	{	587	{
575	connectmode = conf->connectmode;	588	connectmode = conf->connectmode;
576		589
		590	// make sure rekeying timeouts are slightly asymmetric
577	rekey.start (NOW + ::conf.rekey);	591	rekey.start (NOW + ::conf.rekey
		592	+ (conf->id > THISNODE->id ? 10 : 0));
578	keepalive.start (NOW + ::conf.keepalive);	593	keepalive.start (NOW + ::conf.keepalive);
579		594
580	// send queued packets	595	// send queued packets
581	if (ictx && octx)	596	if (ictx && octx)
582	{	597	{
…		…
595	}	610	}
596	else	611	else
597	{	612	{
598	retry_cnt = 0;	613	retry_cnt = 0;
599	establish_connection.start (NOW + 5);	614	establish_connection.start (NOW + 5);
600	keepalive.reset ();	615	keepalive.stop ();
601	rekey.reset ();	616	rekey.stop ();
602	}	617	}
603	}	618	}
604		619
605	void	620	void
606	connection::reset_si ()	621	connection::reset_si ()
…		…
608	protocol = best_protocol (THISNODE->protocols & conf->protocols);	623	protocol = best_protocol (THISNODE->protocols & conf->protocols);
609		624
610	// mask out protocols we cannot establish	625	// mask out protocols we cannot establish
611	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	626	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
612	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	627	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		628	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
613		629
614	si.set (conf, protocol);	630	si.set (conf, protocol);
615	}	631	}
616		632
617	// ensure sockinfo is valid, forward if necessary	633	// ensure sockinfo is valid, forward if necessary
…		…
622	{	638	{
623	connection *r = vpn->find_router ();	639	connection *r = vpn->find_router ();
624		640
625	if (r)	641	if (r)
626	{	642	{
627	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	643	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
628	conf->nodename, r->conf->nodename);	644	conf->nodename, r->conf->nodename, (const char *)r->si);
629	return r->si;	645	return r->si;
630	}	646	}
631	else	647	else
632	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	648	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
633	conf->nodename);	649	conf->nodename);
…		…
672	connection::send_auth_request (const sockinfo &si, bool initiate)	688	connection::send_auth_request (const sockinfo &si, bool initiate)
673	{	689	{
674	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);
675		691
676	rsachallenge chg;	692	rsachallenge chg;
677
678	rsa_cache.gen (pkt->id, chg);	693	rsa_cache.gen (pkt->id, chg);
679		694	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
680	if (0 > RSA_public_encrypt (sizeof chg,
681	(unsigned char )&chg, (unsigned char )&pkt->encr,
682	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683	fatal ("RSA_public_encrypt error");
684		695
685	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);
686		697
687	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	698	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
688		699
…		…
722	}	733	}
723		734
724	void	735	void
725	connection::establish_connection_cb (time_watcher &w)	736	connection::establish_connection_cb (time_watcher &w)
726	{	737	{
727	if (ictx \|\| conf == THISNODE	738	if (!ictx
		739	&& conf != THISNODE
728	\|\| connectmode == conf_node::C_NEVER	740	&& connectmode != conf_node::C_NEVER
729	\|\| connectmode == conf_node::C_DISABLED)	741	&& connectmode != conf_node::C_DISABLED
730	w.at = TSTAMP_CANCEL;	742	&& NOW > w.at)
731	else if (w.at <= NOW)
732	{	743	{
733	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
734		745
735	if (retry_int < 3600 * 8)	746	double retry_int = double (retry_cnt & 3
736	retry_cnt++;	747	? (retry_cnt & 3) + 1
737		748	: 1 << (retry_cnt >> 2));
738	w.at = NOW + retry_int;
739		749
740	reset_si ();	750	reset_si ();
		751
		752	bool slow = si.prot & PROT_SLOW;
741		753
742	if (si.prot && !si.host)	754	if (si.prot && !si.host)
743	vpn->send_connect_request (conf->id);	755	vpn->send_connect_request (conf->id);
744	else	756	else
745	{	757	{
746	const sockinfo &dsi = forward_si (si);	758	const sockinfo &dsi = forward_si (si);
		759
		760	slow = slow \|\| (dsi.prot & PROT_SLOW);
747		761
748	if (dsi.valid () && auth_rate_limiter.can (dsi))	762	if (dsi.valid () && auth_rate_limiter.can (dsi))
749	{	763	{
750	if (retry_cnt < 4)	764	if (retry_cnt < 4)
751	send_auth_request (dsi, true);	765	send_auth_request (dsi, true);
752	else	766	else
753	send_ping (dsi, 0);	767	send_ping (dsi, 0);
754	}	768	}
755	}	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);
756	}	779	}
757	}	780	}
758		781
759	void	782	void
760	connection::reset_connection ()	783	connection::reset_connection ()
…		…
763	{	786	{
764	slog (L_INFO, _("%s(%s): connection lost"),	787	slog (L_INFO, _("%s(%s): connection lost"),
765	conf->nodename, (const char *)si);	788	conf->nodename, (const char *)si);
766		789
767	if (::conf.script_node_down)	790	if (::conf.script_node_down)
768	run_script (run_script_cb (this, &connection::script_node_down), false);	791	if (!run_script (run_script_cb (this, &connection::script_node_down), false))
		792	slog (L_WARN, _("node-down command execution failed, continuing."));
769	}	793	}
770		794
771	delete ictx; ictx = 0;	795	delete ictx; ictx = 0;
772	delete octx; octx = 0;	796	delete octx; octx = 0;
		797	#if ENABLE_DNS
		798	dnsv4_reset_connection ();
		799	#endif
773		800
774	si.host= 0;	801	si.host = 0;
775		802
776	last_activity = 0;	803	last_activity = 0;
777	retry_cnt = 0;	804	retry_cnt = 0;
778		805
779	rekey.reset ();	806	rekey.stop ();
780	keepalive.reset ();	807	keepalive.stop ();
781	establish_connection.reset ();	808	establish_connection.stop ();
782	}	809	}
783		810
784	void	811	void
785	connection::shutdown ()	812	connection::shutdown ()
786	{	813	{
…		…
791	}	818	}
792		819
793	void	820	void
794	connection::rekey_cb (time_watcher &w)	821	connection::rekey_cb (time_watcher &w)
795	{	822	{
796	w.at = TSTAMP_CANCEL;
797
798	reset_connection ();	823	reset_connection ();
799	establish_connection ();	824	establish_connection ();
800	}	825	}
801		826
802	void	827	void
803	connection::send_data_packet (tap_packet *pkt, bool broadcast)	828	connection::send_data_packet (tap_packet *pkt)
804	{	829	{
805	vpndata_packet *p = new vpndata_packet;	830	vpndata_packet *p = new vpndata_packet;
806	int tos = 0;	831	int tos = 0;
807		832
808	// I am not hilarious about peeking into packets, but so be it.	833	// I am not hilarious about peeking into packets, but so be it.
809	if (conf->inherit_tos	834	if (conf->inherit_tos && pkt->is_ipv4 ())
810	&& (pkt)[12] == 0x08 && (pkt)[13] == 0x00 // IP
811	&& ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812	tos = (*pkt)[15] & IPTOS_TOS_MASK;	835	tos = (*pkt)[15] & IPTOS_TOS_MASK;
813		836
814	p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs	837	p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815	send_vpn_packet (p, si, tos);	838	send_vpn_packet (p, si, tos);
816		839
817	delete p;	840	delete p;
818		841
819	if (oseqno > MAX_SEQNO)	842	if (oseqno > MAX_SEQNO)
820	rekey ();	843	rekey ();
821	}	844	}
822		845
823	void	846	void
824	connection::inject_data_packet (tap_packet *pkt, bool broadcast)	847	connection::inject_data_packet (tap_packet pkt, bool broadcast/TODO DDD*/)
825	{	848	{
826	if (ictx && octx)	849	if (ictx && octx)
827	send_data_packet (pkt, broadcast);	850	send_data_packet (pkt);
828	else	851	else
829	{	852	{
830	if (!broadcast)//DDDD	853	if (!broadcast)//DDDD
831	data_queue.put (new tap_packet (*pkt));	854	data_queue.put (new tap_packet (*pkt));
832		855
…		…
838	{	861	{
839	if (ictx && octx)	862	if (ictx && octx)
840	send_vpn_packet (pkt, si, tos);	863	send_vpn_packet (pkt, si, tos);
841	else	864	else
842	{	865	{
843	vpn_queue.put (new vpn_packet (*pkt));	866	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
844		867
845	establish_connection ();	868	establish_connection ();
846	}	869	}
847	}	870	}
848		871
…		…
907	if (p->initiate)	930	if (p->initiate)
908	send_auth_request (rsi, false);	931	send_auth_request (rsi, false);
909		932
910	rsachallenge k;	933	rsachallenge k;
911		934
912	if (0 > RSA_private_decrypt (sizeof (p->encr),	935	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913	(unsigned char )&p->encr, (unsigned char )&k,	936	{
914	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	937	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));	938	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		939	break;
		940	}
917	else	941	else
918	{	942	{
919	delete octx;	943	delete octx;
920		944
921	octx = new crypto_ctx (k, 1);	945	octx = new crypto_ctx (k, 1);
922	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	946	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
923		947
924	conf->protocols = p->protocols;	948	conf->protocols = p->protocols;
		949	features = p->features & config_packet::get_features ();
925		950
926	send_auth_response (rsi, p->id, k);	951	send_auth_response (rsi, p->id, k);
927		952
928	connection_established ();	953	connection_established ();
929		954
…		…
954		979
955	rsachallenge chg;	980	rsachallenge chg;
956		981
957	if (!rsa_cache.find (p->id, chg))	982	if (!rsa_cache.find (p->id, chg))
958	{	983	{
959	slog (L_ERR, _("%s(%s): unrequested auth response"),	984	slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
960	conf->nodename, (const char *)rsi);	985	conf->nodename, (const char *)rsi);
961	break;	986	break;
962	}	987	}
963	else	988	else
964	{	989	{
965	crypto_ctx *cctx = new crypto_ctx (chg, 0);	990	crypto_ctx *cctx = new crypto_ctx (chg, 0);
966		991
967	if (!p->hmac_chk (cctx))	992	if (!p->hmac_chk (cctx))
		993	{
968	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	994	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
969	"could be an attack, or just corruption or an synchronization error"),	995	"could be an attack, or just corruption or a synchronization error"),
970	conf->nodename, (const char *)rsi);	996	conf->nodename, (const char *)rsi);
		997	break;
		998	}
971	else	999	else
972	{	1000	{
973	rsaresponse h;	1001	rsaresponse h;
974		1002
975	rsa_hash (p->id, chg, h);	1003	rsa_hash (p->id, chg, h);
…		…
990	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),	1018	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991	conf->nodename, (const char *)rsi,	1019	conf->nodename, (const char *)rsi,
992	p->prot_major, p->prot_minor);	1020	p->prot_major, p->prot_minor);
993		1021
994	if (::conf.script_node_up)	1022	if (::conf.script_node_up)
995	run_script (run_script_cb (this, &connection::script_node_up), false);	1023	if (!run_script (run_script_cb (this, &connection::script_node_up), false))
		1024	slog (L_WARN, _("node-up command execution failed, continuing."));
996		1025
997	break;	1026	break;
998	}	1027	}
999	else	1028	else
1000	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1029	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
…		…
1021	{	1050	{
1022	vpndata_packet p = (vpndata_packet )pkt;	1051	vpndata_packet p = (vpndata_packet )pkt;
1023		1052
1024	if (!p->hmac_chk (ictx))	1053	if (!p->hmac_chk (ictx))
1025	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1054	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026	"could be an attack, or just corruption or an synchronization error"),	1055	"could be an attack, or just corruption or a synchronization error"),
1027	conf->nodename, (const char *)rsi);	1056	conf->nodename, (const char *)rsi);
1028	else	1057	else
1029	{	1058	{
1030	u32 seqno;	1059	u32 seqno;
1031	tap_packet *d = p->unpack (this, seqno);	1060	tap_packet *d = p->unpack (this, seqno);
1032		1061
1033	if (iseqno.recv_ok (seqno))	1062	if (iseqno.recv_ok (seqno))
1034	{	1063	{
1035	vpn->tap->send (d);	1064	vpn->tap->send (d);
1036		1065
1037	if (p->dst () == 0) // re-broadcast
1038	for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1039	{
1040	connection c = i;
1041
1042	if (c->conf != THISNODE && c->conf != conf)
1043	c->inject_data_packet (d);
1044	}
1045
1046	if (si != rsi)	1066	if (si != rsi)
1047	{	1067	{
1048	// fast re-sync on connection changes, useful especially for tcp/ip	1068	// fast re-sync on connection changes, useful especially for tcp/ip
1049	si = rsi;	1069	si = rsi;
1050		1070
1051	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1071	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1052	conf->nodename, (const char )si, (const char )rsi);	1072	conf->nodename, (const char )si, (const char )rsi);
1053	}	1073	}
1054
1055	delete d;
1056
1057	break;
1058	}	1074	}
		1075
		1076	delete d;
		1077	break;
1059	}	1078	}
1060	}	1079	}
1061		1080
1062	send_reset (rsi);	1081	send_reset (rsi);
1063	break;	1082	break;
…		…
1088	break;	1107	break;
1089		1108
1090	case vpn_packet::PT_CONNECT_INFO:	1109	case vpn_packet::PT_CONNECT_INFO:
1091	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1110	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1092	{	1111	{
1093	connect_info_packet p = (connect_info_packet ) pkt;	1112	connect_info_packet p = (connect_info_packet )pkt;
1094		1113
1095	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1114	if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1096		1115	{
1097	connection *c = vpn->conns[p->id - 1];	1116	connection *c = vpn->conns[p->id - 1];
1098		1117
1099	c->conf->protocols = p->protocols;	1118	c->conf->protocols = p->protocols;
1100	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1119	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1101	p->si.upgrade_protocol (protocol, c->conf);	1120	p->si.upgrade_protocol (protocol, c->conf);
1102		1121
1103	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1122	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1104	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1123	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1105		1124
1106	const sockinfo &dsi = forward_si (p->si);	1125	const sockinfo &dsi = forward_si (p->si);
1107		1126
1108	if (dsi.valid ())	1127	if (dsi.valid ())
1109	c->send_auth_request (dsi, true);	1128	c->send_auth_request (dsi, true);
		1129	}
1110	}	1130	}
1111		1131
1112	break;	1132	break;
1113		1133
1114	default:	1134	default:
…		…
1123	{	1143	{
1124	reset_connection ();	1144	reset_connection ();
1125	establish_connection ();	1145	establish_connection ();
1126	}	1146	}
1127	else if (NOW < last_activity + ::conf.keepalive)	1147	else if (NOW < last_activity + ::conf.keepalive)
1128	w.at = last_activity + ::conf.keepalive;	1148	w.start (last_activity + ::conf.keepalive);
1129	else if (conf->connectmode != conf_node::C_ONDEMAND	1149	else if (conf->connectmode != conf_node::C_ONDEMAND
1130	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1150	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1131	{	1151	{
1132	send_ping (si);	1152	send_ping (si);
1133	w.at = NOW + 5;	1153	w.start (NOW + 5);
1134	}	1154	}
1135	else if (NOW < last_activity + ::conf.keepalive + 10)	1155	else if (NOW < last_activity + ::conf.keepalive + 10)
1136	// hold ondemand connections implicitly a few seconds longer	1156	// hold ondemand connections implicitly a few seconds longer
1137	// should delete octx, though, or something like that ;)	1157	// should delete octx, though, or something like that ;)
1138	w.at = last_activity + ::conf.keepalive + 10;	1158	w.start (last_activity + ::conf.keepalive + 10);
1139	else	1159	else
1140	reset_connection ();	1160	reset_connection ();
1141	}	1161	}
1142		1162
1143	void connection::send_connect_request (int id)	1163	void connection::send_connect_request (int id)
…		…
1149	send_vpn_packet (p, si);	1169	send_vpn_packet (p, si);
1150		1170
1151	delete p;	1171	delete p;
1152	}	1172	}
1153		1173
		1174	void connection::script_init_env (const char *ext)
		1175	{
		1176	char *env;
		1177	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1178	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1179	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1180	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1181	conf->id & 0xff); putenv (env);
		1182	}
		1183
1154	void connection::script_node ()	1184	void connection::script_init_connect_env ()
1155	{	1185	{
1156	vpn->script_if_up ();	1186	vpn->script_init_env ();
1157		1187
1158	char *env;	1188	char *env;
1159	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1189	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1160	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1190	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1161	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1191	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1162	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1192	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1163	}	1193	}
1164		1194
1165	const char *connection::script_node_up ()	1195	const char *connection::script_node_up ()
1166	{	1196	{
1167	script_node ();	1197	script_init_connect_env ();
1168		1198
1169	putenv ("STATE=up");	1199	putenv ("STATE=up");
1170		1200
		1201	char *filename;
		1202	asprintf (&filename,
		1203	"%s/%s",
		1204	confbase,
1171	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1205	::conf.script_node_up ? ::conf.script_node_up : "node-up");
		1206
		1207	return filename;
1172	}	1208	}
1173		1209
1174	const char *connection::script_node_down ()	1210	const char *connection::script_node_down ()
1175	{	1211	{
1176	script_node ();	1212	script_init_connect_env ();
1177		1213
1178	putenv ("STATE=down");	1214	putenv ("STATE=down");
1179		1215
1180	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1216	char *filename;
1181	}	1217	asprintf (&filename,
		1218	"%s/%s",
		1219	confbase,
		1220	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1182		1221
		1222	return filename;
		1223	}
		1224
1183	connection::connection(struct vpn *vpn_)	1225	connection::connection (struct vpn vpn, conf_node conf)
1184	: vpn(vpn_)	1226	: vpn(vpn), conf(conf)
1185	, rekey (this, &connection::rekey_cb)	1227	, rekey (this, &connection::rekey_cb)
1186	, keepalive (this, &connection::keepalive_cb)	1228	, keepalive (this, &connection::keepalive_cb)
1187	, establish_connection (this, &connection::establish_connection_cb)	1229	, establish_connection (this, &connection::establish_connection_cb)
		1230	#if ENABLE_DNS
		1231	, dns (0)
		1232	#endif
1188	{	1233	{
1189	octx = ictx = 0;	1234	octx = ictx = 0;
1190	retry_cnt = 0;	1235	retry_cnt = 0;
1191		1236
		1237	if (!conf->protocols) // make sure some protocol is enabled
		1238	conf->protocols = PROT_UDPv4;
		1239
1192	connectmode = conf_node::C_ALWAYS; // initial setting	1240	connectmode = conf_node::C_ALWAYS; // initial setting
1193	reset_connection ();	1241	reset_connection ();
1194	}	1242	}
1195		1243
1196	connection::~connection ()	1244	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.17 by pcg, Mon Sep 1 21:23:35 2003 UTC vs. Revision 1.54 by pcg, Tue Apr 19 03:22:46 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.17 by pcg, Mon Sep 1 21:23:35 2003 UTC vs.
Revision 1.54 by pcg, Tue Apr 19 03:22:46 2005 UTC