[ViewVC] Diff of: cvs/gvpe/src/vpn

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.4 by pcg, Wed Mar 2 05:49:31 2005 UTC vs.
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC

…		…
1	/*	1	/*
2	vpn_dns.C -- handle the dns tunnel part of the protocol.	2	vpn_dns.C -- handle the dns tunnel part of the protocol.
3	Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	10	(at your option) any later version.
9		11
10	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	GNU General Public License for more details.	15	GNU General Public License for more details.
14		16
15	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
16	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
17	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	*/	20	*/
19		21
20	#include "config.h"	22	#include "config.h"
21		23
35	#include <unistd.h>	37	#include <unistd.h>
36	#include <fcntl.h>	38	#include <fcntl.h>
37		39
38	#include <map>	40	#include <map>
39		41
		42	#include <gmp.h>
		43
40	#include "netcompat.h"	44	#include "netcompat.h"
41		45
42	#include "vpn.h"	46	#include "vpn.h"
43		47
44	#define MIN_RETRY 1.	48	#define MIN_RETRY 1.
45	#define MAX_RETRY 60.	49	#define MAX_RETRY 60.
46		50
47	#define MAX_OUTSTANDING 10 // max. outstanding requests	51	#define MAX_OUTSTANDING 400 // max. outstanding requests
48	#define MAX_WINDOW 100 // max. for MAX_OUTSTANDING	52	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING
49	#define MAX_RATE 1 // requests/s	53	#define MAX_RATE 10000 // requests/s
50	#define MAX_BACKLOG (10*1024) // size of protocol backlog	54	#define MAX_BACKLOG (10*1024) // size of protocol backlog, must be > MAXSIZE
51		55
52	/*	56	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well
		57	// 240 leaves about 4 bytes of server reply data
		58	// every two request byte sless give room for one reply byte
53		59
54	protocol, in shorthand :)	60	// seqno has 12 bits (3 bytes a 4 bits in the header)
55		61	#define SEQNO_MASK 0x7fff
56	client -> server <req> ANY?	62	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
57	server -> client <req> TXT <rep>
58
59	<req> is dns64-encoded <client-id:12><recv-seqno:10>[<send-seqno:10><data>]
60	<rep> is dns64-encoded <0:12><recv-seqno:10>[<send-seqno:10><data>]
61
62	if <client-id> is zero, the connection will be configured:
63
64	<0:12><0:4>client-id:12><default-ttl:8><max-size:16><flags:16>
65
66	*/
67		63
68	#define MAX_LBL_SIZE 63	64	#define MAX_LBL_SIZE 63
69	#define MAX_PKT_SIZE 512	65	#define MAX_PKT_SIZE 512
70		66
71	#define RR_TYPE_TXT 16	67	#define RR_TYPE_TXT 16
72	#define RR_TYPE_ANY 255	68	#define RR_TYPE_ANY 255
73	#define RR_CLASS_IN 1	69	#define RR_CLASS_IN 1
74		70
		71	// works for cmaps up to 255 (not 256!)
		72	struct charmap
		73	{
		74	enum { INVALID = (u8)255 };
		75
		76	char encode [256]; // index => char
		77	u8 decode [256]; // char => index
		78	unsigned int size;
		79
		80	charmap (const char *cmap);
		81	};
		82
		83	charmap::charmap (const char *cmap)
		84	{
		85	char *enc = encode;
		86	u8 *dec = decode;
		87
		88	memset (enc, (char) 0, 256);
		89	memset (dec, (char)INVALID, 256);
		90
		91	for (size = 0; cmap [size]; size++)
		92	{
		93	enc [size] = cmap [size];
		94	dec [(u8)enc [size]] = size;
		95	}
		96
		97	assert (size < 256);
		98	}
		99
		100	#define MAX_DEC_LEN 500
		101	#define MAX_ENC_LEN (MAX_DEC_LEN * 2)
		102	#define MAX_LIMBS ((MAX_DEC_LEN * 8 + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS)
		103
		104	// ugly. minimum base is 16(!)
		105	struct basecoder
		106	{
		107	charmap cmap;
		108	unsigned int enc_len [MAX_DEC_LEN];
		109	unsigned int dec_len [MAX_ENC_LEN];
		110
		111	unsigned int encode_len (unsigned int len);
		112	unsigned int decode_len (unsigned int len);
		113
		114	unsigned int encode (char dst, u8 src, unsigned int len);
		115	unsigned int decode (u8 dst, char src, unsigned int len);
		116
		117	basecoder (const char *cmap);
		118	};
		119
		120	basecoder::basecoder (const char *cmap)
		121	: cmap (cmap)
		122	{
		123	for (unsigned int len = 0; len < MAX_DEC_LEN; ++len)
		124	{
		125	u8 src [MAX_DEC_LEN];
		126	u8 dst [MAX_ENC_LEN];
		127
		128	memset (src, 255, len);
		129
		130	mp_limb_t m [MAX_LIMBS];
		131	mp_size_t n;
		132
		133	n = mpn_set_str (m, src, len, 256);
		134	n = mpn_get_str (dst, this->cmap.size, m, n);
		135
		136	for (int i = 0; !dst [i]; ++i)
		137	n--;
		138
		139	enc_len [len] = n;
		140	dec_len [n] = len;
		141	}
		142	}
		143
		144	unsigned int basecoder::encode_len (unsigned int len)
		145	{
		146	return enc_len [len];
		147	}
		148
		149	unsigned int basecoder::decode_len (unsigned int len)
		150	{
		151	while (len && !dec_len [len])
		152	--len;
		153
		154	return dec_len [len];
		155	}
		156
		157	unsigned int basecoder::encode (char dst, u8 src, unsigned int len)
		158	{
		159	if (!len)
		160	return 0;
		161
		162	int elen = encode_len (len);
		163
		164	mp_limb_t m [MAX_LIMBS];
		165	mp_size_t n;
		166
		167	u8 dst_ [MAX_ENC_LEN];
		168
		169	n = mpn_set_str (m, src, len, 256);
		170	n = mpn_get_str (dst_, cmap.size, m, n);
		171
		172	int plen = elen; // for padding
		173
		174	while (n < plen)
		175	{
		176	*dst++ = cmap.encode [0];
		177	plen--;
		178	}
		179
		180	for (unsigned int i = n - plen; i < n; ++i)
		181	*dst++ = cmap.encode [dst_ [i]];
		182
		183	return elen;
		184	}
		185
		186	unsigned int basecoder::decode (u8 dst, char src, unsigned int len)
		187	{
		188	if (!len)
		189	return 0;
		190
		191	u8 src_ [MAX_ENC_LEN];
		192	unsigned int elen = 0;
		193
		194	while (len--)
		195	{
		196	u8 val = cmap.decode [(u8)*src++];
		197
		198	if (val != charmap::INVALID)
		199	src_ [elen++] = val;
		200	}
		201
		202	int dlen = decode_len (elen);
		203
		204	mp_limb_t m [MAX_LIMBS];
		205	mp_size_t n;
		206
		207	u8 dst_ [MAX_DEC_LEN];
		208
		209	n = mpn_set_str (m, src_, elen, cmap.size);
		210	n = mpn_get_str (dst_, 256, m, n);
		211
		212	if (n < dlen)
		213	{
		214	memset (dst, 0, dlen - n);
		215	memcpy (dst + dlen - n, dst_, n);
		216	}
		217	else
		218	memcpy (dst, dst_ + n - dlen, dlen);
		219
		220	return dlen;
		221	}
		222
		223	#if 0
		224	struct test { test (); } test;
		225
		226	test::test ()
		227	{
		228	basecoder cdc ("0123456789abcdefghijklmnopqrstuvwxyz");
		229
		230	u8 in[] = "0123456789abcdefghijklmnopqrstuvwxyz";
		231	static char enc[200];
		232	static u8 dec[200];
		233
		234	for (int i = 1; i < 20; i++)
		235	{
		236	int elen = cdc.encode (enc, in, i);
		237	int dlen = cdc.decode (dec, enc, elen);
		238
		239	printf ("%d>%d>%d (%s>%s)\n", i, elen, dlen, enc, dec);
		240	}
		241	abort ();
		242	}
		243	#endif
		244
		245	// the following sequence has been crafted to
		246	// a) look somewhat random
		247	// b) the even (and odd) indices never share the same character as upper/lowercase
