ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/gvpe/src/vpn_dns.C

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

Diff Legend

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