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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.7 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.10 by pcg, Fri Mar 4 08:15:04 2005 UTC

…		…
37	#include <unistd.h>	37	#include <unistd.h>
38	#include <fcntl.h>	38	#include <fcntl.h>
39		39
40	#include <map>	40	#include <map>
41		41
		42	#include <gmp.h>
		43
42	#include "netcompat.h"	44	#include "netcompat.h"
43		45
44	#include "vpn.h"	46	#include "vpn.h"
45		47
46	#define MIN_RETRY 1.	48	#define MIN_POLL_INTERVAL .2 // how often to poll minimally when the server is having data
47	#define MAX_RETRY 60.	49	#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data
		50	#define ACTIVITY_INTERVAL 5.
48		51
		52	#define INITIAL_TIMEOUT 1.
		53	#define INITIAL_SYN_TIMEOUT 2.
		54
		55	#define MIN_SEND_INTERVAL (1./1000.)
		56	#define MAX_SEND_INTERVAL 0.5 // optimistic?
		57
49	#define MAX_OUTSTANDING 40 // max. outstanding requests	58	#define MAX_OUTSTANDING 400 // max. outstanding requests
50	#define MAX_WINDOW 100 // max. for MAX_OUTSTANDING	59	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING
51	#define MAX_RATE 1000 // requests/s	60	#define MAX_RATE 100 // requests/s
52	#define MAX_BACKLOG (10*1024) // size of protocol backlog, must be > MAXSIZE	61	#define MAX_BACKLOG (100*1024) // size of protocol backlog, must be > MAXSIZE
53		62
54	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well	63	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well
55	// 240 leaves about 4 bytes of server reply data	64	// 240 leaves about 4 bytes of server reply data
56	// every two request byte sless give room for one reply byte	65	// every two request byte sless give room for one reply byte
57		66
58	// seqno has 12 bits, but the lower bit is always left as zero
59	// as bind caches ttl=0 records and we have to generate
60	// sequence numbers that always differ case-insensitively
61	#define SEQNO_MASK 0x07ff	67	#define SEQNO_MASK 0xffff
62		68	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
63	/*
64
65	protocol, in shorthand :)
66
67	client -> server <req> ANY?
68	server -> client <req> TXT <rep>
69
70	<req> is dns64-encoded <client-id:12><recv-seqno:10>[<send-seqno:10><data>]
71	<rep> is dns64-encoded <0:12><recv-seqno:10>[<send-seqno:10><data>]
72
73	if <client-id> is zero, the connection will be configured:
74
75	<0:12><0:4>client-id:12><default-ttl:8><max-size:16><flags:16>
76
77	*/
78		69
79	#define MAX_LBL_SIZE 63	70	#define MAX_LBL_SIZE 63
80	#define MAX_PKT_SIZE 512	71	#define MAX_PKT_SIZE 512
81		72
		73	#define RR_TYPE_A 1
		74	#define RR_TYPE_NULL 10
82	#define RR_TYPE_TXT 16	75	#define RR_TYPE_TXT 16
83	#define RR_TYPE_ANY 255	76	#define RR_TYPE_ANY 255
		77
84	#define RR_CLASS_IN 1	78	#define RR_CLASS_IN 1
85		79
86	// the "_" is not valid but widely accepted (all octets should be supported, but let's be conservative)	80	#define CMD_IP_1 207
87	struct dns64	81	#define CMD_IP_2 46
88	{	82	#define CMD_IP_3 236
89	static const char encode_chars[64 + 1];	83	#define CMD_IP_RST 29
90	static s8 decode_chars[256];	84	#define CMD_IP_SYN 113
		85	#define CMD_IP_REJ 32
91		86
92	static int encode_len (int bytes) { return (bytes * 8 + 5) / 6; }	87	// works for cmaps up to 255 (not 256!)
93	static int decode_len (int bytes) { return (bytes * 6) / 8; }	88	struct charmap
		89	{
		90	enum { INVALID = (u8)255 };
		91
		92	char encode [256]; // index => char
		93	u8 decode [256]; // char => index
		94	unsigned int size;
		95
		96	charmap (const char *cmap);
		97	};
		98
		99	charmap::charmap (const char *cmap)
		100	{
		101	char *enc = encode;
		102	u8 *dec = decode;
		103
		104	memset (enc, (char) 0, 256);
		105	memset (dec, (char)INVALID, 256);
		106
		107	for (size = 0; cmap [size]; size++)
		108	{
		109	enc [size] = cmap [size];
		110	dec [(u8)enc [size]] = size;
		111	}
		112
		113	assert (size < 256);
		114	}
		115
		116	#define MAX_DEC_LEN 500
		117	#define MAX_ENC_LEN (MAX_DEC_LEN * 2)
		118	#define MAX_LIMBS ((MAX_DEC_LEN * 8 + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS)
		119
		120	// ugly. minimum base is 16(!)
		121	struct basecoder
		122	{
		123	charmap cmap;
		124	unsigned int enc_len [MAX_DEC_LEN];
		125	unsigned int dec_len [MAX_ENC_LEN];
		126
		127	unsigned int encode_len (unsigned int len);
		128	unsigned int decode_len (unsigned int len);
		129
94	static int encode (char dst, u8 src, int len);	130	unsigned int encode (char dst, u8 src, unsigned int len);
95	static int decode (u8 dst, char src, int len);	131	unsigned int decode (u8 dst, char src, unsigned int len);
96		132
97	dns64 ();	133	basecoder (const char *cmap);
98	} dns64;	134	};
99		135
100	// the following sequence has been crafted to	136	basecoder::basecoder (const char *cmap)
101	// a) look somewhat random	137	: cmap (cmap)
102	// b) the even (and odd) indices never share the same character as upper/lowercase
103	const char dns64::encode_chars[64 + 1] = "_-dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI";
104	s8 dns64::decode_chars[256];
105
106	dns64::dns64 ()
107	{	138	{
108	for (int i = 0; i < 64; i++)	139	for (unsigned int len = 0; len < MAX_DEC_LEN; ++len)
109	decode_chars [encode_chars [i]] = i + 1;	140	{
110	}	141	u8 src [MAX_DEC_LEN];
		142	u8 dst [MAX_ENC_LEN];
111		143
112	int dns64::encode (char dst, u8 src, int len)	144	memset (src, 255, len);
		145
		146	mp_limb_t m [MAX_LIMBS];
		147	mp_size_t n;
		148
		149	n = mpn_set_str (m, src, len, 256);
		150	n = mpn_get_str (dst, this->cmap.size, m, n);
		151
		152	for (int i = 0; !dst [i]; ++i)
		153	n--;
		154
		155	enc_len [len] = n;
		156	dec_len [n] = len;
		157	}
		158	}
		159
		160	unsigned int basecoder::encode_len (unsigned int len)
