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

Comparing gvpe/src/connection.C (file contents):
Revision 1.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs.
Revision 1.59 by pcg, Mon Dec 5 12:58:09 2005 UTC

…		…
1	/*	1	/*
2	connection.C -- manage a single connection	2	connection.C -- manage a single connection
3	Copyright (C) 2003 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 <list>	24	#include <list>
27		25
28	#include <openssl/rand.h>	26	#include <openssl/rand.h>
29	#include <openssl/evp.h>	27	#include <openssl/evp.h>
30	#include <openssl/rsa.h>	28	#include <openssl/rsa.h>
31	#include <openssl/err.h>	29	#include <openssl/err.h>
32
33	#include "gettext.h"
34		30
35	#include "conf.h"	31	#include "conf.h"
36	#include "slog.h"	32	#include "slog.h"
37	#include "device.h"	33	#include "device.h"
38	#include "vpn.h"	34	#include "vpn.h"
44	# define RAND_pseudo_bytes RAND_bytes	40	# define RAND_pseudo_bytes RAND_bytes
45	#endif	41	#endif
46		42
47	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic	43	#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48		44
		45	#define ULTRA_FAST 1
		46	#define HLOG 15
		47	#include "lzf/lzf.h"
		48	#include "lzf/lzf_c.c"
		49	#include "lzf/lzf_d.c"
		50
49	struct crypto_ctx	51	struct crypto_ctx
50	{	52	{
51	EVP_CIPHER_CTX cctx;	53	EVP_CIPHER_CTX cctx;
52	HMAC_CTX hctx;	54	HMAC_CTX hctx;
53		55
…		…
56	};	58	};
57		59
58	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)	60	crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59	{	61	{
60	EVP_CIPHER_CTX_init (&cctx);	62	EVP_CIPHER_CTX_init (&cctx);
61	EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);	63	require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62	HMAC_CTX_init (&hctx);	64	HMAC_CTX_init (&hctx);
63	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);	65	HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64	}	66	}
65		67
66	crypto_ctx::~crypto_ctx ()	68	crypto_ctx::~crypto_ctx ()
67	{	69	{
68	EVP_CIPHER_CTX_cleanup (&cctx);	70	require (EVP_CIPHER_CTX_cleanup (&cctx));
69	HMAC_CTX_cleanup (&hctx);	71	HMAC_CTX_cleanup (&hctx);
70	}	72	}
71		73
72	static void	74	static void
73	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)	75	rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74	{	76	{
75	EVP_MD_CTX ctx;	77	EVP_MD_CTX ctx;
76		78
77	EVP_MD_CTX_init (&ctx);	79	EVP_MD_CTX_init (&ctx);
78	EVP_DigestInit (&ctx, RSA_HASH);	80	require (EVP_DigestInit (&ctx, RSA_HASH));
79	EVP_DigestUpdate(&ctx, &chg, sizeof chg);	81	require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80	EVP_DigestUpdate(&ctx, &id, sizeof id);	82	require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81	EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);	83	require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82	EVP_MD_CTX_cleanup (&ctx);	84	EVP_MD_CTX_cleanup (&ctx);
83	}	85	}
84		86
85	struct rsa_entry {	87	struct rsa_entry {
86	tstamp expire;	88	tstamp expire;
…		…
91	struct rsa_cache : list<rsa_entry>	93	struct rsa_cache : list<rsa_entry>
92	{	94	{
93	void cleaner_cb (time_watcher &w); time_watcher cleaner;	95	void cleaner_cb (time_watcher &w); time_watcher cleaner;
94		96
95	bool find (const rsaid &id, rsachallenge &chg)	97	bool find (const rsaid &id, rsachallenge &chg)
96	{	98	{
97	for (iterator i = begin (); i != end (); ++i)	99	for (iterator i = begin (); i != end (); ++i)
98	{	100	{
99	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)	101	if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
100	{	102	{
101	memcpy (&chg, &i->chg, sizeof chg);	103	memcpy (&chg, &i->chg, sizeof chg);
102		104
103	erase (i);	105	erase (i);
104	return true;	106	return true;
105	}	107	}
106	}	108	}
107		109
108	if (cleaner.at < NOW)	110	if (cleaner.at < NOW)
109	cleaner.start (NOW + RSA_TTL);	111	cleaner.start (NOW + RSA_TTL);
110		112
111	return false;	113	return false;
112	}	114	}
113		115
114	void gen (rsaid &id, rsachallenge &chg)	116	void gen (rsaid &id, rsachallenge &chg)
115	{	117	{
116	rsa_entry e;	118	rsa_entry e;
117		119
118	RAND_bytes ((unsigned char *)&id, sizeof id);	120	RAND_bytes ((unsigned char *)&id, sizeof id);
119	RAND_bytes ((unsigned char *)&chg, sizeof chg);	121	RAND_bytes ((unsigned char *)&chg, sizeof chg);
120		122
121	e.expire = NOW + RSA_TTL;	123	e.expire = NOW + RSA_TTL;
122	e.id = id;	124	e.id = id;
123	memcpy (&e.chg, &chg, sizeof chg);	125	memcpy (&e.chg, &chg, sizeof chg);
124		126
125	push_back (e);	127	push_back (e);
126		128
127	if (cleaner.at < NOW)	129	if (cleaner.at < NOW)
128	cleaner.start (NOW + RSA_TTL);	130	cleaner.start (NOW + RSA_TTL);
129	}	131	}
130		132
131	rsa_cache ()	133	rsa_cache ()
132	: cleaner (this, &rsa_cache::cleaner_cb)	134	: cleaner (this, &rsa_cache::cleaner_cb)
133	{ }	135	{ }
134		136
135	} rsa_cache;	137	} rsa_cache;
136		138
137	void rsa_cache::cleaner_cb (time_watcher &w)	139	void rsa_cache::cleaner_cb (time_watcher &w)
138	{	140	{
139	if (empty ())	141	if (!empty ())
140	w.at = TSTAMP_CANCEL;
141	else
142	{	142	{
143	w.at = NOW + RSA_TTL;	143	w.start (NOW + RSA_TTL);
144		144
145	for (iterator i = begin (); i != end (); )	145	for (iterator i = begin (); i != end (); )
146	if (i->expire <= NOW)	146	if (i->expire <= NOW)
147	i = erase (i);	147	i = erase (i);
148	else	148	else
…		…
200	// only do action once every x seconds per host whole allowing bursts.	200	// only do action once every x seconds per host whole allowing bursts.
201	// this implementation ("splay list" ;) is inefficient,	201	// this implementation ("splay list" ;) is inefficient,
202	// but low on resources.	202	// but low on resources.
203	struct net_rate_limiter : list<net_rateinfo>	203	struct net_rate_limiter : list<net_rateinfo>
204	{	204	{
205	static const double ALPHA = 1. - 1. / 600.; // allow bursts	205	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206	static const double CUTOFF = 10.; // one event every CUTOFF seconds	206	# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207	static const double EXPIRE = CUTOFF * 30.; // expire entries after this time	207	# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208	static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value	208	# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
209		209
210	bool can (const sockinfo &si) { return can((u32)si.host); }	210	bool can (const sockinfo &si) { return can((u32)si.host); }
211	bool can (u32 host);	211	bool can (u32 host);
212	};	212	};
213		213
…		…
218	iterator i;	218	iterator i;
219		219
220	for (i = begin (); i != end (); )	220	for (i = begin (); i != end (); )
221	if (i->host == host)	221	if (i->host == host)
222	break;	222	break;
223	else if (i->last < NOW - EXPIRE)	223	else if (i->last < NOW - NRL_EXPIRE)
224	i = erase (i);	224	i = erase (i);
225	else	225	else
226	i++;	226	i++;
227		227
228	if (i == end ())	228	if (i == end ())
229	{	229	{
230	net_rateinfo ri;	230	net_rateinfo ri;
231		231
232	ri.host = host;	232	ri.host = host;
233	ri.pcnt = 1.;	233	ri.pcnt = 1.;
234	ri.diff = MAXDIF;	234	ri.diff = NRL_MAXDIF;
235	ri.last = NOW;	235	ri.last = NOW;
236		236
237	push_front (ri);	237	push_front (ri);
238		238
239	return true;	239	return true;
…		…
241	else	241	else
242	{	242	{
243	net_rateinfo ri (*i);	243	net_rateinfo ri (*i);
244	erase (i);	244	erase (i);
245		245
246	ri.pcnt = ri.pcnt * ALPHA;	246	ri.pcnt = ri.pcnt * NRL_ALPHA;
247	ri.diff = ri.diff * ALPHA + (NOW - ri.last);	247	ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
248		248
249	ri.last = NOW;	249	ri.last = NOW;
250		250
251	double dif = ri.diff / ri.pcnt;	251	double dif = ri.diff / ri.pcnt;
252		252
253	bool send = dif > CUTOFF;	253	bool send = dif > NRL_CUTOFF;
254		254
255	if (dif > MAXDIF)	255	if (dif > NRL_MAXDIF)
256	{	256	{
257	ri.pcnt = 1.;	257	ri.pcnt = 1.;
258	ri.diff = MAXDIF;	258	ri.diff = NRL_MAXDIF;
259	}	259	}
260	else if (send)	260	else if (send)
261	ri.pcnt++;	261	ri.pcnt++;
262		262
263	push_front (ri);	263	push_front (ri);
…		…
310	}	310	}
311		311
312	#define MAXVPNDATA (MAX_MTU - 6 - 6)	312	#define MAXVPNDATA (MAX_MTU - 6 - 6)
313	#define DATAHDR (sizeof (u32) + RAND_SIZE)	313	#define DATAHDR (sizeof (u32) + RAND_SIZE)
314		314
315	struct vpndata_packet:vpn_packet	315	struct vpndata_packet : vpn_packet
316	{	316	{
317	u8 data[MAXVPNDATA + DATAHDR]; // seqno	317	u8 data[MAXVPNDATA + DATAHDR]; // seqno
318		318
319	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);	319	void setup (connection conn, int dst, u8 d, u32 len, u32 seqno);
320	tap_packet unpack (connection conn, u32 &seqno);	320	tap_packet unpack (connection conn, u32 &seqno);
…		…
333	int outl = 0, outl2;	333	int outl = 0, outl2;
334	ptype type = PT_DATA_UNCOMPRESSED;	334	ptype type = PT_DATA_UNCOMPRESSED;
335		335
336	#if ENABLE_COMPRESSION	336	#if ENABLE_COMPRESSION
337	u8 cdata[MAX_MTU];	337	u8 cdata[MAX_MTU];
338	u32 cl;
339		338
		339	if (conn->features & ENABLE_COMPRESSION)
		340	{
340	cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);	341	u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
		342
341	if (cl)	343	if (cl)
342	{	344	{
343	type = PT_DATA_COMPRESSED;	345	type = PT_DATA_COMPRESSED;
344	d = cdata;	346	d = cdata;
345	l = cl + 2;	347	l = cl + 2;
346		348
347	d[0] = cl >> 8;	349	d[0] = cl >> 8;
348	d[1] = cl;	350	d[1] = cl;
		351	}
349	}	352	}
350	#endif	353	#endif
351		354
352	EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);	355	require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353		356
354	struct {	357	struct {
355	#if RAND_SIZE	358	#if RAND_SIZE
356	u8 rnd[RAND_SIZE];	359	u8 rnd[RAND_SIZE];
357	#endif	360	#endif
…		…
361	datahdr.seqno = ntohl (seqno);	364	datahdr.seqno = ntohl (seqno);
362	#if RAND_SIZE	365	#if RAND_SIZE
363	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);	366	RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364	#endif	367	#endif
365		368
366	EVP_EncryptUpdate (cctx,	369	require (EVP_EncryptUpdate (cctx,
367	(unsigned char *) data + outl, &outl2,	370	(unsigned char *) data + outl, &outl2,
368	(unsigned char *) &datahdr, DATAHDR);	371	(unsigned char *) &datahdr, DATAHDR));
369	outl += outl2;	372	outl += outl2;
370		373
371	EVP_EncryptUpdate (cctx,	374	require (EVP_EncryptUpdate (cctx,
372	(unsigned char *) data + outl, &outl2,	375	(unsigned char *) data + outl, &outl2,
373	(unsigned char *) d, l);	376	(unsigned char *) d, l));
374	outl += outl2;	377	outl += outl2;
375		378
376	EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);	379	require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377	outl += outl2;	380	outl += outl2;
378		381
379	len = outl + data_hdr_size ();	382	len = outl + data_hdr_size ();
380		383
381	set_hdr (type, dst);	384	set_hdr (type, dst);
…		…
390	int outl = 0, outl2;	393	int outl = 0, outl2;
391	tap_packet *p = new tap_packet;	394	tap_packet *p = new tap_packet;
392	u8 *d;	395	u8 *d;
393	u32 l = len - data_hdr_size ();	396	u32 l = len - data_hdr_size ();
394		397
395	EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);	398	require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396		399
397	#if ENABLE_COMPRESSION	400	#if ENABLE_COMPRESSION
398	u8 cdata[MAX_MTU];	401	u8 cdata[MAX_MTU];
399		402
400	if (type == PT_DATA_COMPRESSED)	403	if (type == PT_DATA_COMPRESSED)
…		…
402	else	405	else
403	#endif	406	#endif
404	d = &(*p)[6 + 6 - DATAHDR];	407	d = &(*p)[6 + 6 - DATAHDR];
405		408
406	/* this overwrites part of the src mac, but we fix that later */	409	/* this overwrites part of the src mac, but we fix that later */
407	EVP_DecryptUpdate (cctx,	410	require (EVP_DecryptUpdate (cctx,
408	d, &outl2,	411	d, &outl2,
409	(unsigned char *)&data, len - data_hdr_size ());	412	(unsigned char *)&data, len - data_hdr_size ()));
410	outl += outl2;	413	outl += outl2;
411		414
412	EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);	415	require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413	outl += outl2;	416	outl += outl2;
414		417
415	seqno = ntohl ((u32 )(d + RAND_SIZE));	418	seqno = ntohl ((u32 )(d + RAND_SIZE));
416		419
417	id2mac (dst () ? dst() : THISNODE->id, p->dst);	420	id2mac (dst () ? dst() : THISNODE->id, p->dst);
…		…
446	{	449	{
447	// actually, hmaclen cannot be checked because the hmac	450	// actually, hmaclen cannot be checked because the hmac
448	// field comes before this data, so peers with other	451	// field comes before this data, so peers with other
449	// hmacs simply will not work.	452	// hmacs simply will not work.
450	u8 prot_major, prot_minor, randsize, hmaclen;	453	u8 prot_major, prot_minor, randsize, hmaclen;
451	u8 flags, challengelen, pad2, pad3;	454	u8 flags, challengelen, features, pad3;
452	u32 cipher_nid, digest_nid, hmac_nid;	455	u32 cipher_nid, digest_nid, hmac_nid;
453
454	const u8 curflags () const
455	{
456	return 0x80
457	\| (ENABLE_COMPRESSION ? 0x01 : 0x00);
458	}
459		456
460	void setup (ptype type, int dst);	457	void setup (ptype type, int dst);
461	bool chk_config () const;	458	bool chk_config () const;
		459
		460	static u8 get_features ()
		461	{
		462	u8 f = 0;
		463	#if ENABLE_COMPRESSION
		464	f \|= FEATURE_COMPRESSION;
		465	#endif
		466	#if ENABLE_ROHC
		467	f \|= FEATURE_ROHC;
		468	#endif
		469	#if ENABLE_BRIDGING
		470	f \|= FEATURE_BRIDGING;
		471	#endif
		472	return f;
		473	}
462	};	474	};
463		475
464	void config_packet::setup (ptype type, int dst)	476	void config_packet::setup (ptype type, int dst)
465	{	477	{
466	prot_major = PROTOCOL_MAJOR;	478	prot_major = PROTOCOL_MAJOR;
467	prot_minor = PROTOCOL_MINOR;	479	prot_minor = PROTOCOL_MINOR;
468	randsize = RAND_SIZE;	480	randsize = RAND_SIZE;
469	hmaclen = HMACLENGTH;	481	hmaclen = HMACLENGTH;
470	flags = curflags ();	482	flags = 0;
471	challengelen = sizeof (rsachallenge);	483	challengelen = sizeof (rsachallenge);
		484	features = get_features ();
472		485
473	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));	486	cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474	digest_nid = htonl (EVP_MD_type (RSA_HASH));	487	digest_nid = htonl (EVP_MD_type (RSA_HASH));
475	hmac_nid = htonl (EVP_MD_type (DIGEST));	488	hmac_nid = htonl (EVP_MD_type (DIGEST));
476		489
…		…
484	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);	497	slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485	else if (randsize != RAND_SIZE)	498	else if (randsize != RAND_SIZE)
486	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);	499	slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487	else if (hmaclen != HMACLENGTH)	500	else if (hmaclen != HMACLENGTH)
488	slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);	501	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))	502	else if (challengelen != sizeof (rsachallenge))
492	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));	503	slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493	else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))	504	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));	505	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)))	506	else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
…		…
504		515
505	struct auth_req_packet : config_packet	516	struct auth_req_packet : config_packet
506	{	517	{
507	char magic[8];	518	char magic[8];
508	u8 initiate; // false if this is just an automatic reply	519	u8 initiate; // false if this is just an automatic reply
509	u8 protocols; // supported protocols (will get patches on forward)	520	u8 protocols; // supported protocols (will be patched on forward)
510	u8 pad2, pad3;	521	u8 pad2, pad3;
511	rsaid id;	522	rsaid id;
512	rsaencrdata encr;	523	rsaencrdata encr;
513		524
514	auth_req_packet (int dst, bool initiate_, u8 protocols_)	525	auth_req_packet (int dst, bool initiate_, u8 protocols_)
…		…
575	{	586	{
576	if (ictx && octx)	587	if (ictx && octx)
577	{	588	{
578	connectmode = conf->connectmode;	589	connectmode = conf->connectmode;
579		590
		591	// make sure rekeying timeouts are slightly asymmetric
580	rekey.start (NOW + ::conf.rekey);	592	rekey.start (NOW + ::conf.rekey
		593	+ (conf->id > THISNODE->id ? 10 : 0));
581	keepalive.start (NOW + ::conf.keepalive);	594	keepalive.start (NOW + ::conf.keepalive);
582		595
583	// send queued packets	596	// send queued packets
584	if (ictx && octx)	597	if (ictx && octx)
585	{	598	{
…		…
598	}	611	}
599	else	612	else
600	{	613	{
601	retry_cnt = 0;	614	retry_cnt = 0;
602	establish_connection.start (NOW + 5);	615	establish_connection.start (NOW + 5);
603	keepalive.reset ();	616	keepalive.stop ();
604	rekey.reset ();	617	rekey.stop ();
605	}	618	}
606	}	619	}
607		620
608	void	621	void
609	connection::reset_si ()	622	connection::reset_si ()
…		…
611	protocol = best_protocol (THISNODE->protocols & conf->protocols);	624	protocol = best_protocol (THISNODE->protocols & conf->protocols);
612		625
613	// mask out protocols we cannot establish	626	// mask out protocols we cannot establish
614	if (!conf->udp_port) protocol &= ~PROT_UDPv4;	627	if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;	628	if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
		629	if (!conf->dns_port) protocol &= ~PROT_DNSv4;
		630
		631	if (protocol
		632	&& (!conf->can_direct (THISNODE)
		633	\|\| !THISNODE->can_direct (conf)))
		634	{
		635	slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
		636	protocol = 0;
		637	}
616		638
617	si.set (conf, protocol);	639	si.set (conf, protocol);
618	}	640	}
619		641
620	// ensure sockinfo is valid, forward if necessary	642	// ensure sockinfo is valid, forward if necessary
…		…
625	{	647	{
626	connection *r = vpn->find_router ();	648	connection *r = vpn->find_router ();
627		649
628	if (r)	650	if (r)
629	{	651	{
630	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),	652	slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631	conf->nodename, r->conf->nodename);	653	conf->nodename, r->conf->nodename, (const char *)r->si);
632	return r->si;	654	return r->si;
633	}	655	}
634	else	656	else
635	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),	657	slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636	conf->nodename);	658	conf->nodename);
…		…
675	connection::send_auth_request (const sockinfo &si, bool initiate)	697	connection::send_auth_request (const sockinfo &si, bool initiate)
676	{	698	{
677	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	699	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678		700
679	rsachallenge chg;	701	rsachallenge chg;
680
681	rsa_cache.gen (pkt->id, chg);	702	rsa_cache.gen (pkt->id, chg);
682		703	rsa_encrypt (conf->rsa_key, chg, pkt->encr);
683	if (0 > RSA_public_encrypt (sizeof chg,
684	(unsigned char )&chg, (unsigned char )&pkt->encr,
685	conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686	fatal ("RSA_public_encrypt error");
687		704
688	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	705	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
689		706
690	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	707	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
691		708
…		…
711	}	728	}
712		729
713	void	730	void
714	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)	731	connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
715	{	732	{
716	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",	733	slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
717	conf->id, rid, (const char *)rsi);	734	conf->id, rid, (const char *)rsi);
718		735
719	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	736	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
720		737
721	r->hmac_set (octx);	738	r->hmac_set (octx);
…		…
725	}	742	}
726		743
727	void	744	void
728	connection::establish_connection_cb (time_watcher &w)	745	connection::establish_connection_cb (time_watcher &w)
729	{	746	{
730	if (ictx \|\| conf == THISNODE	747	if (!ictx
		748	&& conf != THISNODE
731	\|\| connectmode == conf_node::C_NEVER	749	&& connectmode != conf_node::C_NEVER
732	\|\| connectmode == conf_node::C_DISABLED)	750	&& connectmode != conf_node::C_DISABLED
733	w.at = TSTAMP_CANCEL;	751	&& NOW > w.at)
734	else if (w.at <= NOW)
735	{	752	{
736	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	753	w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
737		754
738	if (retry_int < 3600 * 8)	755	double retry_int = double (retry_cnt & 3
739	retry_cnt++;	756	? (retry_cnt & 3) + 1
740		757	: 1 << (retry_cnt >> 2));
741	w.at = NOW + retry_int;
742		758
743	reset_si ();	759	reset_si ();
		760
		761	bool slow = si.prot & PROT_SLOW;
744		762
745	if (si.prot && !si.host)	763	if (si.prot && !si.host)
746	vpn->send_connect_request (conf->id);	764	vpn->send_connect_request (conf->id);
747	else	765	else
748	{	766	{
749	const sockinfo &dsi = forward_si (si);	767	const sockinfo &dsi = forward_si (si);
		768
		769	slow = slow \|\| (dsi.prot & PROT_SLOW);
750		770
751	if (dsi.valid () && auth_rate_limiter.can (dsi))	771	if (dsi.valid () && auth_rate_limiter.can (dsi))
752	{	772	{
753	if (retry_cnt < 4)	773	if (retry_cnt < 4)
754	send_auth_request (dsi, true);	774	send_auth_request (dsi, true);
755	else	775	else
756	send_ping (dsi, 0);	776	send_ping (dsi, 0);
757	}	777	}
758	}	778	}
		779
		780	retry_int *= slow ? 8. : 0.7;
		781
		782	if (retry_int < conf->max_retry)
		783	retry_cnt++;
		784	else
		785	retry_int = conf->max_retry;
		786
		787	w.start (NOW + retry_int);
759	}	788	}
760	}	789	}
761		790
762	void	791	void
763	connection::reset_connection ()	792	connection::reset_connection ()
…		…
766	{	795	{
767	slog (L_INFO, _("%s(%s): connection lost"),	796	slog (L_INFO, _("%s(%s): connection lost"),
768	conf->nodename, (const char *)si);	797	conf->nodename, (const char *)si);
769		798
770	if (::conf.script_node_down)	799	if (::conf.script_node_down)
771	run_script (run_script_cb (this, &connection::script_node_down), false);	800	if (!run_script (run_script_cb (this, &connection::script_node_down), false))
		801	slog (L_WARN, _("node-down command execution failed, continuing."));
772	}	802	}
773		803
774	delete ictx; ictx = 0;	804	delete ictx; ictx = 0;
775	delete octx; octx = 0;	805	delete octx; octx = 0;
		806	#if ENABLE_DNS
		807	dnsv4_reset_connection ();
		808	#endif