75	// the "_" is not valid but widely accepted (all octets should be supported, but let's be conservative)	248	// the "_" is not valid but widely accepted (all octets should be supported, but let's be conservative)
76	struct dns64	249	// the other sequences are obviously derived
77	{	250	//static basecoder cdc63 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");
78	static const char encode_chars[64 + 1];	251	static basecoder cdc62 ("dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");
79	static s8 decode_chars[256];	252	//static basecoder cdc36 ("dphzr06qmjkb34tsvl81xaef92wgyo57ucni"); // unused as of yet
		253	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
80		254
81	static int encode_len (int bytes) { return (bytes * 8 + 5) / 6; }	255	/////////////////////////////////////////////////////////////////////////////
82	static int decode_len (int bytes) { return (bytes * 6) / 8; }
83	static int encode (char dst, u8 src, int len);
84	static int decode (u8 dst, char src, int len);
85		256
86	dns64 ();	257	#define HDRSIZE 6
87	} dns64;
88		258
89	const char dns64::encode_chars[64 + 1] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-";	259	inline void encode_header (char *data, int clientid, int seqno)
90	s8 dns64::decode_chars[256];
91
92	dns64::dns64 ()
93	{	260	{
94	for (int i = 0; i < 64; i++)	261	u8 hdr[3] = { clientid, seqno >> 8, seqno };
95	decode_chars [encode_chars [i]] = i + 1;
96	}
97		262
98	int dns64::encode (char dst, u8 src, int len)	263	assert (clientid < 256);
99	{
100	// slow, but easy to debug
101	char *beg = dst;
102	unsigned int accum, bits = 0;
103		264
104	while (len--)	265	cdc26.encode (data, hdr, 3);
105	{
106	accum <<= 8;
107	accum \|= *src++;
108	bits += 8;
109
110	while (bits >= 6)
111	{
112	*dst++ = encode_chars [(accum >> (bits - 6)) & 63];
113	bits -= 6;
114	}
115	}
116
117	if (bits)
118	*dst++ = encode_chars [(accum << (6 - bits)) & 63];
119
120	return dst - beg;
121	}	266	}
122		267
123	int dns64::decode (u8 dst, char src, int len)	268	inline void decode_header (char *data, int &clientid, int &seqno)
124	{	269	{
125	// slow, but easy to debug	270	u8 hdr[3];
126	u8 *beg = dst;
127	unsigned int accum, bits = 0;
128		271
129	while (len--)	272	cdc26.decode (hdr, data, HDRSIZE);
130	{
131	s8 chr = decode_chars [(u8)*src++];
132		273
133	if (!chr)	274	printf ("DEC %02x %02x %02x %02x\n", hdr[0], hdr[1], hdr[2], hdr[3]);
134	break;
135		275
136	accum <<= 6;	276	clientid = hdr[0];
137	accum \|= chr - 1;	277	seqno = (hdr[1] << 8) \| hdr[2];
138	bits += 6;
139
140	while (bits >= 8)
141	{
142	*dst++ = accum >> (bits - 8);
143	bits -= 8;
144	}
145	}
146
147	return dst - beg;
148	}	278	}
149		279
150	/////////////////////////////////////////////////////////////////////////////	280	/////////////////////////////////////////////////////////////////////////////
151		281
152	struct byte_stream	282	struct byte_stream
…		…
159	~byte_stream ();	289	~byte_stream ();
160		290
161	bool empty () { return !fill; }	291	bool empty () { return !fill; }
162	int size () { return fill; }	292	int size () { return fill; }
163		293
		294	bool put (u8 *data, unsigned int datalen);
