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