776		809
777	si.host= 0;	810	si.host = 0;
778		811
779	last_activity = 0;	812	last_activity = 0;
780	retry_cnt = 0;	813	retry_cnt = 0;
781		814
782	rekey.reset ();	815	rekey.stop ();
783	keepalive.reset ();	816	keepalive.stop ();
784	establish_connection.reset ();	817	establish_connection.stop ();
785	}	818	}
786		819
787	void	820	void
788	connection::shutdown ()	821	connection::shutdown ()
789	{	822	{
…		…
794	}	827	}
795		828
796	void	829	void
797	connection::rekey_cb (time_watcher &w)	830	connection::rekey_cb (time_watcher &w)
798	{	831	{
799	w.at = TSTAMP_CANCEL;
800
801	reset_connection ();	832	reset_connection ();
802	establish_connection ();	833	establish_connection ();
803	}	834	}
804		835
805	void	836	void
…		…
826	{	857	{
827	if (ictx && octx)	858	if (ictx && octx)
828	send_data_packet (pkt);	859	send_data_packet (pkt);
829	else	860	else
830	{	861	{
831	if (!broadcast)//DDDD	862	if (!broadcast)
832	data_queue.put (new tap_packet (*pkt));	863	data_queue.put (new tap_packet (*pkt));
833		864
834	establish_connection ();	865	establish_connection ();
835	}	866	}
836	}	867	}
…		…
839	{	870	{
840	if (ictx && octx)	871	if (ictx && octx)
841	send_vpn_packet (pkt, si, tos);	872	send_vpn_packet (pkt, si, tos);
842	else	873	else
843	{	874	{
844	vpn_queue.put (new vpn_packet (*pkt));	875	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
845		876
846	establish_connection ();	877	establish_connection ();
847	}	878	}
848	}	879	}
849		880
…		…
908	if (p->initiate)	939	if (p->initiate)
909	send_auth_request (rsi, false);	940	send_auth_request (rsi, false);
910		941
911	rsachallenge k;	942	rsachallenge k;
912		943
913	if (0 > RSA_private_decrypt (sizeof (p->encr),	944	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914	(unsigned char )&p->encr, (unsigned char )&k,
915	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916	{	945	{
917	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),	946	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
918	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));	947	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
919	break;	948	break;
920	}	949	}
…		…
924		953
925	octx = new crypto_ctx (k, 1);	954	octx = new crypto_ctx (k, 1);
926	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	955	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
927		956
928	conf->protocols = p->protocols;	957	conf->protocols = p->protocols;
		958	features = p->features & config_packet::get_features ();