164	bool put (vpn_packet *pkt);	295	bool put (vpn_packet *pkt);
165	vpn_packet *get ();	296	vpn_packet *get ();
166		297
167	u8 *begin () { return data; }	298	u8 *begin () { return data; }
168	void remove (int count);	299	void remove (int count);
…		…
185	abort ();	316	abort ();
186		317
187	memmove (data, data + count, fill -= count);	318	memmove (data, data + count, fill -= count);
188	}	319	}
189		320
		321	bool byte_stream::put (u8 *data, unsigned int datalen)
		322	{
		323	if (maxsize - fill < datalen)
		324	return false;
		325
		326	memcpy (this->data + fill, data, datalen); fill += datalen;
		327
		328	return true;
		329	}
		330
190	bool byte_stream::put (vpn_packet *pkt)	331	bool byte_stream::put (vpn_packet *pkt)
191	{	332	{
192	if (maxsize - fill < pkt->len + 2)	333	if (maxsize - fill < pkt->len + 2)
193	return false;	334	return false;
194		335
…		…
202		343
203	vpn_packet *byte_stream::get ()	344	vpn_packet *byte_stream::get ()
204	{	345	{
205	int len = (data [0] << 8) \| data [1];	346	int len = (data [0] << 8) \| data [1];
206		347
		348	if (len > MAXSIZE && fill >= 2)
		349	abort (); // TODO handle this gracefully, connection reset
		350
207	if (fill < len + 2)	351	if (fill < len + 2)
208	return 0;	352	return 0;
209		353
210	vpn_packet *pkt = new vpn_packet;	354	vpn_packet *pkt = new vpn_packet;
		355
		356	pkt->len = len;
211	memcpy (&((*pkt)[0]), data + 2, len);	357	memcpy (&((*pkt)[0]), data + 2, len);
212	remove (len + 2);	358	remove (len + 2);
213		359
214	return pkt;	360	return pkt;
215	}	361	}
…		…
222	#define FLAG_OP_QUERY ( 0 << 11)	368	#define FLAG_OP_QUERY ( 0 << 11)
223	#define FLAG_AA ( 1 << 10)	369	#define FLAG_AA ( 1 << 10)
224	#define FLAG_TC ( 1 << 9)	370	#define FLAG_TC ( 1 << 9)
225	#define FLAG_RD ( 1 << 8)	371	#define FLAG_RD ( 1 << 8)
226	#define FLAG_RA ( 1 << 7)	372	#define FLAG_RA ( 1 << 7)
		373	#define FLAG_AUTH ( 1 << 5)
227	#define FLAG_RCODE_MASK (15 << 0)	374	#define FLAG_RCODE_MASK (15 << 0)
228	#define FLAG_RCODE_OK ( 0 << 0)	375	#define FLAG_RCODE_OK ( 0 << 0)
229	#define FLAG_RCODE_FORMERR ( 1 << 0)	376	#define FLAG_RCODE_FORMERR ( 1 << 0)
230	#define FLAG_RCODE_SERVFAIL ( 2 << 0)	377	#define FLAG_RCODE_SERVFAIL ( 2 << 0)
231	#define FLAG_RCODE_NXDOMAIN ( 3 << 0)	378	#define FLAG_RCODE_NXDOMAIN ( 3 << 0)
232	#define FLAG_RCODE_REFUSED ( 5 << 0)	379	#define FLAG_RCODE_REFUSED ( 5 << 0)
233		380
234	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)	381	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)
235	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD)	382	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD \| FLAG_RA)
236		383
237	struct dns_packet : net_packet	384	struct dns_packet : net_packet
238	{	385	{
239	u16 id;	386	u16 id;
240	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	387	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
…		…
285	{	432	{
286	dns_packet *pkt;	433	dns_packet *pkt;
287	tstamp next;	434	tstamp next;
288	int retry;	435	int retry;
289	connection *conn;	436	connection *conn;
		437	int seqno;
290		438
		439	dns_req (connection *c);
291	dns_req (connection c, int seqno, byte_stream stream);	440	void gen_stream_req (int seqno, byte_stream *stream);
292	};	441	};
293		442
294	struct dns_rep
295	{
296	};
297
298	static u16 dns_id; // TODO: should be per-vpn	443	static u16 dns_id = 12098; // TODO: should be per-vpn
299		444
300	dns_req::dns_req (connection c, int seqno, byte_stream stream)	445	static u16 next_id ()
		446	{
		447	// the simplest lsfr with periodicity 65535 i could find
		448	dns_id = (dns_id << 1)
		449	\| (((dns_id >> 1)
		450	^ (dns_id >> 2)
		451	^ (dns_id >> 4)
		452	^ (dns_id >> 15)) & 1);
		453
		454	return dns_id;
		455	}
		456
		457	dns_req::dns_req (connection *c)
301	: conn (c)	458	: conn (c)
302	{	459	{
303	next = 0;	460	next = 0;
304	retry = 0;	461	retry = 0;
305		462
306	pkt = new dns_packet;	463	pkt = new dns_packet;
307		464
308	pkt->id = dns_id++;	465	pkt->id = next_id ();
		466	}
		467
		468	void dns_req::gen_stream_req (int seqno, byte_stream *stream)
		469	{
		470	this->seqno = seqno;
		471
309	pkt->flags = DEFAULT_CLIENT_FLAGS;	472	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
310	pkt->qdcount = htons (1);	473	pkt->qdcount = htons (1);
311	pkt->ancount = 0;
312	pkt->nscount = 0;
313	pkt->arcount = 0;
314		474
315	int offs = 6*2;	475	int offs = 6*2;
316	int dlen = 255 - strlen (THISNODE->domain) - 1; // here we always have room for the max. label length	476	int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);
		477	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,
		478	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
317		479
318	u8 lbl[64]; //D	480	char enc[256], *encp = enc;
319	char enc[65];	481	encode_header (enc, THISNODE->id, seqno);
320	int lbllen = 3;
321	lbl[0] = c->conf->id; //D
322	lbl[1] = seqno >> 8; //D
323	lbl[2] = seqno; //D
324		482
325	while (dlen > 0)	483	int datalen = cdc62.decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE - HDRSIZE);
326	{
327	int sndlen = dlen;
328		484
329	if (sndlen + lbllen > dns64::decode_len (MAX_LBL_SIZE))
330	sndlen = dns64::decode_len (MAX_LBL_SIZE) - lbllen;
331
332	if (sndlen > stream->size ())	485	if (datalen > stream->size ())
333	sndlen = stream->size ();	486	datalen = stream->size ();
334		487
335	if (sndlen + lbllen == 0)	488	int enclen = cdc62.encode (enc + HDRSIZE, stream->begin (), datalen) + HDRSIZE;
336	break;
337		489
338	memcpy (lbl + lbllen, stream->begin (), sndlen);	490	printf ("cdc62.encode %d->%d:%02x %02x %02x %02x\n", datalen, enclen,
		491	stream->begin ()[0],
		492	stream->begin ()[1],
		493	stream->begin ()[2],
		494	stream->begin ()[3]);
		495
339	stream->remove (sndlen);	496	stream->remove (datalen);
340	lbllen += sndlen;
341		497
342	dns64::encode (enc, lbl, lbllen);	498	while (enclen)
		499	{
		500	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;
343		501
344	int elen = dns64::encode_len (lbllen);
345	(*pkt)[offs++] = elen;	502	(*pkt)[offs++] = lbllen;
346	memcpy (&((*pkt)[offs]), enc, elen);	503	memcpy (pkt->at (offs), encp, lbllen);
		504
347	offs += elen;	505	offs += lbllen;
348	dlen -= elen + 1;	506	encp += lbllen;
349		507
350	lbllen = 0;	508	enclen -= lbllen;
351	}	509	}
352		510
353	const char *suffix = THISNODE->domain;	511	const char *suffix = THISNODE->domain;
354		512
355	// add tunnel domain	513	// add tunnel domain
…		…
375	(*pkt)[offs++] = 0;	533	(*pkt)[offs++] = 0;
376	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;	534	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
377	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	535	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
378		536
379	pkt->len = offs;	537	pkt->len = offs;
		538	}
380		539
381	c->vpn->dns_sndpq.push_back (this);	540	struct dns_rcv
		541	{
		542	int seqno;
		543	dns_packet *pkt; // reply packet
		544	u8 data [MAXSIZE]; // actually part of the reply packet...
		545	int datalen;
		546
		547	dns_rcv (int seqno, u8 *data, int datalen);
		548	~dns_rcv ();
		549	};
		550
		551	dns_rcv::dns_rcv (int seqno, u8 *data, int datalen)
		552	: seqno (seqno), pkt (new dns_packet), datalen (datalen)
		553	{
		554	memcpy (this->data, data, datalen);
		555	}
		556
		557	dns_rcv::~dns_rcv ()
		558	{
		559	delete pkt;
382	}	560	}
383		561
384	/////////////////////////////////////////////////////////////////////////////	562	/////////////////////////////////////////////////////////////////////////////
385		563
386	struct dns_cfg	564	struct dns_cfg
…		…
390	u8 unused1;	568	u8 unused1;
391	u16 max_size;	569	u16 max_size;
392	u8 flags1, flags2;	570	u8 flags1, flags2;
393	};	571	};
394		572
		573	void connection::dnsv4_receive_rep (struct dns_rcv *r)
		574	{
		575	dns_rcvpq.push_back (r);
		576
		577	printf ("%d got inketc %d (%02x %02x %02x %02x)\n", THISNODE->id, r->seqno
		578	,r->data[0]
		579	,r->data[1]
		580	,r->data[2]
		581	,r->data[3]
		582	);
		583	redo:
		584
		585	// find next packet
		586	for (vector<dns_rcv *>::iterator i = dns_rcvpq.end (); i-- != dns_rcvpq.begin (); )
		587	if (SEQNO_EQ (dns_rcvseq, (*i)->seqno))
		588	{
		589	// enter the packet into our input stream
		590	r = *i;
		591
		592	printf ("%d checking for older packet %d\n", THISNODE->id, dns_rcvseq);
		593	// remove the oldest packet, look forward, as it's oldest first
		594	for (vector<dns_rcv *>::iterator j = dns_rcvpq.begin (); j != dns_rcvpq.end (); ++j)
		595	if (SEQNO_EQ ((*j)->seqno, dns_rcvseq - MAX_WINDOW))
		596	{
		597	printf ("%d removing %d\n", THISNODE->id, (*j)->seqno);
		598	delete *j;
		599	dns_rcvpq.erase (j);
		600	break;
		601	}
		602
		603	dns_rcvseq = (dns_rcvseq + 1) & SEQNO_MASK;
		604
		605	if (!dns_snddq && !dns_rcvdq)
		606	{
		607	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);
		608	dns_snddq = new byte_stream (MAX_BACKLOG);
		609
		610	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		611	}
		612
		613	if (!dns_rcvdq->put (r->data, r->datalen))
		614	abort (); // MUST never overflow, can be caused by data corruption, TODO
		615
		616	while (vpn_packet *pkt = dns_rcvdq->get ())
		617	{
		618	sockinfo si;
		619	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;
		620
		621	vpn->recv_vpn_packet (pkt, si);
		622	}
		623
		624	// check for further packets
		625	goto redo;
		626	}
		627	}
		628