113	{	161	{
114	// slow, but easy to debug	162	return enc_len [len];
115	char *beg = dst;	163	}
116	unsigned int accum, bits = 0;	164
		165	unsigned int basecoder::decode_len (unsigned int len)
		166	{
		167	while (len && !dec_len [len])
		168	--len;
		169
		170	return dec_len [len];
		171	}
		172
		173	unsigned int basecoder::encode (char dst, u8 src, unsigned int len)
		174	{
		175	if (!len \|\| len > MAX_DEC_LEN)
		176	return 0;
		177
		178	int elen = encode_len (len);
		179
		180	mp_limb_t m [MAX_LIMBS];
		181	mp_size_t n;
		182
		183	u8 dst_ [MAX_ENC_LEN];
		184
		185	n = mpn_set_str (m, src, len, 256);
		186	n = mpn_get_str (dst_, cmap.size, m, n);
		187
		188	int plen = elen; // for padding
		189
		190	while (n < plen)
		191	{
		192	*dst++ = cmap.encode [0];
		193	plen--;
		194	}
		195
		196	for (unsigned int i = n - plen; i < n; ++i)
		197	*dst++ = cmap.encode [dst_ [i]];
		198
		199	return elen;
		200	}
		201
		202	unsigned int basecoder::decode (u8 dst, char src, unsigned int len)
		203	{
		204	if (!len \|\| len > MAX_ENC_LEN)
		205	return 0;
		206
		207	u8 src_ [MAX_ENC_LEN];
		208	unsigned int elen = 0;
117		209
118	while (len--)	210	while (len--)
119	{	211	{
120	accum <<= 8;	212	u8 val = cmap.decode [(u8)*src++];
121	accum \|= *src++;
122	bits += 8;
123		213
124	while (bits >= 6)	214	if (val != charmap::INVALID)
125	{	215	src_ [elen++] = val;
126	*dst++ = encode_chars [(accum >> (bits - 6)) & 63];	216	}
127	bits -= 6;	217
128	}	218	int dlen = decode_len (elen);
		219
		220	mp_limb_t m [MAX_LIMBS];
		221	mp_size_t n;
		222
		223	u8 dst_ [MAX_DEC_LEN];
		224
		225	n = mpn_set_str (m, src_, elen, cmap.size);
		226	n = mpn_get_str (dst_, 256, m, n);
		227
		228	if (n < dlen)
129	}	229	{
		230	memset (dst, 0, dlen - n);
		231	memcpy (dst + dlen - n, dst_, n);
		232	}
		233	else
		234	memcpy (dst, dst_ + n - dlen, dlen);
130		235
131	if (bits)	236	return dlen;
132	*dst++ = encode_chars [(accum << (6 - bits)) & 63];
133
134	return dst - beg;
135	}	237	}
136		238
137	int dns64::decode (u8 dst, char src, int len)	239	#if 0
138	{	240	struct test { test (); } test;
139	// slow, but easy to debug
140	u8 *beg = dst;
141	unsigned int accum, bits = 0;
142		241
143	while (len--)	242	test::test ()
		243	{
		244	basecoder cdc ("0123456789abcdefghijklmnopqrstuvwxyz");
		245
		246	u8 in[] = "0123456789abcdefghijklmnopqrstuvwxyz";
		247	static char enc[200];
		248	static u8 dec[200];
		249
		250	for (int i = 1; i < 20; i++)
144	{	251	{
145	s8 chr = decode_chars [(u8)*src++];	252	int elen = cdc.encode (enc, in, i);
		253	int dlen = cdc.decode (dec, enc, elen);
146		254
147	if (!chr)	255	printf ("%d>%d>%d (%s>%s)\n", i, elen, dlen, enc, dec);
148	continue;
149
150	accum <<= 6;
151	accum \|= chr - 1;
152	bits += 6;
153
154	while (bits >= 8)
155	{
156	*dst++ = accum >> (bits - 8);
157	bits -= 8;
158	}
159	}	256	}
		257	abort ();
		258	}
		259	#endif
160		260
161	return dst - beg;	261	//static basecoder cdc64 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI-");
		262	//static basecoder cdc63 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");
		263	static basecoder cdc62 ("dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");
		264	//static basecoder cdc36 ("dphzr06qmjkb34tsvl81xaef92wgyo57ucni"); // unused as of yet
		265	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
		266
		267	/////////////////////////////////////////////////////////////////////////////
		268
		269	#define HDRSIZE 6
		270
		271	inline void encode_header (char *data, int clientid, int seqno)
		272	{
		273	u8 hdr[3] = { clientid, seqno >> 8, seqno };
		274
		275	assert (clientid < 256);
		276
		277	cdc26.encode (data, hdr, 3);
		278	}
		279
		280	inline void decode_header (char *data, int &clientid, int &seqno)
		281	{
		282	u8 hdr[3];
		283
		284	cdc26.decode (hdr, data, HDRSIZE);
		285
		286	clientid = hdr[0];
		287	seqno = (hdr[1] << 8) \| hdr[2];
162	}	288	}
163		289
164	/////////////////////////////////////////////////////////////////////////////	290	/////////////////////////////////////////////////////////////////////////////
165		291
166	struct byte_stream	292	struct byte_stream
…		…
218	return false;	344	return false;
219		345
220	data [fill++] = pkt->len >> 8;	346	data [fill++] = pkt->len >> 8;
221	data [fill++] = pkt->len;	347	data [fill++] = pkt->len;
222		348
223	memcpy (data + fill, &((*pkt)[0]), pkt->len); fill += pkt->len;	349	memcpy (data + fill, pkt->at (0), pkt->len); fill += pkt->len;
224		350
225	return true;	351	return true;
226	}	352	}
227		353
228	vpn_packet *byte_stream::get ()	354	vpn_packet *byte_stream::get ()
…		…
236	return 0;	362	return 0;
237		363
238	vpn_packet *pkt = new vpn_packet;	364	vpn_packet *pkt = new vpn_packet;
239		365
240	pkt->len = len;	366	pkt->len = len;
241	memcpy (&((*pkt)[0]), data + 2, len);	367	memcpy (pkt->at (0), data + 2, len);
242	remove (len + 2);	368	remove (len + 2);
243		369
244	return pkt;	370	return pkt;
245	}	371	}
246		372
247	/////////////////////////////////////////////////////////////////////////////	373	/////////////////////////////////////////////////////////////////////////////
248		374
249	#define FLAG_QUERY ( 0 << 15)	375	#define FLAG_QUERY ( 0 << 15)
250	#define FLAG_RESPONSE ( 1 << 15)	376	#define FLAG_RESPONSE ( 1 << 15)
251	#define FLAG_OP_MASK (15 << 14)	377	#define FLAG_OP_MASK (15 << 11)
252	#define FLAG_OP_QUERY ( 0 << 11)	378	#define FLAG_OP_QUERY ( 0 << 11)
253	#define FLAG_AA ( 1 << 10)	379	#define FLAG_AA ( 1 << 10)
254	#define FLAG_TC ( 1 << 9)	380	#define FLAG_TC ( 1 << 9)
255	#define FLAG_RD ( 1 << 8)	381	#define FLAG_RD ( 1 << 8)
256	#define FLAG_RA ( 1 << 7)	382	#define FLAG_RA ( 1 << 7)
…		…
263	#define FLAG_RCODE_REFUSED ( 5 << 0)	389	#define FLAG_RCODE_REFUSED ( 5 << 0)
264		390
265	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)	391	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)
266	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD \| FLAG_RA)	392	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD \| FLAG_RA)
267		393
		394	struct dns_cfg
		395	{
		396	static int next_uid;
		397
		398	u8 id1, id2, id3, id4;
		399	u8 version;
		400	u8 rrtype;
		401	u8 flags;
		402	u8 def_ttl;
		403	u8 rcv_cdc;
		404	u8 snd_cdc;
		405	u16 max_size;
		406	u16 client;
		407	u16 uid; // to make request unique
		408
		409	u8 reserved[8];
		410
		411	void reset (int clientid);
		412	bool valid ();
		413	};
		414
		415	int dns_cfg::next_uid;
		416
		417	void dns_cfg::reset (int clientid)
		418	{
		419	id1 = 'G';
		420	id2 = 'V';
		421	id3 = 'P';
		422	id4 = 'E';
		423
		424	version = 1;
		425
		426	rrtype = RR_TYPE_TXT;
		427	flags = 0;
		428	def_ttl = 0;
		429	rcv_cdc = 0;
		430	snd_cdc = 62;
		431	max_size = ntohs (MAX_PKT_SIZE);
		432	client = ntohs (clientid);
		433	uid = next_uid++;
		434
		435	memset (reserved, 0, 8);
		436	}
		437
		438	bool dns_cfg::valid ()
		439	{
		440	return id1 == 'G'
		441	&& id2 == 'V'
		442	&& id3 == 'P'
		443	&& id4 == 'E'
		444	&& version == 1
		445	&& flags == 0
		446	&& rcv_cdc == 0
		447	&& snd_cdc == 62
		448	&& max_size == ntohs (MAX_PKT_SIZE);
		449	}
		450