929		959
930	send_auth_response (rsi, p->id, k);	960	send_auth_response (rsi, p->id, k);
931		961
932	connection_established ();	962	connection_established ();
933		963
…		…
969	crypto_ctx *cctx = new crypto_ctx (chg, 0);	999	crypto_ctx *cctx = new crypto_ctx (chg, 0);
970		1000
971	if (!p->hmac_chk (cctx))	1001	if (!p->hmac_chk (cctx))
972	{	1002	{
973	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1003	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
974	"could be an attack, or just corruption or an synchronization error"),	1004	"could be an attack, or just corruption or a synchronization error"),
975	conf->nodename, (const char *)rsi);	1005	conf->nodename, (const char *)rsi);
976	break;	1006	break;
977	}	1007	}
978	else	1008	else
979	{	1009	{
…		…
997	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),	1027	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
998	conf->nodename, (const char *)rsi,	1028	conf->nodename, (const char *)rsi,
999	p->prot_major, p->prot_minor);	1029	p->prot_major, p->prot_minor);
1000		1030
1001	if (::conf.script_node_up)	1031	if (::conf.script_node_up)
1002	run_script (run_script_cb (this, &connection::script_node_up), false);	1032	if (!run_script (run_script_cb (this, &connection::script_node_up), false))
		1033	slog (L_WARN, _("node-up command execution failed, continuing."));