395	dns_packet *	629	dns_packet *
396	vpn::dnsv4_server (dns_packet *pkt)	630	vpn::dnsv4_server (dns_packet *pkt)
397	{	631	{
398	u16 flags = ntohs (pkt->flags);	632	u16 flags = ntohs (pkt->flags);
399		633
…		…
405	if (!(flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))	639	if (!(flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))
406	&& pkt->qdcount == htons (1))	640	&& pkt->qdcount == htons (1))
407	{	641	{
408	char qname[MAXSIZE];	642	char qname[MAXSIZE];
409	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);	643	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);
410
411	printf ("rcvd packet len %d, id%04x flags%04x q%04x a%04x n%04x a%04x <%s>\n", pkt->len,
412	pkt->id, flags, pkt->qdcount, pkt->ancount, pkt->nscount, pkt->arcount, qname);//D
413		644
414	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];	645	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];
415	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];	646	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];
416		647
417	pkt->qdcount = htons (1);	648	pkt->qdcount = htons (1);
…		…
423		654
424	int dlen = strlen (THISNODE->domain);	655	int dlen = strlen (THISNODE->domain);
425		656
426	if (qclass == RR_CLASS_IN	657	if (qclass == RR_CLASS_IN
427	&& (qtype == RR_TYPE_ANY \|\| qtype == RR_TYPE_TXT)	658	&& (qtype == RR_TYPE_ANY \|\| qtype == RR_TYPE_TXT)
428	&& qlen > dlen + 1	659	&& qlen > dlen + 1 + HDRSIZE
429	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	660	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))
430	{	661	{
431	// correct class, domain, parse	662	// correct class, domain: parse
		663	int client, seqno;
		664	decode_header (qname, client, seqno);
		665
432	u8 data[MAXSIZE];	666	u8 data[MAXSIZE];
433	int datalen = dns64::decode (data, qname, qlen - dlen - 1);	667	int datalen = cdc62.decode (data, qname + HDRSIZE, qlen - (dlen + 1 + HDRSIZE));
434		668
435	for (int i = 0; i < datalen; i++)	669	printf ("cdc62.decode %d(%d): %02x %02x %02x %02x\n",
436	printf ("%02x ", data[i]);	670	qlen - (dlen + 1 + HDRSIZE), datalen
437	printf ("\n");	671	,data[0]
		672	,data[1]
		673	,data[2]
		674	,data[3]);
438		675
439		676	printf ("SRV got %d <%.*s>\n", seqno, qlen, qname + HDRSIZE);//D
		677	printf ("SRV got %d <%.*s>\n", seqno, qlen - (dlen + 1 + HDRSIZE), qname + HDRSIZE);//D
440		678
441		679	if (0 < client && client <= conns.size ())
442	#if 0
443	// now generate reply
444	rep->ancount = htons (1); // one answer RR
445	rep->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
446
447	(*rep) [offs++] = 0xc0;
448	(rep) [offs++] = 6 2; // same as in query section
449
450	(rep) [offs++] = RR_TYPE_TXT >> 8; (rep) [offs++] = RR_TYPE_TXT;
451	(rep) [offs++] = RR_CLASS_IN >> 8; (rep) [offs++] = RR_CLASS_IN;
452
453	(rep) [offs++] = 0; (rep) [offs++] = 0;
454	(rep) [offs++] = 0; (rep) [offs++] = 0; // TTL
455
456	int dlen = MAX_PKT_SIZE - offs - 2;
457
458	printf ("we have room for %d bytes\n", dlen);
459
460	int rdlen_offs = offs += 2;
461
462	u8 txt[255];
463	txt[0] = 0;
464	txt[1] = 0;
465
466	int txtlen = 2;
467
468	while (dlen > 1)
469	{	680	{
470	int sndlen = --dlen;	681	connection *c = conns [client - 1];
471		682
472	if (sndlen + txtlen > 255)	683	for (vector<dns_rcv *>::iterator i = c->dns_rcvpq.end (); i-- != c->dns_rcvpq.begin (); )
473	sndlen = 255 - txtlen;	684	if (SEQNO_EQ ((*i)->seqno, seqno))
		685	{
		686	// already seen that request: simply reply with the cached reply
		687	dns_rcv r = i;
474		688
		689	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D
		690
		691	memcpy (pkt->at (0), r->pkt->at (0), offs = r->pkt->len);
		692	pkt->id = r->pkt->id;
		693	goto duplicate_request;
		694	}
		695
		696	// new packet, queue
		697	dns_rcv *rcv = new dns_rcv (seqno, data, datalen);
		698	c->dnsv4_receive_rep (rcv);
		699
		700	// now generate reply
		701	pkt->ancount = htons (1); // one answer RR
		702	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
		703
		704	(*pkt) [offs++] = 0xc0;
		705	(pkt) [offs++] = 6 2; // same as in query section
		706
		707	(pkt) [offs++] = RR_TYPE_TXT >> 8; (pkt) [offs++] = RR_TYPE_TXT;
		708	(pkt) [offs++] = RR_CLASS_IN >> 8; (pkt) [offs++] = RR_CLASS_IN;
		709
		710	(pkt) [offs++] = 0; (pkt) [offs++] = 0;
		711	(pkt) [offs++] = 0; (pkt) [offs++] = 0; // TTL
		712
		713	int dlen = MAX_PKT_SIZE - offs - 2;
		714
		715	// bind doesn't compress well, so reduce further by one label length
475	sndlen = 0;	716	dlen -= qlen;
476		717
		718	int rdlen_offs = offs += 2;
		719
		720	while (c->dns_snddq
		721	&& !c->dns_snddq->empty ()
		722	&& dlen > 1)
		723	{
		724	int txtlen = dlen <= 255 ? dlen - 1 : 255;
		725
		726	if (txtlen > c->dns_snddq->size ())
		727	txtlen = c->dns_snddq->size ();
		728
477	(*rep)[offs++] = sndlen + txtlen;	729	(*pkt)[offs++] = txtlen;
478	memcpy (&((*rep)[offs]), txt, txtlen);	730	memcpy (pkt->at (offs), c->dns_snddq->begin (), txtlen);
479	offs += txtlen;	731	offs += txtlen;
		732	c->dns_snddq->remove (txtlen);
480		733
481	//if (sndlen + txtlen > dns_snddq.	734	dlen -= txtlen + 1;
		735	}
		736
		737	// avoid empty TXT rdata
		738	if (offs == rdlen_offs)
		739	(*pkt)[offs++] = 0;
		740
		741	int rdlen = offs - rdlen_offs;
		742
		743	(*pkt) [rdlen_offs - 2] = rdlen >> 8;
		744	(*pkt) [rdlen_offs - 1] = rdlen;
		745
		746	// now update dns_rcv copy
		747	rcv->pkt->len = offs;
		748	memcpy (rcv->pkt->at (0), pkt->at (0), offs);
		749
		750	duplicate_request: ;
482	}	751	}
483		752	else
484	int rdlen = offs - rdlen_offs;	753	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
485
486	(*rep) [rdlen_offs - 2] = rdlen >> 8;
487	(*rep) [rdlen_offs - 1] = rdlen;
488	#endif
489	}	754	}
490	}
491		755
492	pkt->len = offs;	756	pkt->len = offs;
		757	}
		758