268	struct dns_packet : net_packet	451	struct dns_packet : net_packet
269	{	452	{
270	u16 id;	453	u16 id;
271	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	454	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
272	u16 qdcount, ancount, nscount, arcount;	455	u16 qdcount, ancount, nscount, arcount;
…		…
310	return data - orig;	493	return data - orig;
311	}	494	}
312		495
313	/////////////////////////////////////////////////////////////////////////////	496	/////////////////////////////////////////////////////////////////////////////
314		497
315	struct dns_req	498	struct dns_snd
316	{	499	{
317	dns_packet *pkt;	500	dns_packet *pkt;
318	tstamp next;	501	tstamp timeout, sent;
319	int retry;	502	int retry;
320	connection *conn;	503	struct dns_connection *dns;
321	int seqno;	504	int seqno;
322		505
323	dns_req (connection *c);	506	dns_snd (dns_connection *dns);
324	void gen_stream_req (int seqno, byte_stream *stream);	507	void gen_stream_req (int seqno, byte_stream &stream);
		508	void gen_syn_req (const dns_cfg &cfg);
325	};	509	};
326		510
327	static u16 dns_id = 12098; // TODO: should be per-vpn	511	static u16 dns_id = 12098; // TODO: should be per-vpn
328		512
329	static u16 next_id ()	513	static u16 next_id ()
…		…
336	^ (dns_id >> 15)) & 1);	520	^ (dns_id >> 15)) & 1);
337		521
338	return dns_id;	522	return dns_id;
339	}	523	}
340		524
341	dns_req::dns_req (connection *c)	525	dns_snd::dns_snd (dns_connection *dns)
342	: conn (c)	526	: dns (dns)
343	{	527	{
344	next = 0;	528	timeout = 0;
345	retry = 0;	529	retry = 0;
		530	seqno = 0;
346		531
347	pkt = new dns_packet;	532	pkt = new dns_packet;
348		533
349	pkt->id = next_id ();	534	pkt->id = next_id ();
350	}	535	}
351		536
		537	static void append_domain (dns_packet &pkt, int &offs, const char *domain)
		538	{
		539	// add tunnel domain
		540	for (;;)
		541	{
		542	const char *end = strchr (domain, '.');
		543
		544	if (!end)
		545	end = domain + strlen (domain);
		546
		547	int len = end - domain;
		548
		549	pkt [offs++] = len;
		550	memcpy (pkt.at (offs), domain, len);
		551	offs += len;
		552
		553	if (!*end)
		554	break;
		555
		556	domain = end + 1;
		557	}
		558	}
		559
352	void dns_req::gen_stream_req (int seqno, byte_stream *stream)	560	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
353	{	561	{
354	this->seqno = seqno;	562	this->seqno = seqno;
		563
		564	timeout = NOW + INITIAL_TIMEOUT;
355		565
356	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	566	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
357	pkt->qdcount = htons (1);	567	pkt->qdcount = htons (1);
358		568
359	int offs = 6*2;	569	int offs = 6*2;
360	int dlen = MAX_DOMAIN_SIZE - strlen (THISNODE->domain) - 2;	570	int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);
361	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,	571	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,
362	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra	572	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
363		573
364	u8 data[256]; //TODO
365
366	data[0] = THISNODE->id; //TODO
367	data[1] = seqno >> 7; //TODO
368	data[2] = seqno << 1; //TODO
369
370	int datalen = dns64::decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE) - 3;
371
372	if (datalen > stream->size ())
373	datalen = stream->size ();
374
375	char enc[256], *encp = enc;	574	char enc[256], *encp = enc;
376		575	encode_header (enc, THISNODE->id, seqno);
377	memcpy (data + 3, stream->begin (), datalen);	576
378	int enclen = dns64::encode (enc, data, datalen + 3);	577	int datalen = cdc62.decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE - HDRSIZE);
		578
		579	if (datalen > stream.size ())
		580	datalen = stream.size ();
		581
		582	int enclen = cdc62.encode (enc + HDRSIZE, stream.begin (), datalen) + HDRSIZE;
379	stream->remove (datalen);	583	stream.remove (datalen);
380		584
381	while (enclen)	585	while (enclen)
382	{	586	{
383	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;	587	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;
384		588
…		…
389	encp += lbllen;	593	encp += lbllen;
390		594
391	enclen -= lbllen;	595	enclen -= lbllen;
392	}	596	}
393		597
394	const char *suffix = THISNODE->domain;	598	append_domain (*pkt, offs, THISNODE->domain);
395
396	// add tunnel domain
397	for (;;)
398	{
399	const char *end = strchr (suffix, '.');
400
401	if (!end)
402	end = suffix + strlen (suffix);
403
404	int len = end - suffix;
405
406	(*pkt)[offs++] = len;
407	memcpy (&((*pkt)[offs]), suffix, len);
408	offs += len;
409
410	if (!*end)
411	break;
412
413	suffix = end + 1;
414	}
415		599
416	(*pkt)[offs++] = 0;	600	(*pkt)[offs++] = 0;
417	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;	601	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
		602	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
		603
		604	pkt->len = offs;
		605	}
		606
		607	void dns_snd::gen_syn_req (const dns_cfg &cfg)
		608	{
		609	timeout = NOW + INITIAL_SYN_TIMEOUT;
		610
		611	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
		612	pkt->qdcount = htons (1);
		613
		614	int offs = 6*2;
		615
		616	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&cfg, sizeof (dns_cfg));
		617
		618	assert (elen <= MAX_LBL_SIZE);
		619
		620	(*pkt)[offs] = elen;
		621	offs += elen + 1;
		622	append_domain (*pkt, offs, THISNODE->domain);
		623
		624	(*pkt)[offs++] = 0;
		625	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;
418	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	626	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
419		627
420	pkt->len = offs;	628	pkt->len = offs;
421	}	629	}
422		630
…		…
441	{	649	{
442	delete pkt;	650	delete pkt;
443	}	651	}
444		652
445	/////////////////////////////////////////////////////////////////////////////	653	/////////////////////////////////////////////////////////////////////////////
446		654
447	struct dns_cfg	655	struct dns_connection
448	{	656	{
449	u8 id1, id2, id3;	657	connection *c;
450	u8 def_ttl;	658	struct vpn *vpn;
451	u8 unused1;	659
452	u16 max_size;	660	dns_cfg cfg;
453	u8 flags1, flags2;	661
		662	bool established;
		663
		664	tstamp last_received;
		665	tstamp last_sent;
		666	double poll_interval, send_interval;
		667
		668	vector<dns_rcv *> rcvpq;
		669
		670	byte_stream rcvdq; int rcvseq;
		671	byte_stream snddq; int sndseq;
		672
		673	void time_cb (time_watcher &w); time_watcher tw;
		674	void receive_rep (dns_rcv *r);
		675
		676	dns_connection (connection *c);
		677	~dns_connection ();
454	};	678	};
455		679
		680	dns_connection::dns_connection (connection *c)
		681	: c (c)
		682	, rcvdq (MAX_BACKLOG * 2)
		683	, snddq (MAX_BACKLOG * 2)
		684	, tw (this, &dns_connection::time_cb)
		685	{
		686	vpn = c->vpn;
		687
		688	established = false;
		689
		690	rcvseq = sndseq = 0;
		691
		692	last_sent = last_received = 0;
		693	poll_interval = MIN_POLL_INTERVAL;
		694	send_interval = 0.2; // starting rate
		695	}
		696
		697	dns_connection::~dns_connection ()
		698	{
		699	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
		700	i != rcvpq.end ();
		701	++i)
		702	delete *i;
		703	}
		704