1003		1034
1004	break;	1035	break;
1005	}	1036	}
1006	else	1037	else
1007	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),	1038	slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
…		…
1028	{	1059	{
1029	vpndata_packet p = (vpndata_packet )pkt;	1060	vpndata_packet p = (vpndata_packet )pkt;
1030		1061
1031	if (!p->hmac_chk (ictx))	1062	if (!p->hmac_chk (ictx))
1032	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"	1063	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1033	"could be an attack, or just corruption or an synchronization error"),	1064	"could be an attack, or just corruption or a synchronization error"),
1034	conf->nodename, (const char *)rsi);	1065	conf->nodename, (const char *)rsi);
1035	else	1066	else
1036	{	1067	{
1037	u32 seqno;	1068	u32 seqno;
1038	tap_packet *d = p->unpack (this, seqno);	1069	tap_packet *d = p->unpack (this, seqno);
…		…
1041	{	1072	{
1042	vpn->tap->send (d);	1073	vpn->tap->send (d);
1043		1074
1044	if (si != rsi)	1075	if (si != rsi)
1045	{	1076	{
1046	// fast re-sync on connection changes, useful especially for tcp/ip	1077	// fast re-sync on source address changes, useful especially for tcp/ip
1047	si = rsi;	1078	si = rsi;
1048		1079
1049	slog (L_INFO, _("%s(%s): socket address changed to %s"),	1080	slog (L_INFO, _("%s(%s): socket address changed to %s"),
1050	conf->nodename, (const char )si, (const char )rsi);	1081	conf->nodename, (const char )si, (const char )rsi);
1051	}	1082	}
1052
1053	delete d;
1054
1055	break;
1056	}	1083	}
		1084
		1085	delete d;
		1086	break;
1057	}	1087	}
1058	}	1088	}
1059		1089
1060	send_reset (rsi);	1090	send_reset (rsi);
1061	break;	1091	break;
…		…
1063	case vpn_packet::PT_CONNECT_REQ:	1093	case vpn_packet::PT_CONNECT_REQ:
1064	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1094	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1065	{	1095	{
1066	connect_req_packet p = (connect_req_packet ) pkt;	1096	connect_req_packet p = (connect_req_packet ) pkt;
1067		1097
1068	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1098	if (p->id > 0 && p->id <= vpn->conns.size ())
1069	connection *c = vpn->conns[p->id - 1];
1070	conf->protocols = p->protocols;
1071
1072	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1073	conf->id, p->id, c->ictx && c->octx);
1074
1075	if (c->ictx && c->octx)
1076	{	1099	{
		1100	connection *c = vpn->conns[p->id - 1];
		1101	conf->protocols = p->protocols;
		1102
		1103	slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
		1104	conf->id, p->id, c->ictx && c->octx);
		1105
		1106	if (c->ictx && c->octx)
		1107	{
1077	// send connect_info packets to both sides, in case one is	1108	// send connect_info packets to both sides, in case one is
1078	// behind a nat firewall (or both ;)	1109	// behind a nat firewall (or both ;)
1079	c->send_connect_info (conf->id, si, conf->protocols);	1110	c->send_connect_info (conf->id, si, conf->protocols);
1080	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1111	send_connect_info (c->conf->id, c->si, c->conf->protocols);
		1112	}
		1113	else
		1114	c->establish_connection ();
1081	}	1115	}
1082	else	1116	else
1083	c->establish_connection ();	1117	slog (L_WARN,
		1118	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1119	p->id);
