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

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

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs. Revision 1.37 by pcg, Wed Mar 23 17:03:58 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs.
Revision 1.37 by pcg, Wed Mar 23 17:03:58 2005 UTC