493	return pkt;	759	return pkt;
494	}	760	}
495		761
496	void	762	void
497	vpn::dnsv4_client (dns_packet *pkt)	763	vpn::dnsv4_client (dns_packet *pkt)
…		…
500	int offs = 6 * 2; // skip header	766	int offs = 6 * 2; // skip header
501		767
502	pkt->qdcount = ntohs (pkt->qdcount);	768	pkt->qdcount = ntohs (pkt->qdcount);
503	pkt->ancount = ntohs (pkt->ancount);	769	pkt->ancount = ntohs (pkt->ancount);
504		770
		771	// go through our request list and find the corresponding request
505	for (vector<dns_req *>::iterator i = dns_sndpq.begin ();	772	for (vector<dns_req *>::iterator i = dns_sndpq.begin ();
506	i != dns_sndpq.end ();	773	i != dns_sndpq.end ();
507	++i)	774	++i)
508	if ((*i)->pkt->id == pkt->id)	775	if ((*i)->pkt->id == pkt->id)
509	{	776	{
510	connection c = (i)->conn;	777	connection c = (i)->conn;
511	printf ("GOT RESPONSE id %x %p\n", pkt->id, c);//D	778	int seqno = (*i)->seqno;
		779	u8 data[MAXSIZE], *datap = data;
		780
512	delete *i;	781	delete *i;
513	dns_sndpq.erase (i);	782	dns_sndpq.erase (i);
514		783
515	if (flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))	784	if (flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))
516	{	785	{
…		…
522	offs += 4; // skip qtype, qclass	791	offs += 4; // skip qtype, qclass
523	}	792	}
524		793
525	while (pkt->ancount-- && offs < MAXSIZE - 10)	794	while (pkt->ancount-- && offs < MAXSIZE - 10)
526	{	795	{
		796	int qlen = //D
527	pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);	797	pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);
		798
		799	printf ("got reply to <%.*s>\n", qlen, qname);//D