1084	}	1120	}
1085		1121
1086	break;	1122	break;
1087		1123
1088	case vpn_packet::PT_CONNECT_INFO:	1124	case vpn_packet::PT_CONNECT_INFO:
1089	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1125	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1090	{	1126	{
1091	connect_info_packet p = (connect_info_packet ) pkt;	1127	connect_info_packet p = (connect_info_packet )pkt;
1092		1128
1093	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1129	if (p->id > 0 && p->id <= vpn->conns.size ())
1094		1130	{
1095	connection *c = vpn->conns[p->id - 1];	1131	connection *c = vpn->conns[p->id - 1];
1096		1132
1097	c->conf->protocols = p->protocols;	1133	c->conf->protocols = p->protocols;
1098	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1134	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1099	p->si.upgrade_protocol (protocol, c->conf);	1135	p->si.upgrade_protocol (protocol, c->conf);
1100		1136
1101	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1137	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1102	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1138	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1103		1139
1104	const sockinfo &dsi = forward_si (p->si);	1140	const sockinfo &dsi = forward_si (p->si);
1105		1141
1106	if (dsi.valid ())	1142	if (dsi.valid ())
1107	c->send_auth_request (dsi, true);	1143	c->send_auth_request (dsi, true);
		1144	}
		1145	else
		1146	slog (L_WARN,
		1147	_("received authenticated connection request from unknown node #%d, config file mismatch?"),
		1148	p->id);
1108	}	1149	}
1109		1150
1110	break;	1151	break;
1111		1152
1112	default:	1153	default:
…		…
1121	{	1162	{
1122	reset_connection ();	1163	reset_connection ();
1123	establish_connection ();	1164	establish_connection ();
1124	}	1165	}
1125	else if (NOW < last_activity + ::conf.keepalive)	1166	else if (NOW < last_activity + ::conf.keepalive)
1126	w.at = last_activity + ::conf.keepalive;	1167	w.start (last_activity + ::conf.keepalive);
1127	else if (conf->connectmode != conf_node::C_ONDEMAND	1168	else if (conf->connectmode != conf_node::C_ONDEMAND
1128	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1169	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1129	{	1170	{
1130	send_ping (si);	1171	send_ping (si);
1131	w.at = NOW + 5;	1172	w.start (NOW + 5);
1132	}	1173	}
1133	else if (NOW < last_activity + ::conf.keepalive + 10)	1174	else if (NOW < last_activity + ::conf.keepalive + 10)
1134	// hold ondemand connections implicitly a few seconds longer	1175	// hold ondemand connections implicitly a few seconds longer
1135	// should delete octx, though, or something like that ;)	1176	// should delete octx, though, or something like that ;)
1136	w.at = last_activity + ::conf.keepalive + 10;	1177	w.start (last_activity + ::conf.keepalive + 10);
1137	else	1178	else
1138	reset_connection ();	1179	reset_connection ();
1139	}	1180	}
1140		1181
1141	void connection::send_connect_request (int id)	1182	void connection::send_connect_request (int id)
…		…
1147	send_vpn_packet (p, si);	1188	send_vpn_packet (p, si);
1148		1189
1149	delete p;	1190	delete p;
1150	}	1191	}
1151		1192
		1193	void connection::script_init_env (const char *ext)
		1194	{
		1195	char *env;
		1196	asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
		1197	asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
		1198	asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
		1199	0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
		1200	conf->id & 0xff); putenv (env);
		1201	}
		1202