456	void connection::dnsv4_receive_rep (struct dns_rcv *r)	705	void dns_connection::receive_rep (dns_rcv *r)
457	{	706	{
		707	if (r->datalen)
		708	{
		709	last_received = NOW;
		710	tw.trigger ();
		711
		712	poll_interval *= 0.99;
		713	if (poll_interval > MIN_POLL_INTERVAL)
		714	poll_interval = MIN_POLL_INTERVAL;
		715	}
		716	else
		717	{
		718	poll_interval *= 1.1;
		719	if (poll_interval > MAX_POLL_INTERVAL)
		720	poll_interval = MAX_POLL_INTERVAL;
		721	}
		722
458	dns_rcvpq.push_back (r);	723	rcvpq.push_back (r);
459		724
460	redo:	725	redo:
461		726
		727	// find next packet
462	for (vector<dns_rcv *>::iterator i = dns_rcvpq.begin ();	728	for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
463	i != dns_rcvpq.end ();
464	++i)
465	if (dns_rcvseq == (*i)->seqno)	729	if (SEQNO_EQ (rcvseq, (*i)->seqno))
466	{	730	{
		731	// enter the packet into our input stream
467	dns_rcv r = i;	732	r = *i;
468		733
469	dns_rcvseq = (dns_rcvseq + 1) & SEQNO_MASK;	734	// remove the oldest packet, look forward, as it's oldest first
470		735	for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
471	if (!dns_snddq && !dns_rcvdq)	736	if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
472	{	737	{
473	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);	738	delete *j;
474	dns_snddq = new byte_stream (MAX_BACKLOG);	739	rcvpq.erase (j);
475		740	break;
476	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
477	}	741	}
478		742
		743	rcvseq = (rcvseq + 1) & SEQNO_MASK;
		744
479	if (!dns_rcvdq->put (r->data, r->datalen))	745	if (!rcvdq.put (r->data, r->datalen))
480	abort (); // MUST never overflow, can be caused by data corruption, TODO	746	abort (); // MUST never overflow, can be caused by data corruption, TODO
481		747
482	while (vpn_packet *pkt = dns_rcvdq->get ())	748	while (vpn_packet *pkt = rcvdq.get ())
483	{	749	{
484	sockinfo si;	750	sockinfo si;
485	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;	751	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;
486		752
487	vpn->recv_vpn_packet (pkt, si);	753	vpn->recv_vpn_packet (pkt, si);
488	}	754	}
489	}	755
490	else if ((u32)(i)->seqno - (u32)dns_rcvseq + MAX_WINDOW > MAX_WINDOW 2)	756	// check for further packets
491	{
492	//D
493	//abort();
494	printf ("%d erasing %d (%d)\n", THISNODE->id, (u32)(*i)->seqno, dns_rcvseq);
495	dns_rcvpq.erase (i);
496	goto redo;	757	goto redo;
497	}	758	}
498	}	759	}
499		760
500	dns_packet *	761	void
501	vpn::dnsv4_server (dns_packet *pkt)	762	vpn::dnsv4_server (dns_packet &pkt)
502	{	763	{
503	u16 flags = ntohs (pkt->flags);	764	u16 flags = ntohs (pkt.flags);
504		765
505	//memcpy (&((rep)[0]), &((pkt)[0]), pkt->len);
506	int offs = 6 * 2; // skip header	766	int offs = 6 * 2; // skip header
507		767
508	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	768	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
509		769
510	if (!(flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))	770	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))
511	&& pkt->qdcount == htons (1))	771	&& pkt.qdcount == htons (1))
512	{	772	{
513	char qname[MAXSIZE];	773	char qname[MAXSIZE];
514	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);	774	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
515		775
516	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];	776	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
517	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];	777	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
518		778
519	pkt->qdcount = htons (1);	779	pkt.qdcount = htons (1);
520	pkt->ancount = 0;	780	pkt.ancount = 0;
521	pkt->nscount = 0; // should be self, as other nameservers reply like this	781	pkt.nscount = 0; // should be self, as other nameservers reply like this
522	pkt->arcount = 0; // a record for self, as other nameservers reply like this	782	pkt.arcount = 0; // a record for self, as other nameservers reply like this
523		783
524	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);	784	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);
525		785
526	int dlen = strlen (THISNODE->domain);	786	int dlen = strlen (THISNODE->domain);
527		787
528	if (qclass == RR_CLASS_IN	788	if (qclass == RR_CLASS_IN
529	&& (qtype == RR_TYPE_ANY \|\| qtype == RR_TYPE_TXT)
530	&& qlen > dlen + 1	789	&& qlen > dlen + 1
531	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	790	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))
532	{	791	{
533	// correct class, domain: parse	792	// now generate reply
534	u8 data[MAXSIZE];	793	pkt.ancount = htons (1); // one answer RR
535	int datalen = dns64::decode (data, qname, qlen - dlen - 1);	794	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
536		795
537	int client = data[0];	796	if ((qtype == RR_TYPE_ANY
538	int seqno = ((data[1] << 7) \| (data[2] >> 1)) & SEQNO_MASK;	797	\|\| qtype == RR_TYPE_TXT
539		798	\|\| qtype == RR_TYPE_NULL)
540	if (0 < client && client <= conns.size ())	799	&& qlen > dlen + 1 + HDRSIZE)
541	{	800	{
542	connection *c = conns [client - 1];	801	// correct class, domain: parse
		802	int client, seqno;
		803	decode_header (qname, client, seqno);
543		804
544	redo:	805	u8 data[MAXSIZE];
		806	int datalen = cdc62.decode (data, qname + HDRSIZE, qlen - (dlen + 1 + HDRSIZE));
545		807
546	for (vector<dns_rcv *>::iterator i = c->dns_rcvpq.begin ();	808	if (0 < client && client <= conns.size ())
547	i != c->dns_rcvpq.end ();
548	++i)
549	if ((*i)->seqno == seqno)
550	{
551	// already seen that request: simply reply with the cached reply
552	dns_rcv r = i;
553
554	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D
555
556	offs = r->pkt->len;
557	memcpy (pkt->at (0), r->pkt->at (0), offs);
558	goto duplicate_request;
559	}
560
561	// new packet, queue
562	dns_rcv *rcv = new dns_rcv (seqno, data + 3, datalen - 3);
563	c->dnsv4_receive_rep (rcv);
564
565	// now generate reply
566	pkt->ancount = htons (1); // one answer RR
567	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
568
569	(*pkt) [offs++] = 0xc0;
570	(pkt) [offs++] = 6 2; // same as in query section
571
572	(pkt) [offs++] = RR_TYPE_TXT >> 8; (pkt) [offs++] = RR_TYPE_TXT;
573	(pkt) [offs++] = RR_CLASS_IN >> 8; (pkt) [offs++] = RR_CLASS_IN;
574
575	(pkt) [offs++] = 0; (pkt) [offs++] = 0;
576	(pkt) [offs++] = 0; (pkt) [offs++] = 0; // TTL
577
578	int dlen = MAX_PKT_SIZE - offs - 2;
579
580	// bind doesn't compress well, so reduce further by one label length
581	dlen -= qlen;
582
583	int rdlen_offs = offs += 2;
584
585	while (c->dns_snddq
586	&& !c->dns_snddq->empty ()
587	&& dlen > 1)
588	{	809	{
		810	connection *c = conns [client - 1];
		811	dns_connection *dns = c->dns;
		812	dns_rcv *rcv;
		813
		814	if (dns)
		815	{
		816	for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
		817	if (SEQNO_EQ ((*i)->seqno, seqno))
		818	{
		819	// already seen that request: simply reply with the cached reply
		820	dns_rcv r = i;
		821
		822	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D
		823
		824	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
		825	pkt.id = r->pkt->id;
		826	goto duplicate_request;
		827	}
		828
		829	// new packet, queue
		830	rcv = new dns_rcv (seqno, data, datalen);
		831	dns->receive_rep (rcv);
		832	}
		833
		834	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
		835
		836	// type
		837	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
		838	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype;
		839
		840	// class
		841	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN;
		842
		843	// TTL
		844	pkt [offs++] = 0; pkt [offs++] = 0;
		845	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0;
		846
		847	int rdlen_offs = offs += 2;
		848
		849	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;
		850	// bind doesn't compress well, so reduce further by one label length
		851	dlen -= qlen;
		852
		853	if (dns)
		854	{
		855	while (dlen > 1 && !dns->snddq.empty ())
		856	{
589	int txtlen = dlen <= 255 ? dlen - 1 : 255;	857	int txtlen = dlen <= 255 ? dlen - 1 : 255;
590		858
591	if (txtlen > c->dns_snddq->size ())	859	if (txtlen > dns->snddq.size ())
592	txtlen = c->dns_snddq->size ();	860	txtlen = dns->snddq.size ();
593		861
594	(*pkt)[offs++] = txtlen;	862	pkt[offs++] = txtlen;
595	memcpy (pkt->at (offs), c->dns_snddq->begin (), txtlen);	863	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
596	offs += txtlen;	864	offs += txtlen;
597	c->dns_snddq->remove (txtlen);	865	dns->snddq.remove (txtlen);
598		866
599	dlen -= txtlen + 1;	867	dlen -= txtlen + 1;
		868	}
		869
		870	// avoid empty TXT rdata
		871	if (offs == rdlen_offs)
		872	pkt[offs++] = 0;
		873	}
		874	else
		875	{
		876	// send RST
		877	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
		878	pkt [offs++] = CMD_IP_RST;
		879	}
		880
		881	int rdlen = offs - rdlen_offs;
		882
		883	pkt [rdlen_offs - 2] = rdlen >> 8;
		884	pkt [rdlen_offs - 1] = rdlen;
		885
		886	if (dns)
		887	{
		888	// now update dns_rcv copy
		889	rcv->pkt->len = offs;
		890	memcpy (rcv->pkt->at (0), pkt.at (0), offs);
		891	}
		892
		893	duplicate_request: ;
600	}	894	}
601		895	else
602	// avoid empty TXT rdata	896	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
603	if (offs == rdlen_offs)
604	(*pkt)[offs++] = 0;
605
606	int rdlen = offs - rdlen_offs;
607
608	(*pkt) [rdlen_offs - 2] = rdlen >> 8;
609	(*pkt) [rdlen_offs - 1] = rdlen;
610
611	// now update dns_rcv copy
612	rcv->pkt->len = offs;
613	memcpy (rcv->pkt->at (0), pkt->at (0), offs);
614
615	duplicate_request: ;
616	}	897	}
617	else	898	else if (qtype == RR_TYPE_A
618	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	899	&& qlen > dlen + 1 + cdc26.encode_len (sizeof (dns_cfg)))
		900	{
		901	dns_cfg cfg;
		902	cdc26.decode ((u8 *)&cfg, qname, cdc26.encode_len (sizeof (dns_cfg)));
		903	int client = ntohs (cfg.client);
		904
		905	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
		906
		907	pkt [offs++] = RR_TYPE_A >> 8; pkt [offs++] = RR_TYPE_A; // type
		908	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
		909	pkt [offs++] = 0; pkt [offs++] = 0;
		910	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
		911	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
		912
		913	slog (L_INFO, _("DNS tunnel: client %d tries to connect"), client);
		914
		915	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
		916	pkt [offs++] = CMD_IP_REJ;
		917
		918	if (0 < client && client <= conns.size ())
		919	{
		920	connection *c = conns [client - 1];
		921
		922	if (cfg.valid ())
		923	{
		924	pkt [offs - 1] = CMD_IP_SYN;
		925
		926	delete c->dns;
		927	c->dns = new dns_connection (c);
		928	c->dns->cfg = cfg;
		929	}
		930	}
		931	}
619	}	932	}
620		933
621	pkt->len = offs;	934	pkt.len = offs;
622	}	935	}
623
624	return pkt;
625	}	936	}
626		937
627	void	938	void
628	vpn::dnsv4_client (dns_packet *pkt)	939	vpn::dnsv4_client (dns_packet &pkt)
629	{	940	{
630	u16 flags = ntohs (pkt->flags);	941	u16 flags = ntohs (pkt.flags);
631	int offs = 6 * 2; // skip header	942	int offs = 6 * 2; // skip header
632		943
633	pkt->qdcount = ntohs (pkt->qdcount);	944	pkt.qdcount = ntohs (pkt.qdcount);
634	pkt->ancount = ntohs (pkt->ancount);	945	pkt.ancount = ntohs (pkt.ancount);
635		946
636	// go through our request list and find the corresponding request	947	// go through our request list and find the corresponding request
637	for (vector<dns_req *>::iterator i = dns_sndpq.begin ();	948	for (vector<dns_snd *>::iterator i = dns_sndpq.begin ();
638	i != dns_sndpq.end ();	949	i != dns_sndpq.end ();
639	++i)	950	++i)
640	if ((*i)->pkt->id == pkt->id)	951	if ((*i)->pkt->id == pkt.id)
641	{	952	{
642	connection c = (i)->conn;	953	dns_connection dns = (i)->dns;
643	int seqno = (*i)->seqno;	954	int seqno = (*i)->seqno;
644	u8 data[MAXSIZE], *datap = data;	955	u8 data[MAXSIZE], *datap = data;
645		956
		957	if ((*i)->retry)
		958	{
		959	dns->send_interval *= 1.01;
		960	if (dns->send_interval < MAX_SEND_INTERVAL)
		961	dns->send_interval = MAX_SEND_INTERVAL;
		962	}
		963	else
		964	{
		965	dns->send_interval *= 0.99;
		966	if (dns->send_interval < MIN_SEND_INTERVAL)
		967	dns->send_interval = MIN_SEND_INTERVAL;
		968
		969	// the latency surely puts an upper bound on
		970	// the minimum send interval
		971	if (dns->send_interval > NOW - (*i)->sent)
		972	dns->send_interval = NOW - (*i)->sent;
		973	}
		974
646	delete *i;	975	delete *i;
647	dns_sndpq.erase (i);	976	dns_sndpq.erase (i);
648		977
649	if (flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))	978	if (flags & FLAG_RESPONSE && !(flags & FLAG_OP_MASK))
650	{	979	{
651	char qname[MAXSIZE];	980	char qname[MAXSIZE];
652		981
653	while (pkt->qdcount-- && offs < MAXSIZE - 4)	982	while (pkt.qdcount-- && offs < MAXSIZE - 4)
654	{	983	{
655	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);	984	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
656	offs += 4; // skip qtype, qclass	985	offs += 4; // skip qtype, qclass
657	}	986	}
658		987
659	while (pkt->ancount-- && offs < MAXSIZE - 10)	988	while (pkt.ancount-- && offs < MAXSIZE - 10 && datap)
660	{	989	{
661	pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);	990	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
662		991
663	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];	992	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
664	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];	993	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
665	u32 ttl = (*pkt) [offs++] << 24;	994	u32 ttl = pkt [offs++] << 24;
666	ttl \|= (*pkt) [offs++] << 16;	995	ttl \|= pkt [offs++] << 16;
667	ttl \|= (*pkt) [offs++] << 8;	996	ttl \|= pkt [offs++] << 8;
668	ttl \|= (*pkt) [offs++];	997	ttl \|= pkt [offs++];
669
670	u16 rdlen = (pkt) [offs++] << 8; rdlen \|= (pkt) [offs++];	998	u16 rdlen = pkt [offs++] << 8; rdlen \|= pkt [offs++];
671		999
672	if (rdlen <= MAXSIZE - offs)	1000	if (qtype == RR_TYPE_NULL \|\| qtype == RR_TYPE_TXT)
673	{	1001	{
674	// decode bytes, finally	1002	if (rdlen <= MAXSIZE - offs)
675
676	while (rdlen)
677	{	1003	{
		1004	// decode bytes, finally
		1005
		1006	while (rdlen)
		1007	{
678	int txtlen = (*pkt) [offs++];	1008	int txtlen = pkt [offs++];
679		1009
680	assert (txtlen + offs < MAXSIZE - 1);	1010	assert (txtlen + offs < MAXSIZE - 1);
681		1011
682	memcpy (datap, pkt->at (offs), txtlen);	1012	memcpy (datap, pkt.at (offs), txtlen);
683	datap += txtlen; offs += txtlen;	1013	datap += txtlen; offs += txtlen;
684		1014
685	rdlen -= txtlen + 1;	1015	rdlen -= txtlen + 1;
		1016	}
686	}	1017	}
687
688	}	1018	}
		1019	else if (qtype == RR_TYPE_A)
		1020	{
		1021	u8 ip [4];
689		1022
		1023	ip [0] = pkt [offs++];
		1024	ip [1] = pkt [offs++];
		1025	ip [2] = pkt [offs++];
		1026	ip [3] = pkt [offs++];
		1027
		1028	if (ip [0] == CMD_IP_1
		1029	&& ip [1] == CMD_IP_2
		1030	&& ip [2] == CMD_IP_3)
		1031	{
		1032	slog (L_TRACE, _("got tunnel meta command %02x"), ip [3]);
		1033
		1034	if (ip [3] == CMD_IP_RST)
		1035	{
		1036	slog (L_DEBUG, _("got tunnel RST request"));
		1037
		1038	connection *c = dns->c;
		1039	delete c->dns; c->dns = 0;
		1040
		1041	return;
		1042	}
		1043	else if (ip [3] == CMD_IP_SYN)
		1044	dns->established = true;
		1045	else
		1046	slog (L_INFO, _("got unknown meta command %02x"), ip [3]);
		1047	}
		1048	else
		1049	slog (L_INFO, _("got spurious a record %d.%d.%d.%d"),
		1050	ip [0], ip [1], ip [2], ip [3]);
		1051
		1052	return;
		1053	}
		1054
		1055	int client, rseqno;
		1056	decode_header (qname, client, rseqno);
		1057
		1058	if (client != THISNODE->id)
		1059	{
		1060	slog (L_INFO, _("got dns tunnel response with wrong clientid, ignoring"));
		1061	datap = 0;
		1062	}
		1063	else if (rseqno != seqno)
		1064	{
		1065	slog (L_DEBUG, _("got dns tunnel response with wrong seqno, badly caching nameserver?"));
		1066	datap = 0;
		1067	}
690	}	1068	}
691	}	1069	}
692		1070
693	// todo: pkt now used	1071	// todo: pkt now used
		1072	if (datap)