528		800
529	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];	801	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];
530	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];	802	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];
531	u32 ttl = (*pkt) [offs++] << 24;	803	u32 ttl = (*pkt) [offs++] << 24;
532	ttl \|= (*pkt) [offs++] << 16;	804	ttl \|= (*pkt) [offs++] << 16;
533	ttl \|= (*pkt) [offs++] << 8;	805	ttl \|= (*pkt) [offs++] << 8;
534	ttl \|= (*pkt) [offs++];	806	ttl \|= (*pkt) [offs++];
535		807
536	u16 rdlen = (pkt) [offs++] << 8; rdlen \|= (pkt) [offs++];	808	u16 rdlen = (pkt) [offs++] << 8; rdlen \|= (pkt) [offs++];
537		809
538	printf ("REPLY %d:%d TTL %d RD %d\n", qtype, qclass, ttl, rdlen);
539
540	offs += rdlen;
541
542	if (MAXSIZE - offs < rdlen)	810	if (rdlen <= MAXSIZE - offs)
543	{	811	{
544	// decode bytes, finally	812	// decode bytes, finally
		813
		814	while (rdlen)
		815	{
		816	int txtlen = (*pkt) [offs++];
		817
		818	assert (txtlen + offs < MAXSIZE - 1);
		819
		820	memcpy (datap, pkt->at (offs), txtlen);
		821	datap += txtlen; offs += txtlen;
		822
		823	rdlen -= txtlen + 1;
		824	}
		825
545	}	826	}
		827