1152	void connection::script_node ()	1203	void connection::script_init_connect_env ()
1153	{	1204	{
1154	vpn->script_if_up ();	1205	vpn->script_init_env ();
1155		1206
1156	char *env;	1207	char *env;
1157	asprintf (&env, "DESTID=%d", conf->id); putenv (env);	1208	asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1158	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);	1209	asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1159	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);	1210	asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1160	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);	1211	asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1161	}	1212	}
1162		1213
1163	const char *connection::script_node_up ()	1214	const char *connection::script_node_up ()
1164	{	1215	{
1165	script_node ();	1216	script_init_connect_env ();
1166		1217
1167	putenv ("STATE=up");	1218	putenv ("STATE=up");
1168		1219
		1220	char *filename;
		1221	asprintf (&filename,
		1222	"%s/%s",
		1223	confbase,
1169	return ::conf.script_node_up ? ::conf.script_node_up : "node-up";	1224	::conf.script_node_up ? ::conf.script_node_up : "node-up");
		1225
		1226	return filename;
1170	}	1227	}
1171		1228
1172	const char *connection::script_node_down ()	1229	const char *connection::script_node_down ()
1173	{	1230	{
1174	script_node ();	1231	script_init_connect_env ();
1175		1232
1176	putenv ("STATE=down");	1233	putenv ("STATE=down");
1177		1234
1178	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1235	char *filename;
1179	}	1236	asprintf (&filename,
		1237	"%s/%s",
		1238	confbase,
		1239	::conf.script_node_down ? ::conf.script_node_down : "node-down");
1180		1240
		1241	return filename;
		1242	}
		1243
