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

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

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.9 by pcg, Sun Apr 6 04:31:51 2003 UTC vs. Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.9 by pcg, Sun Apr 6 04:31:51 2003 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC