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

Comparing gvpe/src/connection.C (file contents):
Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.44 by pcg, Fri Mar 4 08:15:04 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
		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"
45		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;
…		…
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. / 90.; // allow bursts	209	# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203	static const double CUTOFF = 20.; // 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
…		…
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	bool ok;
		665
		666	switch (si.prot)
		667	{
		668	case PROT_IPv4:
		669	ok = vpn->send_ipv4_packet (pkt, si, tos); break;
		670	case PROT_UDPv4:
		671	ok = vpn->send_udpv4_packet (pkt, si, tos); break;
		672	#if ENABLE_TCP
		673	case PROT_TCPv4:
		674	ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
		675	#endif
		676	#if ENABLE_ICMP
		677	case PROT_ICMPv4:
		678	ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
		679	#endif
		680	#if ENABLE_DNS
		681	case PROT_DNSv4:
		682	ok = send_dnsv4_packet (pkt, si, tos); break;
		683	#endif
		684
		685	default:
		686	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		687	ok = false;
		688	}
		689
		690	if (!ok)
		691	reset_connection ();
		692	}
		693
		694	void
585	connection::send_ping (const sockinfo &si, u8 pong)	695	connection::send_ping (const sockinfo &si, u8 pong)
586	{	696	{
587	ping_packet *pkt = new ping_packet;	697	ping_packet *pkt = new ping_packet;
588		698
589	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);	699	pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
590	vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY);	700	send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
591		701
592	delete pkt;	702	delete pkt;
593	}	703	}
594		704
595	void	705	void
…		…
598	if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)	708	if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
599	{	709	{
600	config_packet *pkt = new config_packet;	710	config_packet *pkt = new config_packet;
601		711
602	pkt->setup (vpn_packet::PT_RESET, conf->id);	712	pkt->setup (vpn_packet::PT_RESET, conf->id);
603	vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST);	713	send_vpn_packet (pkt, si, IPTOS_MINCOST);
604		714
605	delete pkt;	715	delete pkt;
606	}	716	}
607	}	717	}
608		718
…		…
610	connection::send_auth_request (const sockinfo &si, bool initiate)	720	connection::send_auth_request (const sockinfo &si, bool initiate)
611	{	721	{
612	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);	722	auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
613		723
614	rsachallenge chg;	724	rsachallenge chg;
615
616	rsa_cache.gen (pkt->id, chg);	725	rsa_cache.gen (pkt->id, chg);
617		726	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		727
623	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);	728	slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
624		729
625	vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly	730	send_vpn_packet (pkt, si, IPTOS_RELIABILITY \| IPTOS_LOWDELAY); // rsa is very very costly
626
627		731
628	delete pkt;	732	delete pkt;
629	}	733	}
630		734
631	void	735	void
…		…
639		743
640	pkt->hmac_set (octx);	744	pkt->hmac_set (octx);
641		745
642	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);	746	slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
643		747
644	vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly	748	send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
645		749
646	delete pkt;	750	delete pkt;
647	}	751	}
648		752
649	void	753	void
…		…
653	conf->id, rid, (const char *)rsi);	757	conf->id, rid, (const char *)rsi);
654		758
655	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);	759	connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
656		760
657	r->hmac_set (octx);	761	r->hmac_set (octx);
658	vpn->send_vpn_packet (r, si);	762	send_vpn_packet (r, si);
659		763
660	delete r;	764	delete r;
661	}	765	}
662		766
663	void	767	void
664	connection::establish_connection_cb (time_watcher &w)	768	connection::establish_connection_cb (time_watcher &w)
665	{	769	{
666	if (ictx \|\| conf == THISNODE	770	if (!ictx
		771	&& conf != THISNODE
667	\|\| connectmode == conf_node::C_NEVER	772	&& connectmode != conf_node::C_NEVER
668	\|\| connectmode == conf_node::C_DISABLED)	773	&& connectmode != conf_node::C_DISABLED
669	w.at = TSTAMP_CANCEL;	774	&& NOW > w.at)
670	else if (w.at <= NOW)
671	{	775	{
672	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;	776	double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
673		777
674	if (retry_int < 3600 * 8)	778	if (retry_int < conf->max_retry)
675	retry_cnt++;	779	retry_cnt++;
		780	else
		781	retry_int = conf->max_retry;
676		782
677	w.at = NOW + retry_int;	783	w.start (NOW + retry_int);
678		784
679	reset_si ();	785	reset_si ();
680		786
681	if (si.prot && !si.host)	787	if (si.prot && !si.host)
682	vpn->connect_request (conf->id);	788	vpn->send_connect_request (conf->id);
683	else	789	else
684	{	790	{
685	const sockinfo &dsi = forward_si (si);	791	const sockinfo &dsi = forward_si (si);
686		792
687	if (dsi.valid () && auth_rate_limiter.can (dsi))	793	if (dsi.valid () && auth_rate_limiter.can (dsi))
…		…
707	run_script (run_script_cb (this, &connection::script_node_down), false);	813	run_script (run_script_cb (this, &connection::script_node_down), false);
708	}	814	}
709		815
710	delete ictx; ictx = 0;	816	delete ictx; ictx = 0;
711	delete octx; octx = 0;	817	delete octx; octx = 0;
		818	#if ENABLE_DNS
		819	delete dns; dns = 0;
		820	#endif
712		821
713	si.host= 0;	822	si.host = 0;
714		823
715	last_activity = 0;	824	last_activity = 0;
716	retry_cnt = 0;	825	retry_cnt = 0;
717		826
718	rekey.reset ();	827	rekey.stop ();
719	keepalive.reset ();	828	keepalive.stop ();
720	establish_connection.reset ();	829	establish_connection.stop ();
721	}	830	}
722		831
723	void	832	void
724	connection::shutdown ()	833	connection::shutdown ()
725	{	834	{
…		…
730	}	839	}
731		840
732	void	841	void
733	connection::rekey_cb (time_watcher &w)	842	connection::rekey_cb (time_watcher &w)
734	{	843	{
735	w.at = TSTAMP_CANCEL;
736
737	reset_connection ();	844	reset_connection ();
738	establish_connection ();	845	establish_connection ();
739	}	846	}
740		847
741	void	848	void
742	connection::send_data_packet (tap_packet *pkt, bool broadcast)	849	connection::send_data_packet (tap_packet *pkt)
743	{	850	{
744	vpndata_packet *p = new vpndata_packet;	851	vpndata_packet *p = new vpndata_packet;
745	int tos = 0;	852	int tos = 0;
746		853
747	if (conf->inherit_tos	854	// I am not hilarious about peeking into packets, but so be it.
748	&& (pkt)[12] == 0x08 && (pkt)[13] == 0x00 // IP	855	if (conf->inherit_tos && pkt->is_ipv4 ())
749	&& ((*pkt)[14] & 0xf0) == 0x40) // IPv4
750	tos = (*pkt)[15] & IPTOS_TOS_MASK;	856	tos = (*pkt)[15] & IPTOS_TOS_MASK;
751		857
752	p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs	858	p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
753	vpn->send_vpn_packet (p, si, tos);	859	send_vpn_packet (p, si, tos);
754		860
755	delete p;	861	delete p;
756		862
757	if (oseqno > MAX_SEQNO)	863	if (oseqno > MAX_SEQNO)
758	rekey ();	864	rekey ();
759	}	865	}
760		866
761	void	867	void
762	connection::inject_data_packet (tap_packet *pkt, bool broadcast)	868	connection::inject_data_packet (tap_packet pkt, bool broadcast/TODO DDD*/)
763	{	869	{
764	if (ictx && octx)	870	if (ictx && octx)
765	send_data_packet (pkt, broadcast);	871	send_data_packet (pkt);
766	else	872	else
767	{	873	{
768	if (!broadcast)//DDDD	874	if (!broadcast)//DDDD
769	queue.put (new tap_packet (*pkt));	875	data_queue.put (new tap_packet (*pkt));
770		876
771	establish_connection ();	877	establish_connection ();
772	}	878	}
773	}	879	}
774		880
775	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)	881	void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
776	{	882	{
777	if (ictx && octx)	883	if (ictx && octx)
778	vpn->send_vpn_packet (pkt, si, tos);	884	send_vpn_packet (pkt, si, tos);
779	else	885	else
		886	{
		887	vpn_queue.put ((vpn_packet )new data_packet ((data_packet *)pkt));
		888
780	establish_connection ();	889	establish_connection ();
		890	}
781	}	891	}
782		892
783	void	893	void
784	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	894	connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
785	{	895	{
…		…
841	if (p->initiate)	951	if (p->initiate)
842	send_auth_request (rsi, false);	952	send_auth_request (rsi, false);
843		953
844	rsachallenge k;	954	rsachallenge k;
845		955
846	if (0 > RSA_private_decrypt (sizeof (p->encr),	956	if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
847	(unsigned char )&p->encr, (unsigned char )&k,	957	{
848	::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
849	slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),	958	slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
850	conf->nodename, (const char *)rsi);	959	conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
		960	break;
		961	}
851	else	962	else
852	{	963	{
853	retry_cnt = 0;
854	establish_connection.start (NOW + 8); //? ;)
855	keepalive.reset ();
856	rekey.reset ();
857
858	delete ictx;
859	ictx = 0;
860
861	delete octx;	964	delete octx;
862		965
863	octx = new crypto_ctx (k, 1);	966	octx = new crypto_ctx (k, 1);
864	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;	967	oseqno = ntohl ((u32 )&k[CHG_SEQNO]) & 0x7fffffff;
865		968
		969	// compatibility code, remove when no longer required
		970	if (p->flags & 1) p->features \|= FEATURE_COMPRESSION;
		971
866	conf->protocols = p->protocols;	972	conf->protocols = p->protocols;
		973	features = p->features & config_packet::get_features ();
		974
867	send_auth_response (rsi, p->id, k);	975	send_auth_response (rsi, p->id, k);
		976
		977	connection_established ();
868		978
869	break;	979	break;
870	}	980	}
871	}	981	}
		982	else
		983	slog (L_WARN, _("%s(%s): protocol mismatch"),
		984	conf->nodename, (const char *)rsi);
872		985
873	send_reset (rsi);	986	send_reset (rsi);
874	}	987	}
875		988
876	break;	989	break;
…		…
889	PROTOCOL_MINOR, conf->nodename, p->prot_minor);	1002	PROTOCOL_MINOR, conf->nodename, p->prot_minor);
890		1003
891	rsachallenge chg;	1004	rsachallenge chg;
892		1005
893	if (!rsa_cache.find (p->id, chg))	1006	if (!rsa_cache.find (p->id, chg))
		1007	{
894	slog (L_ERR, _("%s(%s): unrequested auth response"),	1008	slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
895	conf->nodename, (const char *)rsi);	1009	conf->nodename, (const char *)rsi);
		1010	break;
		1011	}
896	else	1012	else
897	{	1013	{
898	crypto_ctx *cctx = new crypto_ctx (chg, 0);	1014	crypto_ctx *cctx = new crypto_ctx (chg, 0);
899		1015
900	if (!p->hmac_chk (cctx))	1016	if (!p->hmac_chk (cctx))
		1017	{
901	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"	1018	slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
902	"could be an attack, or just corruption or an synchronization error"),	1019	"could be an attack, or just corruption or a synchronization error"),
903	conf->nodename, (const char *)rsi);	1020	conf->nodename, (const char *)rsi);
		1021	break;
		1022	}
904	else	1023	else
905	{	1024	{
906	rsaresponse h;	1025	rsaresponse h;
907		1026
908	rsa_hash (p->id, chg, h);	1027	rsa_hash (p->id, chg, h);
…		…
916	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid	1035	iseqno.reset (ntohl ((u32 )&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
917		1036
918	si = rsi;	1037	si = rsi;
919	protocol = rsi.prot;	1038	protocol = rsi.prot;
920		1039
921	rekey.start (NOW + ::conf.rekey);	1040	connection_established ();
922	keepalive.start (NOW + ::conf.keepalive);
923
924	// send queued packets
925	while (tap_packet *p = queue.get ())
926	{
927	send_data_packet (p);
928	delete p;
929	}
930
931	connectmode = conf->connectmode;
932		1041
933	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),	1042	slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
934	conf->nodename, (const char *)rsi,	1043	conf->nodename, (const char *)rsi,
935	p->prot_major, p->prot_minor);	1044	p->prot_major, p->prot_minor);
936		1045
…		…
962		1071
963	if (ictx && octx)	1072	if (ictx && octx)
964	{	1073	{
965	vpndata_packet p = (vpndata_packet )pkt;	1074	vpndata_packet p = (vpndata_packet )pkt;
966		1075
967	if (rsi == si)	1076	if (!p->hmac_chk (ictx))
		1077	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
		1078	"could be an attack, or just corruption or a synchronization error"),
		1079	conf->nodename, (const char *)rsi);
		1080	else
968	{	1081	{
969	if (!p->hmac_chk (ictx))
970	slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
971	"could be an attack, or just corruption or an synchronization error"),
972	conf->nodename, (const char *)rsi);
973	else	1082	u32 seqno;
		1083	tap_packet *d = p->unpack (this, seqno);
		1084
		1085	if (iseqno.recv_ok (seqno))
974	{	1086	{
975	u32 seqno;	1087	vpn->tap->send (d);
976	tap_packet *d = p->unpack (this, seqno);
977		1088
978	if (iseqno.recv_ok (seqno))	1089	if (si != rsi)
979	{	1090	{
980	vpn->tap->send (d);	1091	// fast re-sync on connection changes, useful especially for tcp/ip
981
982	if (p->dst () == 0) // re-broadcast
983	for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
984	{
985	connection c = i;
986
987	if (c->conf != THISNODE && c->conf != conf)
988	c->inject_data_packet (d);
989	}
990
991	delete d;
992
993	break;	1092	si = rsi;
		1093
		1094	slog (L_INFO, _("%s(%s): socket address changed to %s"),
		1095	conf->nodename, (const char )si, (const char )rsi);
994	}	1096	}
995	}	1097	}
		1098
		1099	delete d;
		1100	break;
996	}	1101	}
997	else
998	slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
999	}	1102	}
1000		1103
1001	send_reset (rsi);	1104	send_reset (rsi);
1002	break;	1105	break;
1003		1106
…		…
1018	// send connect_info packets to both sides, in case one is	1121	// send connect_info packets to both sides, in case one is
1019	// behind a nat firewall (or both ;)	1122	// behind a nat firewall (or both ;)
1020	c->send_connect_info (conf->id, si, conf->protocols);	1123	c->send_connect_info (conf->id, si, conf->protocols);
1021	send_connect_info (c->conf->id, c->si, c->conf->protocols);	1124	send_connect_info (c->conf->id, c->si, c->conf->protocols);
1022	}	1125	}
		1126	else
		1127	c->establish_connection ();
1023	}	1128	}
1024		1129
1025	break;	1130	break;
1026		1131
1027	case vpn_packet::PT_CONNECT_INFO:	1132	case vpn_packet::PT_CONNECT_INFO:
1028	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))	1133	if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1029	{	1134	{
1030	connect_info_packet p = (connect_info_packet ) pkt;	1135	connect_info_packet p = (connect_info_packet )pkt;
1031		1136
1032	assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything	1137	if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1033		1138	{
1034	connection *c = vpn->conns[p->id - 1];	1139	connection *c = vpn->conns[p->id - 1];
1035		1140
1036	c->conf->protocols = p->protocols;	1141	c->conf->protocols = p->protocols;
1037	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));	1142	protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1038	p->si.upgrade_protocol (protocol, c->conf);	1143	p->si.upgrade_protocol (protocol, c->conf);
1039		1144
1040	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",	1145	slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1041	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);	1146	conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1042		1147
1043	const sockinfo &dsi = forward_si (p->si);	1148	const sockinfo &dsi = forward_si (p->si);
1044		1149
1045	if (dsi.valid ())	1150	if (dsi.valid ())
1046	c->send_auth_request (dsi, true);	1151	c->send_auth_request (dsi, true);
		1152	}
1047	}	1153	}
1048		1154
1049	break;	1155	break;
1050		1156
1051	default:	1157	default:
…		…
1060	{	1166	{
1061	reset_connection ();	1167	reset_connection ();
1062	establish_connection ();	1168	establish_connection ();
1063	}	1169	}
1064	else if (NOW < last_activity + ::conf.keepalive)	1170	else if (NOW < last_activity + ::conf.keepalive)
1065	w.at = last_activity + ::conf.keepalive;	1171	w.start (last_activity + ::conf.keepalive);
1066	else if (conf->connectmode != conf_node::C_ONDEMAND	1172	else if (conf->connectmode != conf_node::C_ONDEMAND
1067	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)	1173	\|\| THISNODE->connectmode != conf_node::C_ONDEMAND)
1068	{	1174	{
1069	send_ping (si);	1175	send_ping (si);
1070	w.at = NOW + 5;	1176	w.start (NOW + 5);
1071	}	1177	}
		1178	else if (NOW < last_activity + ::conf.keepalive + 10)
		1179	// hold ondemand connections implicitly a few seconds longer
		1180	// should delete octx, though, or something like that ;)
		1181	w.start (last_activity + ::conf.keepalive + 10);
1072	else	1182	else
1073	reset_connection ();	1183	reset_connection ();
1074	}	1184	}
1075		1185
1076	void connection::connect_request (int id)	1186	void connection::send_connect_request (int id)
1077	{	1187	{
1078	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);	1188	connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1079		1189
1080	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);	1190	slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1081	p->hmac_set (octx);	1191	p->hmac_set (octx);
1082	vpn->send_vpn_packet (p, si);	1192	send_vpn_packet (p, si);
1083		1193
1084	delete p;	1194	delete p;
1085	}	1195	}
1086		1196
1087	void connection::script_node ()	1197	void connection::script_node ()
…		…
1111	putenv ("STATE=down");	1221	putenv ("STATE=down");
1112		1222
1113	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";	1223	return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1114	}	1224	}
1115		1225
1116	connection::connection(struct vpn *vpn_)	1226	connection::connection (struct vpn vpn, conf_node conf)
1117	: vpn(vpn_)	1227	: vpn(vpn), conf(conf)
1118	, rekey (this, &connection::rekey_cb)	1228	, rekey (this, &connection::rekey_cb)
1119	, keepalive (this, &connection::keepalive_cb)	1229	, keepalive (this, &connection::keepalive_cb)
1120	, establish_connection (this, &connection::establish_connection_cb)	1230	, establish_connection (this, &connection::establish_connection_cb)
		1231	#if ENABLE_DNS
		1232	, dns (0)
		1233	#endif
1121	{	1234	{
1122	octx = ictx = 0;	1235	octx = ictx = 0;
1123	retry_cnt = 0;	1236	retry_cnt = 0;
1124		1237
		1238	if (!conf->protocols) // make sure some protocol is enabled
		1239	conf->protocols = PROT_UDPv4;
		1240
1125	connectmode = conf_node::C_ALWAYS; // initial setting	1241	connectmode = conf_node::C_ALWAYS; // initial setting
1126	reset_connection ();	1242	reset_connection ();
1127	}	1243	}
1128		1244
1129	connection::~connection ()	1245	connection::~connection ()

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs. Revision 1.44 by pcg, Fri Mar 4 08:15:04 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.44 by pcg, Fri Mar 4 08:15:04 2005 UTC