1181	connection::connection(struct vpn *vpn_)	1244	connection::connection (struct vpn vpn, conf_node conf)
1182	: vpn(vpn_)	1245	: vpn(vpn), conf(conf)
1183	, rekey (this, &connection::rekey_cb)	1246	, rekey (this, &connection::rekey_cb)
1184	, keepalive (this, &connection::keepalive_cb)	1247	, keepalive (this, &connection::keepalive_cb)
1185	, establish_connection (this, &connection::establish_connection_cb)	1248	, establish_connection (this, &connection::establish_connection_cb)
		1249	#if ENABLE_DNS
		1250	, dns (0)
		1251	#endif
1186	{	1252	{
1187	octx = ictx = 0;	1253	octx = ictx = 0;
1188	retry_cnt = 0;	1254	retry_cnt = 0;
1189		1255
		1256	if (!conf->protocols) // make sure some protocol is enabled
		1257	conf->protocols = PROT_UDPv4;
		1258
1190	connectmode = conf_node::C_ALWAYS; // initial setting	1259	connectmode = conf_node::C_ALWAYS; // initial setting
1191	reset_connection ();	1260	reset_connection ();
1192	}	1261	}
1193		1262
1194	connection::~connection ()	1263	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs. Revision 1.59 by pcg, Mon Dec 5 12:58:09 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs.
Revision 1.59 by pcg, Mon Dec 5 12:58:09 2005 UTC