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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.10 by pcg, Fri Mar 4 08:15:04 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>
…		…
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_POLL_INTERVAL .2 // how often to poll minimally when the server is having data
49	#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data	49	#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
50	#define ACTIVITY_INTERVAL 5.	50	#define ACTIVITY_INTERVAL 5.
51		51
52	#define INITIAL_TIMEOUT 1.	52	#define TIMEOUT_FACTOR 4.
53	#define INITIAL_SYN_TIMEOUT 2.
54		53
55	#define MIN_SEND_INTERVAL (1./1000.)	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
56	#define MAX_SEND_INTERVAL 0.5 // optimistic?	58	#define MAX_SEND_INTERVAL 2. // optimistic?
57		59
		60	#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate
58	#define MAX_OUTSTANDING 400 // max. outstanding requests	61	#define MAX_OUTSTANDING 100 // max. outstanding requests
59	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING	62	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
60	#define MAX_RATE 100 // requests/s
61	#define MAX_BACKLOG (100*1024) // size of protocol backlog, must be > MAXSIZE	63	#define MAX_BACKLOG (32*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62		64
63	#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
64	// 240 leaves about 4 bytes of server reply data	66	// 240 leaves about 4 bytes of server reply data
65	// every two request byte sless give room for one reply byte	67	// every two request bytes less give room for one reply byte
66		68
67	#define SEQNO_MASK 0xffff	69	#define SEQNO_MASK 0x3fff
68	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )	70	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69		71
70	#define MAX_LBL_SIZE 63	72	#define MAX_LBL_SIZE 63
71	#define MAX_PKT_SIZE 512	73	#define MAX_PKT_SIZE 512
72		74
…		…
265	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");	267	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
266		268
267	/////////////////////////////////////////////////////////////////////////////	269	/////////////////////////////////////////////////////////////////////////////
268		270
269	#define HDRSIZE 6	271	#define HDRSIZE 6
270		272
271	inline void encode_header (char *data, int clientid, int seqno)	273	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
272	{	274	{
273	u8 hdr[3] = { clientid, seqno >> 8, seqno };	275	seqno &= SEQNO_MASK;
		276
		277	u8 hdr[3] = {
		278	clientid,
		279	(seqno >> 8) \| (retry << 6),
		280	seqno,
		281	};
274		282
275	assert (clientid < 256);	283	assert (clientid < 256);
276		284
277	cdc26.encode (data, hdr, 3);	285	cdc26.encode (data, hdr, 3);
278	}	286	}
…		…
282	u8 hdr[3];	290	u8 hdr[3];
283		291
284	cdc26.decode (hdr, data, HDRSIZE);	292	cdc26.decode (hdr, data, HDRSIZE);
285		293
286	clientid = hdr[0];	294	clientid = hdr[0];
287	seqno = (hdr[1] << 8) \| hdr[2];	295	seqno = ((hdr[1] << 8) \| hdr[2]) & SEQNO_MASK;
288	}	296	}
289		297
290	/////////////////////////////////////////////////////////////////////////////	298	/////////////////////////////////////////////////////////////////////////////
291		299
292	struct byte_stream	300	struct byte_stream
…		…
321	}	329	}
322		330
323	void byte_stream::remove (int count)	331	void byte_stream::remove (int count)
324	{	332	{
325	if (count > fill)	333	if (count > fill)
326	abort ();	334	assert (count <= fill);
327		335
328	memmove (data, data + count, fill -= count);	336	memmove (data, data + count, fill -= count);
329	}	337	}
330		338
331	bool byte_stream::put (u8 *data, unsigned int datalen)	339	bool byte_stream::put (u8 *data, unsigned int datalen)
…		…
351	return true;	359	return true;
352	}	360	}
353		361
354	vpn_packet *byte_stream::get ()	362	vpn_packet *byte_stream::get ()
355	{	363	{
		364	unsigned int len;
		365
		366	for (;;)
		367	{
356	int len = (data [0] << 8) \| data [1];	368	len = (data [0] << 8) \| data [1];
357		369
358	if (len > MAXSIZE && fill >= 2)	370	if (len <= MAXSIZE \|\| fill < 2)
359	abort (); // TODO handle this gracefully, connection reset	371	break;
360		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
361	if (fill < len + 2)	378	if (fill < len + 2)
362	return 0;	379	return 0;
363		380
364	vpn_packet *pkt = new vpn_packet;	381	vpn_packet *pkt = new vpn_packet;
365		382
…		…
394	struct dns_cfg	411	struct dns_cfg
395	{	412	{
396	static int next_uid;	413	static int next_uid;
397		414
398	u8 id1, id2, id3, id4;	415	u8 id1, id2, id3, id4;
		416
399	u8 version;	417	u8 version;
		418	u8 flags;
400	u8 rrtype;	419	u8 rrtype;
401	u8 flags;
402	u8 def_ttl;	420	u8 def_ttl;
403	u8 rcv_cdc;	421
404	u8 snd_cdc;
405	u16 max_size;
406	u16 client;	422	u16 client;
407	u16 uid; // to make request unique	423	u16 uid; // to make request unique
408		424
409	u8 reserved[8];	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;
410		434
411	void reset (int clientid);	435	void reset (int clientid);
412	bool valid ();	436	bool valid ();
413	};	437	};
414		438
…		…
424	version = 1;	448	version = 1;
425		449
426	rrtype = RR_TYPE_TXT;	450	rrtype = RR_TYPE_TXT;
427	flags = 0;	451	flags = 0;
428	def_ttl = 0;	452	def_ttl = 0;
		453	seq_cdc = 26;
		454	req_cdc = 62;
429	rcv_cdc = 0;	455	rep_cdc = 0;
430	snd_cdc = 62;
431	max_size = ntohs (MAX_PKT_SIZE);	456	max_size = htons (MAX_PKT_SIZE);
432	client = ntohs (clientid);	457	client = htons (clientid);
433	uid = next_uid++;	458	uid = next_uid++;
		459	delay = 0;
434		460
435	memset (reserved, 0, 8);	461	r3 = r4 = 0;
		462	r4 = r5 = r6 = r7 = 0;
436	}	463	}
437		464
438	bool dns_cfg::valid ()	465	bool dns_cfg::valid ()
439	{	466	{
440	return id1 == 'G'	467	return id1 == 'G'
441	&& id2 == 'V'	468	&& id2 == 'V'
442	&& id3 == 'P'	469	&& id3 == 'P'
443	&& id4 == 'E'	470	&& id4 == 'E'
		471	&& seq_cdc == 26
		472	&& req_cdc == 62
		473	&& rep_cdc == 0
444	&& version == 1	474	&& version == 1;
445	&& flags == 0
446	&& rcv_cdc == 0
447	&& snd_cdc == 62
448	&& max_size == ntohs (MAX_PKT_SIZE);
449	}	475	}
450		476
451	struct dns_packet : net_packet	477	struct dns_packet : net_packet
452	{	478	{
453	u16 id;	479	u16 id;
454	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
455	u16 qdcount, ancount, nscount, arcount;	481	u16 qdcount, ancount, nscount, arcount;
456		482
457	u8 data[MAXSIZE - 6 * 2];	483	u8 data [MAXSIZE - 6 * 2];
458		484
459	int decode_label (char *data, int size, int &offs);	485	int decode_label (char *data, int size, int &offs);
460	};	486	};
461		487
462	int dns_packet::decode_label (char *data, int size, int &offs)	488	int dns_packet::decode_label (char *data, int size, int &offs)
…		…
493	return data - orig;	519	return data - orig;
494	}	520	}
495		521
496	/////////////////////////////////////////////////////////////////////////////	522	/////////////////////////////////////////////////////////////////////////////
497		523
498	struct dns_snd
499	{
500	dns_packet *pkt;
501	tstamp timeout, sent;
502	int retry;
503	struct dns_connection *dns;
504	int seqno;
505
506	dns_snd (dns_connection *dns);
507	void gen_stream_req (int seqno, byte_stream &stream);
508	void gen_syn_req (const dns_cfg &cfg);
509	};
510
511	static u16 dns_id = 12098; // TODO: should be per-vpn	524	static u16 dns_id = 0; // TODO: should be per-vpn
512		525
513	static u16 next_id ()	526	static u16 next_id ()
514	{	527	{
		528	if (!dns_id)
		529	dns_id = time (0);
		530
515	// the simplest lsfr with periodicity 65535 i could find	531	// the simplest lsfr with periodicity 65535 i could find
516	dns_id = (dns_id << 1)	532	dns_id = (dns_id << 1)
517	\| (((dns_id >> 1)	533	\| (((dns_id >> 1)
518	^ (dns_id >> 2)	534	^ (dns_id >> 2)
519	^ (dns_id >> 4)	535	^ (dns_id >> 4)
520	^ (dns_id >> 15)) & 1);	536	^ (dns_id >> 15)) & 1);
521		537
522	return dns_id;	538	return dns_id;
523	}	539	}
524		540
		541	struct dns_rcv;
		542	struct dns_snd;
		543
		544	struct dns_connection
		545	{
		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
525	dns_snd::dns_snd (dns_connection *dns)	586	dns_snd::dns_snd (dns_connection *dns)
526	: dns (dns)	587	: dns (dns)
527	{	588	{
528	timeout = 0;	589	timeout = 0;
529	retry = 0;	590	retry = 0;
530	seqno = 0;	591	seqno = 0;
		592	sent = NOW;
		593	stdhdr = false;
531		594
532	pkt = new dns_packet;	595	pkt = new dns_packet;
533		596
534	pkt->id = next_id ();	597	pkt->id = next_id ();
		598	}
		599
		600	dns_snd::~dns_snd ()
		601	{
		602	delete pkt;
535	}	603	}
536		604
537	static void append_domain (dns_packet &pkt, int &offs, const char *domain)	605	static void append_domain (dns_packet &pkt, int &offs, const char *domain)
538	{	606	{
539	// add tunnel domain	607	// add tunnel domain
…		…
557	}	625	}
558	}	626	}
559		627
560	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)	628	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
561	{	629	{
		630	stdhdr = true;
562	this->seqno = seqno;	631	this->seqno = seqno;
563		632
564	timeout = NOW + INITIAL_TIMEOUT;	633	timeout = NOW + INITIAL_TIMEOUT;
565		634
566	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	635	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
567	pkt->qdcount = htons (1);	636	pkt->qdcount = htons (1);
568		637
569	int offs = 6*2;	638	int offs = 6*2;
570	int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);	639	int dlen = MAX_DOMAIN_SIZE - (strlen (dns->c->conf->domain) + 2);
571	// 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,
572	// 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
573		642
574	char enc[256], *encp = enc;	643	char enc[256], *encp = enc;
575	encode_header (enc, THISNODE->id, seqno);	644	encode_header (enc, THISNODE->id, seqno);
…		…
593	encp += lbllen;	662	encp += lbllen;
594		663
595	enclen -= lbllen;	664	enclen -= lbllen;
596	}	665	}
597		666
598	append_domain (*pkt, offs, THISNODE->domain);	667	append_domain (*pkt, offs, dns->c->conf->domain);
599		668
600	(*pkt)[offs++] = 0;	669	(*pkt)[offs++] = 0;
601	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;	670	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
602	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	671	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
603		672
604	pkt->len = offs;	673	pkt->len = offs;
605	}	674	}
606		675
607	void dns_snd::gen_syn_req (const dns_cfg &cfg)	676	void dns_snd::gen_syn_req ()
608	{	677	{
609	timeout = NOW + INITIAL_SYN_TIMEOUT;	678	timeout = NOW + INITIAL_SYN_TIMEOUT;
610		679
611	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	680	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
612	pkt->qdcount = htons (1);	681	pkt->qdcount = htons (1);
613		682
614	int offs = 6*2;	683	int offs = 6 * 2;
615		684
616	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&cfg, sizeof (dns_cfg));	685	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&dns->cfg, sizeof (dns_cfg));
617		686
618	assert (elen <= MAX_LBL_SIZE);	687	assert (elen <= MAX_LBL_SIZE);
619		688
620	(*pkt)[offs] = elen;	689	(*pkt)[offs] = elen;
621	offs += elen + 1;	690	offs += elen + 1;
622	append_domain (*pkt, offs, THISNODE->domain);	691	append_domain (*pkt, offs, dns->c->conf->domain);
623		692
624	(*pkt)[offs++] = 0;	693	(*pkt)[offs++] = 0;
625	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;	694	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;
626	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	695	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
627		696
…		…
650	delete pkt;	719	delete pkt;
651	}	720	}
652		721
653	/////////////////////////////////////////////////////////////////////////////	722	/////////////////////////////////////////////////////////////////////////////
654		723
655	struct dns_connection
656	{
657	connection *c;
658	struct vpn *vpn;
659
660	dns_cfg cfg;
661
662	bool established;
663
664	tstamp last_received;
665	tstamp last_sent;
666	double poll_interval, send_interval;
667
668	vector<dns_rcv *> rcvpq;
669
670	byte_stream rcvdq; int rcvseq;
671	byte_stream snddq; int sndseq;
672
673	void time_cb (time_watcher &w); time_watcher tw;
674	void receive_rep (dns_rcv *r);
675
676	dns_connection (connection *c);
677	~dns_connection ();
678	};
679
680	dns_connection::dns_connection (connection *c)	724	dns_connection::dns_connection (connection *c)
681	: c (c)	725	: c (c)
682	, rcvdq (MAX_BACKLOG * 2)	726	, rcvdq (MAX_BACKLOG * 2)
683	, snddq (MAX_BACKLOG * 2)	727	, snddq (MAX_BACKLOG)
684	, tw (this, &dns_connection::time_cb)	728	, tw (this, &dns_connection::time_cb)
685	{	729	{
686	vpn = c->vpn;	730	vpn = c->vpn;
687		731
688	established = false;	732	established = false;
689		733
690	rcvseq = sndseq = 0;	734	rcvseq = repseq = sndseq = 0;
691		735
692	last_sent = last_received = 0;	736	last_sent = last_received = 0;
693	poll_interval = MIN_POLL_INTERVAL;	737	poll_interval = 0.5; // starting here
694	send_interval = 0.2; // starting rate	738	send_interval = 0.5; // starting rate
		739	min_latency = INITIAL_TIMEOUT;
695	}	740	}
696		741
697	dns_connection::~dns_connection ()	742	dns_connection::~dns_connection ()
698	{	743	{
699	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();	744	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
…		…
707	if (r->datalen)	752	if (r->datalen)
708	{	753	{
709	last_received = NOW;	754	last_received = NOW;
710	tw.trigger ();	755	tw.trigger ();
711		756
712	poll_interval *= 0.99;	757	poll_interval = send_interval;
713	if (poll_interval > MIN_POLL_INTERVAL)
714	poll_interval = MIN_POLL_INTERVAL;
715	}	758	}
716	else	759	else
717	{	760	{
718	poll_interval *= 1.1;	761	poll_interval *= 1.5;
		762
719	if (poll_interval > MAX_POLL_INTERVAL)	763	if (poll_interval > MAX_POLL_INTERVAL)
720	poll_interval = MAX_POLL_INTERVAL;	764	poll_interval = MAX_POLL_INTERVAL;
721	}	765	}
722		766
723	rcvpq.push_back (r);	767	rcvpq.push_back (r);
…		…
741	}	785	}
742		786
743	rcvseq = (rcvseq + 1) & SEQNO_MASK;	787	rcvseq = (rcvseq + 1) & SEQNO_MASK;
744		788
745	if (!rcvdq.put (r->data, r->datalen))	789	if (!rcvdq.put (r->data, r->datalen))
		790	{
		791	slog (L_ERR, "DNS: !rcvdq.put (r->data, r->datalen)");
746	abort (); // MUST never overflow, can be caused by data corruption, TODO	792	abort (); // MUST never overflow, can be caused by data corruption, TODO
		793	}