694	c->dnsv4_receive_rep (new dns_rcv (seqno, data, datap - data));	1073	dns->receive_rep (new dns_rcv (seqno, data, datap - data));
695		1074
696	break;	1075	break;
697	}	1076	}
698
699	delete pkt;
700	}	1077	}
701		1078
702	void	1079	void
703	vpn::dnsv4_ev (io_watcher &w, short revents)	1080	vpn::dnsv4_ev (io_watcher &w, short revents)
704	{	1081	{
…		…
706	{	1083	{
707	dns_packet *pkt = new dns_packet;	1084	dns_packet *pkt = new dns_packet;
708	struct sockaddr_in sa;	1085	struct sockaddr_in sa;
709	socklen_t sa_len = sizeof (sa);	1086	socklen_t sa_len = sizeof (sa);
710		1087
711	pkt->len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	1088	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
712		1089
713	if (pkt->len > 0)	1090	if (pkt->len > 0)
714	{	1091	{
715	if (pkt->flags & htons (FLAG_TC))
716	{
717	slog (L_WARN, _("DNS request/response truncated, check protocol settings."));
718	//TODO connection reset
719	}
720
721	if (THISNODE->dns_port)	1092	if (THISNODE->dns_port)
722	{	1093	{
723	pkt = dnsv4_server (pkt);	1094	dnsv4_server (*pkt);
724	sendto (w.fd, &((pkt)[0]), pkt->len, 0, (sockaddr )&sa, sa_len);	1095	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
725	}	1096	}
726	else	1097	else
727	dnsv4_client (pkt);	1098	dnsv4_client (*pkt);
		1099
		1100	delete pkt;
728	}	1101	}
729	}	1102	}
730	}	1103	}
731		1104
732	bool	1105	bool
733	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	1106	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
734	{	1107	{
735	// never initialized	1108	if (!dns)
736	if (!dns_snddq && !dns_rcvdq)	1109	dns = new dns_connection (this);
737	{
738	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);
739	dns_snddq = new byte_stream (MAX_BACKLOG);
740
741	//dns_rcvseq = dns_sndseq = 0;
742
743	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
744	}
745		1110
746	if (!dns_snddq->put (pkt))	1111	if (!dns->snddq.put (pkt))
747	return false;	1112	return false;
748		1113
749	// start timer if neccessary	1114	dns->tw.trigger ();
750	if (!THISNODE->dns_port && !dnsv4_tw.active)
751	dnsv4_cb (dnsv4_tw);
752		1115
753	return true;	1116	return true;
754	}	1117	}
755		1118
		1119	#define NEXT(w) do { if (next > (w)) next = w; } while (0)
		1120
756	void	1121	void
757	connection::dnsv4_cb (time_watcher &w)	1122	dns_connection::time_cb (time_watcher &w)
758	{	1123	{
		1124	// servers have to be polled
		1125	if (THISNODE->dns_port)
		1126	return;
		1127
759	// check for timeouts and (re)transmit	1128	// check for timeouts and (re)transmit
760	tstamp next = NOW + 60;	1129	tstamp next = NOW + poll_interval;
761	dns_req *send = 0;	1130	dns_snd *send = 0;
762		1131
763	for (vector<dns_req *>::iterator i = vpn->dns_sndpq.begin ();	1132	for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
764	i != vpn->dns_sndpq.end ();	1133	i != vpn->dns_sndpq.end ();
765	++i)	1134	++i)
766	{	1135	{
767	dns_req r = i;	1136	dns_snd r = i;
768		1137
769	if (r->next <= NOW)	1138	if (r->timeout <= NOW)
770	{	1139	{
771	if (!send)	1140	if (!send)
772	{	1141	{
773	send = r;	1142	send = r;
774		1143
775	if (r->retry)//D
776	printf ("req %d, retry %d\n", r->pkt->id, r->retry);
777	r->retry++;	1144	r->retry++;
778	r->next = NOW + r->retry;	1145	r->timeout = NOW + r->retry;
779	}	1146	}
780	}	1147	}
781
782	if (r->next < next)	1148	else if (r->timeout < next)
783	next = r->next;	1149	NEXT (r->timeout);
		1150	}
		1151
		1152	if (last_sent + send_interval <= NOW)
784	}	1153	{
785
786	if (!send	1154	if (!send)
		1155	{
		1156	// generate a new packet, if wise
		1157
		1158	if (!established)
		1159	{
		1160	if (vpn->dns_sndpq.empty ())
		1161	{
		1162	send = new dns_snd (this);
		1163
		1164	cfg.reset (THISNODE->id);
		1165	send->gen_syn_req (cfg);
		1166	}
		1167	}
787	&& vpn->dns_sndpq.size () < MAX_OUTSTANDING)	1168	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING)
788	{	1169	{
789	send = new dns_req (this);	1170	send = new dns_snd (this);
790	send->gen_stream_req (dns_sndseq, dns_snddq);	1171	send->gen_stream_req (sndseq, snddq);
		1172
		1173	sndseq = (sndseq + 1) & SEQNO_MASK;
		1174	}
		1175
		1176	if (send)
791	vpn->dns_sndpq.push_back (send);	1177	vpn->dns_sndpq.push_back (send);
		1178	}
792		1179
793	dns_sndseq = (dns_sndseq + 1) & SEQNO_MASK;
794	}
795
796	tstamp min_next = NOW + (1. / (tstamp)MAX_RATE);
797
798	if (send)	1180	if (send)
		1181	{
		1182	printf ("send pkt\n");
		1183	last_sent = NOW;
		1184
		1185	if (!send->retry)
		1186	send->sent = NOW;
		1187
		1188	sendto (vpn->dnsv4_fd,
		1189	send->pkt->at (0), send->pkt->len, 0,
		1190	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
		1191	}
799	{	1192	}
800	dns_packet *pkt = send->pkt;	1193	else
		1194	NEXT (last_sent + send_interval);
801		1195
802	next = min_next;	1196	printf ("pi %f si %f N %f (%d:%d)\n", poll_interval, send_interval, next - NOW, vpn->dns_sndpq.size (), snddq.size ());
803
804	sendto (vpn->dnsv4_fd, &((*pkt)[0]), pkt->len, 0, dns_si.sav4 (), dns_si.salenv4 ());
805	}
806	else if (next < min_next)
807	next = min_next;
808		1197
809	w.start (next);	1198	w.start (next);
810	}	1199	}
811		1200
812	#endif	1201	#endif

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.7 by pcg, Thu Mar 3 16:54:34 2005 UTC vs. Revision 1.10 by pcg, Fri Mar 4 08:15:04 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.7 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.10 by pcg, Fri Mar 4 08:15:04 2005 UTC