546	}	828	}
547	}	829	}
548		830
		831	// todo: pkt now used
		832	c->dnsv4_receive_rep (new dns_rcv (seqno, data, datap - data));
		833
549	break;	834	break;
550	}	835	}
		836
		837	delete pkt;
551	}	838	}
552		839
553	void	840	void
554	vpn::dnsv4_ev (io_watcher &w, short revents)	841	vpn::dnsv4_ev (io_watcher &w, short revents)
555	{	842	{
…		…
560	socklen_t sa_len = sizeof (sa);	847	socklen_t sa_len = sizeof (sa);
561		848
562	pkt->len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	849	pkt->len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
563		850
564	if (pkt->len > 0)	851	if (pkt->len > 0)
		852	{
		853	if (pkt->flags & htons (FLAG_TC))
		854	{
		855	slog (L_WARN, _("DNS request/response truncated, check protocol settings."));
		856	//TODO connection reset
		857	}
		858
565	if (THISNODE->dns_port)	859	if (THISNODE->dns_port)
566	{	860	{
567	pkt = dnsv4_server (pkt);	861	pkt = dnsv4_server (pkt);
568	sendto (w.fd, &((pkt)[0]), pkt->len, 0, (sockaddr )&sa, sa_len);	862	sendto (w.fd, &((pkt)[0]), pkt->len, 0, (sockaddr )&sa, sa_len);
569	}	863	}
570	else	864	else
571	dnsv4_client (pkt);	865	dnsv4_client (pkt);
		866	}
572	}	867	}
573	}	868	}
574		869
575	bool	870	bool
576	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	871	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
…		…
579	if (!dns_snddq && !dns_rcvdq)	874	if (!dns_snddq && !dns_rcvdq)
580	{	875	{
581	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);	876	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);
582	dns_snddq = new byte_stream (MAX_BACKLOG);	877	dns_snddq = new byte_stream (MAX_BACKLOG);
583		878
584	dns_rcvseq = dns_sndseq = 0;	879	//dns_rcvseq = dns_sndseq = 0;
585		880
586	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);	881	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
587	}	882	}
588		883
589	if (!dns_snddq->put (pkt))	884	if (!dns_snddq->put (pkt))
590	return false;	885	return false;
591		886
592	// start timer if neccessary	887	// start timer if neccessary
593	if (!dnsv4_tw.active)	888	if (!THISNODE->dns_port && !dnsv4_tw.active)
594	dnsv4_cb (dnsv4_tw);	889	dnsv4_cb (dnsv4_tw);
595		890
596	return true;	891	return true;
597	}	892	}
598		893
…		…
601	{	896	{
602	// check for timeouts and (re)transmit	897	// check for timeouts and (re)transmit
603	tstamp next = NOW + 60;	898	tstamp next = NOW + 60;
604	dns_req *send = 0;	899	dns_req *send = 0;
605		900
606	slog (L_NOISE, _("dnsv4, %d packets in send queue\n"), vpn->dns_sndpq.size ());
607
608	for (vector<dns_req *>::iterator i = vpn->dns_sndpq.begin ();	901	for (vector<dns_req *>::iterator i = vpn->dns_sndpq.begin ();
609	i != vpn->dns_sndpq.end ();	902	i != vpn->dns_sndpq.end ();
610	++i)	903	++i)
611	{	904	{
612	dns_req r = i;	905	dns_req r = i;
…		…
615	{	908	{
616	if (!send)	909	if (!send)
617	{	910	{
618	send = r;	911	send = r;
619		912
620	slog (L_NOISE, _("dnsv4, send req %d\n"), r->pkt->id);	913	if (r->retry)//D
		914	printf ("req %d:%d, retry %d\n", r->seqno, r->pkt->id, r->retry);
621	r->retry++;	915	r->retry++;
622	r->next = NOW + r->retry;	916	r->next = NOW + r->retry;
623	}	917	}
624	}	918	}
625		919
…		…
627	next = r->next;	921	next = r->next;
628	}	922	}
629		923
630	if (!send	924	if (!send
631	&& vpn->dns_sndpq.size () < MAX_OUTSTANDING)	925	&& vpn->dns_sndpq.size () < MAX_OUTSTANDING)
632	send = new dns_req (this, dns_sndseq++, dns_snddq);	926	{
		927	send = new dns_req (this);
		928	send->gen_stream_req (dns_sndseq, dns_snddq);
		929	vpn->dns_sndpq.push_back (send);
		930
		931	dns_sndseq = (dns_sndseq + 1) & SEQNO_MASK;
		932	}
633		933
634	tstamp min_next = NOW + (1. / (tstamp)MAX_RATE);	934	tstamp min_next = NOW + (1. / (tstamp)MAX_RATE);
635		935
636	if (send)	936	if (send)
637	{	937	{

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.4 by pcg, Wed Mar 2 05:49:31 2005 UTC vs. Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.4 by pcg, Wed Mar 2 05:49:31 2005 UTC vs.
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC