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