747		794
748	while (vpn_packet *pkt = rcvdq.get ())	795	while (vpn_packet *pkt = rcvdq.get ())
749	{	796	{
750	sockinfo si;	797	sockinfo si;
751	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;	798	si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;
752		799
753	vpn->recv_vpn_packet (pkt, si);	800	vpn->recv_vpn_packet (pkt, si);
		801
		802	delete pkt;
754	}	803	}
755		804
756	// check for further packets	805	// check for further packets
757	goto redo;	806	goto redo;
758	}	807	}
…		…
768	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	817	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
769		818
770	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))	819	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))
771	&& pkt.qdcount == htons (1))	820	&& pkt.qdcount == htons (1))
772	{	821	{
773	char qname[MAXSIZE];	822	char qname [MAXSIZE];
774	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);	823	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
775		824
776	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];	825	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
777	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];	826	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
778		827
779	pkt.qdcount = htons (1);	828	pkt.qdcount = htons (1);
780	pkt.ancount = 0;	829	pkt.ancount = 0;
781	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
782	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
783		832
784	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);	833	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_SERVFAIL);
785		834
786	int dlen = strlen (THISNODE->domain);	835	int dlen = strlen (THISNODE->domain);
787		836
788	if (qclass == RR_CLASS_IN	837	if (qclass == RR_CLASS_IN
789	&& qlen > dlen + 1	838	&& qlen > dlen + 1
790	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	839	&& !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
791	{	840	{
792	// now generate reply	841	// now generate reply
793	pkt.ancount = htons (1); // one answer RR	842	pkt.ancount = htons (1); // one answer RR
794	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);	843	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
795		844
…		…
817	if (SEQNO_EQ ((*i)->seqno, seqno))	866	if (SEQNO_EQ ((*i)->seqno, seqno))
818	{	867	{
819	// already seen that request: simply reply with the cached reply	868	// already seen that request: simply reply with the cached reply
820	dns_rcv r = i;	869	dns_rcv r = i;
821		870
822	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D	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;
823		876
824	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);	877	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
825	pkt.id = r->pkt->id;	878
826	goto duplicate_request;	879	goto duplicate_request;
827	}	880	}
828		881
829	// new packet, queue	882	// new packet, queue
830	rcv = new dns_rcv (seqno, data, datalen);	883	rcv = new dns_rcv (seqno, data, datalen);
831	dns->receive_rep (rcv);	884	dns->receive_rep (rcv);
832	}	885	}
833		886
		887	{
834	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section	888	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
835		889
836	// type
837	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;	890	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
838	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype;	891	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type
839
840	// class
841	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN;	892	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
842
843	// TTL
844	pkt [offs++] = 0; pkt [offs++] = 0;	893	pkt [offs++] = 0; pkt [offs++] = 0;
845	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0;	894	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
846		895
847	int rdlen_offs = offs += 2;	896	int rdlen_offs = offs += 2;
848		897
		898	if (dns)
		899	{
849	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;	900	int dlen = ntohs (dns->cfg.max_size) - offs;
		901
850	// bind doesn't compress well, so reduce further by one label length	902	// bind doesn't compress well, so reduce further by one label length
851	dlen -= qlen;	903	dlen -= qlen;
852		904
853	if (dns)	905	// only put data into in-order sequence packets, if
854	{	906	// we receive out-of-order packets we generate empty
855	while (dlen > 1 && !dns->snddq.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)
856	{	910	{
		911	dns->repseq = seqno;
		912
		913	while (dlen > 1 && !dns->snddq.empty ())
		914	{
857	int txtlen = dlen <= 255 ? dlen - 1 : 255;	915	int txtlen = dlen <= 255 ? dlen - 1 : 255;
858		916
859	if (txtlen > dns->snddq.size ())	917	if (txtlen > dns->snddq.size ())
860	txtlen = dns->snddq.size ();	918	txtlen = dns->snddq.size ();
861		919
862	pkt[offs++] = txtlen;	920	pkt[offs++] = txtlen;
863	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);	921	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
864	offs += txtlen;	922	offs += txtlen;
865	dns->snddq.remove (txtlen);	923	dns->snddq.remove (txtlen);
866		924
867	dlen -= txtlen + 1;	925	dlen -= txtlen + 1;
		926	}
868	}	927	}
869		928
870	// avoid empty TXT rdata	929	// avoid completely empty TXT rdata
871	if (offs == rdlen_offs)	930	if (offs == rdlen_offs)
872	pkt[offs++] = 0;	931	pkt[offs++] = 0;
		932
		933	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
873	}	934	}
874	else	935	else
875	{	936	{
876	// send RST	937	// send RST
877	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	938	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
878	pkt [offs++] = CMD_IP_RST;	939	pkt [offs++] = CMD_IP_RST;
879	}	940	}
880		941
881	int rdlen = offs - rdlen_offs;	942	int rdlen = offs - rdlen_offs;
882		943
883	pkt [rdlen_offs - 2] = rdlen >> 8;	944	pkt [rdlen_offs - 2] = rdlen >> 8;
884	pkt [rdlen_offs - 1] = rdlen;	945	pkt [rdlen_offs - 1] = rdlen;
885		946
886	if (dns)	947	if (dns)
887	{	948	{
888	// now update dns_rcv copy	949	// now update dns_rcv copy
889	rcv->pkt->len = offs;	950	rcv->pkt->len = offs;
890	memcpy (rcv->pkt->at (0), pkt.at (0), offs);	951	memcpy (rcv->pkt->at (0), pkt.at (0), offs);
891	}	952	}
		953	}
892		954
893	duplicate_request: ;	955	duplicate_request: ;
894	}	956	}
895	else	957	else
896	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	958	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
…		…
908	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class	970	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
909	pkt [offs++] = 0; pkt [offs++] = 0;	971	pkt [offs++] = 0; pkt [offs++] = 0;
910	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL	972	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
911	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength	973	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
912		974
913	slog (L_INFO, _("DNS tunnel: client %d tries to connect"), client);	975	slog (L_INFO, _("DNS: client %d connects"), client);
914		976
915	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	977	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
916	pkt [offs++] = CMD_IP_REJ;	978	pkt [offs++] = CMD_IP_REJ;
917		979
918	if (0 < client && client <= conns.size ())	980	if (0 < client && client <= conns.size ())
…		…
949	i != dns_sndpq.end ();	1011	i != dns_sndpq.end ();
950	++i)	1012	++i)
951	if ((*i)->pkt->id == pkt.id)	1013	if ((*i)->pkt->id == pkt.id)
952	{	1014	{
953	dns_connection dns = (i)->dns;	1015	dns_connection dns = (i)->dns;
		1016	connection *c = dns->c;
954	int seqno = (*i)->seqno;	1017	int seqno = (*i)->seqno;
955	u8 data[MAXSIZE], *datap = data;	1018	u8 data[MAXSIZE], *datap = data;
956		1019
957	if ((*i)->retry)	1020	if ((*i)->retry)
958	{	1021	{
959	dns->send_interval *= 1.01;	1022	dns->send_interval *= 1.01;
960	if (dns->send_interval < MAX_SEND_INTERVAL)	1023	if (dns->send_interval > MAX_SEND_INTERVAL)
961	dns->send_interval = MAX_SEND_INTERVAL;	1024	dns->send_interval = MAX_SEND_INTERVAL;
962	}	1025	}
963	else	1026	else
964	{	1027	{
		1028	#if 0
965	dns->send_interval *= 0.99;	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
966	if (dns->send_interval < MIN_SEND_INTERVAL)	1041	if (dns->send_interval < MIN_SEND_INTERVAL)
967	dns->send_interval = MIN_SEND_INTERVAL;	1042	dns->send_interval = MIN_SEND_INTERVAL;
968
969	// the latency surely puts an upper bound on
970	// the minimum send interval
971	if (dns->send_interval > NOW - (*i)->sent)
972	dns->send_interval = NOW - (*i)->sent;
973	}	1043	}
974		1044
975	delete *i;	1045	delete *i;
976	dns_sndpq.erase (i);	1046	dns_sndpq.erase (i);
977		1047
…		…
1027		1097
1028	if (ip [0] == CMD_IP_1	1098	if (ip [0] == CMD_IP_1
1029	&& ip [1] == CMD_IP_2	1099	&& ip [1] == CMD_IP_2
1030	&& ip [2] == CMD_IP_3)	1100	&& ip [2] == CMD_IP_3)
1031	{	1101	{
1032	slog (L_TRACE, _("got tunnel meta command %02x"), ip [3]);	1102	slog (L_TRACE, _("DNS: got tunnel meta command %02x"), ip [3]);
1033		1103
1034	if (ip [3] == CMD_IP_RST)	1104	if (ip [3] == CMD_IP_RST)
1035	{	1105	{
1036	slog (L_DEBUG, _("got tunnel RST request"));	1106	slog (L_DEBUG, _("DNS: got tunnel RST request"));
1037		1107
1038	connection *c = dns->c;
1039	delete c->dns; c->dns = 0;	1108	delete dns; c->dns = 0;
1040		1109
1041	return;	1110	return;
1042	}	1111	}
1043	else if (ip [3] == CMD_IP_SYN)	1112	else if (ip [3] == CMD_IP_SYN)
		1113	{
		1114	slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us."));
1044	dns->established = true;	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	}
1045	else	1122	else
1046	slog (L_INFO, _("got unknown meta command %02x"), ip [3]);	1123	slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]);
1047	}	1124	}
1048	else	1125	else
1049	slog (L_INFO, _("got spurious a record %d.%d.%d.%d"),	1126	slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"),
1050	ip [0], ip [1], ip [2], ip [3]);	1127	ip [0], ip [1], ip [2], ip [3]);
1051		1128
1052	return;	1129	return;
1053	}	1130	}
1054		1131
1055	int client, rseqno;	1132	int client, rseqno;
1056	decode_header (qname, client, rseqno);	1133	decode_header (qname, client, rseqno);
1057		1134
1058	if (client != THISNODE->id)	1135	if (client != THISNODE->id)
1059	{	1136	{
1060	slog (L_INFO, _("got dns tunnel response with wrong clientid, ignoring"));	1137	slog (L_INFO, _("DNS: got dns tunnel response with wrong clientid, ignoring"));
1061	datap = 0;	1138	datap = 0;
1062	}	1139	}
1063	else if (rseqno != seqno)	1140	else if (rseqno != seqno)
1064	{	1141	{
1065	slog (L_DEBUG, _("got dns tunnel response with wrong seqno, badly caching nameserver?"));	1142	slog (L_DEBUG, _("DNS: got dns tunnel response with wrong seqno, badly caching nameserver?"));
1066	datap = 0;	1143	datap = 0;
1067	}	1144	}
1068	}	1145	}
1069	}	1146	}
1070		1147
…		…
1087		1164
1088	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);	1165	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1089		1166
1090	if (pkt->len > 0)	1167	if (pkt->len > 0)
1091	{	1168	{
1092	if (THISNODE->dns_port)	1169	if (ntohs (pkt->flags) & FLAG_RESPONSE)
		1170	dnsv4_client (*pkt);
		1171	else
1093	{	1172	{
1094	dnsv4_server (*pkt);	1173	dnsv4_server (*pkt);
1095	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);	1174	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1096	}	1175	}
1097	else
1098	dnsv4_client (*pkt);
1099		1176
1100	delete pkt;	1177	delete pkt;
1101	}	1178	}
1102	}	1179	}
1103	}	1180	}
1104		1181
1105	bool	1182	bool
1106	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)
1107	{	1184	{
		1185	int client = ntohs (si.port);
		1186
		1187	assert (0 < client && client <= conns.size ());
		1188
		1189	connection *c = conns [client - 1];
		1190
1108	if (!dns)	1191	if (!c->dns)
1109	dns = new dns_connection (this);	1192	c->dns = new dns_connection (c);
1110		1193
1111	if (!dns->snddq.put (pkt))	1194	if (c->dns->snddq.put (pkt))
1112	return false;
1113
1114	dns->tw.trigger ();	1195	c->dns->tw.trigger ();
1115		1196
		1197	// always return true even if the buffer overflows
1116	return true;	1198	return true;
		1199	}
		1200
		1201	void
		1202	connection::dnsv4_reset_connection ()
		1203	{
		1204	//delete dns; dns = 0; //TODO
1117	}	1205	}
1118		1206
1119	#define NEXT(w) do { if (next > (w)) next = w; } while (0)	1207	#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1120		1208
1121	void	1209	void
…		…
1140	if (!send)	1228	if (!send)
1141	{	1229	{
1142	send = r;	1230	send = r;
1143		1231
1144	r->retry++;	1232	r->retry++;
1145	r->timeout = 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	}
1146	}	1242	}
1147	}	1243	}
1148	else if (r->timeout < next)	1244	else
1149	NEXT (r->timeout);	1245	NEXT (r->timeout);
1150	}	1246	}
1151		1247
1152	if (last_sent + send_interval <= NOW)
1153	{
1154	if (!send)	1248	if (!send)
		1249	{
		1250	// generate a new packet, if wise
		1251
		1252	if (!established)
1155	{	1253	{
1156	// generate a new packet, if wise
1157
1158	if (!established)
1159	{
1160	if (vpn->dns_sndpq.empty ())	1254	if (vpn->dns_sndpq.empty ())
1161	{
1162	send = new dns_snd (this);
1163
1164	cfg.reset (THISNODE->id);
1165	send->gen_syn_req (cfg);
1166	}
1167	}
1168	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING)
1169	{	1255	{
1170	send = new dns_snd (this);	1256	send = new dns_snd (this);
		1257
		1258	cfg.reset (THISNODE->id);
		1259	send->gen_syn_req ();
		1260	}
		1261	}
		1262	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
		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
		1274	send = new dns_snd (this);
1171	send->gen_stream_req (sndseq, snddq);	1275	send->gen_stream_req (sndseq, snddq);
		1276	send->timeout = NOW + min_latency * TIMEOUT_FACTOR;
1172		1277
1173	sndseq = (sndseq + 1) & SEQNO_MASK;	1278	sndseq = (sndseq + 1) & SEQNO_MASK;
1174	}	1279	}
1175		1280	else
1176	if (send)	1281	NEXT (last_sent + send_interval);
1177	vpn->dns_sndpq.push_back (send);
1178	}	1282	}
1179		1283
1180	if (send)	1284	if (send)
1181	{	1285	vpn->dns_sndpq.push_back (send);
1182	printf ("send pkt\n");	1286	}
		1287
		1288	if (send)
		1289	{
1183	last_sent = NOW;	1290	last_sent = NOW;
1184		1291	if (rand () & 15 != 0)//D
1185	if (!send->retry)
1186	send->sent = NOW;
1187
1188	sendto (vpn->dnsv4_fd,	1292	sendto (vpn->dnsv4_fd,
1189	send->pkt->at (0), send->pkt->len, 0,	1293	send->pkt->at (0), send->pkt->len, 0,
1190	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());	1294	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1191	}
1192	}	1295	}
1193	else
1194	NEXT (last_sent + send_interval);
1195		1296
1196	printf ("pi %f si %f N %f (%d:%d)\n", poll_interval, send_interval, next - NOW, vpn->dns_sndpq.size (), snddq.size ());	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;
1197		1305
1198	w.start (next);	1306	w.start (next);
1199	}	1307	}
1200		1308
1201	#endif	1309	#endif

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.10 by pcg, Fri Mar 4 08:15:04 2005 UTC vs. Revision 1.32 by pcg, Tue Mar 15 18:15:39 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.10 by pcg, Fri Mar 4 08:15:04 2005 UTC vs.
Revision 1.32 by pcg, Tue Mar 15 18:15:39 2005 UTC