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.7 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.32 by pcg, Tue Mar 15 18:15:39 2005 UTC

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

Diff Legend

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