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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.17 by pcg, Sat Mar 5 03:47:05 2005 UTC vs.
Revision 1.25 by pcg, Mon Mar 7 22:24:24 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>
…		…
53	#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn	54	#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn
54		55
55	#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests	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 0.5 // optimistic?
57		58
		59	#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate
58	#define MAX_OUTSTANDING 10 // max. outstanding requests	60	#define MAX_OUTSTANDING 20 // max. outstanding requests
59	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog	61	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
60	#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE	62	#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
61		63
62	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well	64	#define MAX_DOMAIN_SIZE 200 // 255 is legal limit, but bind doesn't compress well
63	// 240 leaves about 4 bytes of server reply data	65	// 240 leaves about 4 bytes of server reply data
64	// every two request bytes less give room for one reply byte	66	// every two request bytes less give room for one reply byte
65		67
66	#define SEQNO_MASK 0x3fff	68	#define SEQNO_MASK 0x3fff
67	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )	69	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
…		…
264	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");	266	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
265		267
266	/////////////////////////////////////////////////////////////////////////////	268	/////////////////////////////////////////////////////////////////////////////
267		269
268	#define HDRSIZE 6	270	#define HDRSIZE 6
269		271
270	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)	272	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
271	{	273	{
272	seqno &= SEQNO_MASK;	274	seqno &= SEQNO_MASK;
273		275
274	u8 hdr[3] = {	276	u8 hdr[3] = {
…		…
356	return true;	358	return true;
357	}	359	}
358		360
359	vpn_packet *byte_stream::get ()	361	vpn_packet *byte_stream::get ()
360	{	362	{
		363	unsigned int len;
		364
		365	for (;;)
		366	{
361	unsigned int len = (data [0] << 8) \| data [1];	367	len = (data [0] << 8) \| data [1];
362		368
363	if (len > MAXSIZE && fill >= 2)	369	if (len <= MAXSIZE \|\| fill < 2)
364	assert (len <= MAXSIZE \|\| fill < 2); // TODO handle this gracefully, connection reset	370	break;
365		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
366	if (fill < len + 2)	377	if (fill < len + 2)
367	return 0;	378	return 0;
368		379
369	vpn_packet *pkt = new vpn_packet;	380	vpn_packet *pkt = new vpn_packet;
370		381
…		…
399	struct dns_cfg	410	struct dns_cfg
400	{	411	{
401	static int next_uid;	412	static int next_uid;
402		413
403	u8 id1, id2, id3, id4;	414	u8 id1, id2, id3, id4;
		415
404	u8 version;	416	u8 version;
		417	u8 flags;
405	u8 rrtype;	418	u8 rrtype;
406	u8 flags;
407	u8 def_ttl;	419	u8 def_ttl;
408	u8 rcv_cdc;	420
409	u8 snd_cdc;
410	u16 max_size;
411	u16 client;	421	u16 client;
412	u16 uid; // to make request unique	422	u16 uid; // to make request unique
413		423
414	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;
415		432
416	void reset (int clientid);	433	void reset (int clientid);
417	bool valid ();	434	bool valid ();
418	};	435	};
419		436
…		…
428		445
429	version = 1;	446	version = 1;
430		447
431	rrtype = RR_TYPE_TXT;	448	rrtype = RR_TYPE_TXT;
432	flags = 0;	449	flags = 0;
433	def_ttl = 1;	450	def_ttl = 0;
		451	seq_cdc = 26;
		452	req_cdc = 62;
434	rcv_cdc = 0;	453	rep_cdc = 0;
435	snd_cdc = 62;
436	max_size = ntohs (MAX_PKT_SIZE);	454	max_size = ntohs (MAX_PKT_SIZE);
437	client = ntohs (clientid);	455	client = ntohs (clientid);
438	uid = next_uid++;	456	uid = next_uid++;
439		457
440	memset (reserved, 0, 8);	458	r2 = r3 = r4 = 0;
		459	r4 = r5 = r6 = r7 = 0;
441	}	460	}
442		461
443	bool dns_cfg::valid ()	462	bool dns_cfg::valid ()
444	{	463	{
445	return id1 == 'G'	464	return id1 == 'G'
446	&& id2 == 'V'	465	&& id2 == 'V'
447	&& id3 == 'P'	466	&& id3 == 'P'
448	&& id4 == 'E'	467	&& id4 == 'E'
		468	&& seq_cdc == 26
		469	&& req_cdc == 62
		470	&& rep_cdc == 0
449	&& version == 1	471	&& version == 1
450	&& flags == 0
451	&& rcv_cdc == 0
452	&& snd_cdc == 62
453	&& max_size == ntohs (MAX_PKT_SIZE);	472	&& max_size == ntohs (MAX_PKT_SIZE);
454	}	473	}
455		474
456	struct dns_packet : net_packet	475	struct dns_packet : net_packet
457	{	476	{
458	u16 id;	477	u16 id;
459	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	478	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
460	u16 qdcount, ancount, nscount, arcount;	479	u16 qdcount, ancount, nscount, arcount;
461		480
462	u8 data[MAXSIZE - 6 * 2];	481	u8 data [MAXSIZE - 6 * 2];
463		482
464	int decode_label (char *data, int size, int &offs);	483	int decode_label (char *data, int size, int &offs);
465	};	484	};
466		485
467	int dns_packet::decode_label (char *data, int size, int &offs)	486	int dns_packet::decode_label (char *data, int size, int &offs)
…		…
498	return data - orig;	517	return data - orig;
499	}	518	}
500		519
501	/////////////////////////////////////////////////////////////////////////////	520	/////////////////////////////////////////////////////////////////////////////
502		521
		522	static u16 dns_id = 0; // TODO: should be per-vpn
		523
		524	static u16 next_id ()
		525	{
		526	if (!dns_id)
		527	dns_id = time (0);
		528
		529	// the simplest lsfr with periodicity 65535 i could find
		530	dns_id = (dns_id << 1)
		531	\| (((dns_id >> 1)
		532	^ (dns_id >> 2)
		533	^ (dns_id >> 4)
		534	^ (dns_id >> 15)) & 1);
		535
		536	return dns_id;
		537	}
		538
		539	struct dns_rcv;
		540	struct dns_snd;
		541
		542	struct dns_connection
		543	{
		544	connection *c;
		545	struct vpn *vpn;
		546
		547	dns_cfg cfg;
		548
		549	bool established;
		550
		551	tstamp last_received;
		552	tstamp last_sent;
		553	double min_latency;
		554	double poll_interval, send_interval;
		555
		556	vector<dns_rcv *> rcvpq;
		557
		558	byte_stream rcvdq; int rcvseq;
		559	byte_stream snddq; int sndseq;
		560
		561	void time_cb (time_watcher &w); time_watcher tw;
		562	void receive_rep (dns_rcv *r);
		563
		564	dns_connection (connection *c);
		565	~dns_connection ();
		566	};
		567
503	struct dns_snd	568	struct dns_snd
504	{	569	{
505	dns_packet *pkt;	570	dns_packet *pkt;
506	tstamp timeout, sent;	571	tstamp timeout, sent;
507	int retry;	572	int retry;
508	struct dns_connection *dns;	573	struct dns_connection *dns;
509	int seqno;	574	int seqno;
510	bool stdhdr;	575	bool stdhdr;
511		576
512	void gen_stream_req (int seqno, byte_stream &stream);	577	void gen_stream_req (int seqno, byte_stream &stream);
513	void gen_syn_req (const dns_cfg &cfg);	578	void gen_syn_req ();
514		579
515	dns_snd (dns_connection *dns);	580	dns_snd (dns_connection *dns);
516	~dns_snd ();	581	~dns_snd ();
517	};	582	};
518
519	static u16 dns_id = 12098; // TODO: should be per-vpn
520
521	static u16 next_id ()
522	{
523	// the simplest lsfr with periodicity 65535 i could find
524	dns_id = (dns_id << 1)
525	\| (((dns_id >> 1)
526	^ (dns_id >> 2)
527	^ (dns_id >> 4)
528	^ (dns_id >> 15)) & 1);
529
530	return dns_id;
531	}
532		583
533	dns_snd::dns_snd (dns_connection *dns)	584	dns_snd::dns_snd (dns_connection *dns)
534	: dns (dns)	585	: dns (dns)
535	{	586	{
536	timeout = 0;	587	timeout = 0;
…		…
581		632
582	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	633	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
583	pkt->qdcount = htons (1);	634	pkt->qdcount = htons (1);
584		635
585	int offs = 6*2;	636	int offs = 6*2;
586	int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);	637	int dlen = MAX_DOMAIN_SIZE - (strlen (dns->c->conf->domain) + 2);
587	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,	638	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,
588	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra	639	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
589		640
590	char enc[256], *encp = enc;	641	char enc[256], *encp = enc;
591	encode_header (enc, THISNODE->id, seqno);	642	encode_header (enc, THISNODE->id, seqno);
…		…
609	encp += lbllen;	660	encp += lbllen;
610		661
611	enclen -= lbllen;	662	enclen -= lbllen;
612	}	663	}
613		664
614	append_domain (*pkt, offs, THISNODE->domain);	665	append_domain (*pkt, offs, dns->c->conf->domain);
615		666
616	(*pkt)[offs++] = 0;	667	(*pkt)[offs++] = 0;
617	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;	668	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
618	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	669	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
619		670
620	pkt->len = offs;	671	pkt->len = offs;
621	}	672	}
622		673
623	void dns_snd::gen_syn_req (const dns_cfg &cfg)	674	void dns_snd::gen_syn_req ()
624	{	675	{
625	timeout = NOW + INITIAL_SYN_TIMEOUT;	676	timeout = NOW + INITIAL_SYN_TIMEOUT;
626		677
627	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	678	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
628	pkt->qdcount = htons (1);	679	pkt->qdcount = htons (1);
629		680
630	int offs = 6*2;	681	int offs = 6 * 2;
631		682
632	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&cfg, sizeof (dns_cfg));	683	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&dns->cfg, sizeof (dns_cfg));
633		684
634	assert (elen <= MAX_LBL_SIZE);	685	assert (elen <= MAX_LBL_SIZE);
635		686
636	(*pkt)[offs] = elen;	687	(*pkt)[offs] = elen;
637	offs += elen + 1;	688	offs += elen + 1;
638	append_domain (*pkt, offs, THISNODE->domain);	689	append_domain (*pkt, offs, dns->c->conf->domain);
639		690
640	(*pkt)[offs++] = 0;	691	(*pkt)[offs++] = 0;
641	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;	692	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;
642	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	693	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
643		694
…		…
666	delete pkt;	717	delete pkt;
667	}	718	}
668		719
669	/////////////////////////////////////////////////////////////////////////////	720	/////////////////////////////////////////////////////////////////////////////
670		721
671	struct dns_connection
672	{
673	connection *c;
674	struct vpn *vpn;
675
676	dns_cfg cfg;
677
678	bool established;
679
680	tstamp last_received;
681	tstamp last_sent;
682	double last_latency;
683	double poll_interval, send_interval;
684
685	vector<dns_rcv *> rcvpq;
686
687	byte_stream rcvdq; int rcvseq;
688	byte_stream snddq; int sndseq;
689
690	void time_cb (time_watcher &w); time_watcher tw;
691	void receive_rep (dns_rcv *r);
692
693	dns_connection (connection *c);
694	~dns_connection ();
695	};
696
697	dns_connection::dns_connection (connection *c)	722	dns_connection::dns_connection (connection *c)
698	: c (c)	723	: c (c)
699	, rcvdq (MAX_BACKLOG * 2)	724	, rcvdq (MAX_BACKLOG * 2)
700	, snddq (MAX_BACKLOG * 2)	725	, snddq (MAX_BACKLOG * 2)
701	, tw (this, &dns_connection::time_cb)	726	, tw (this, &dns_connection::time_cb)
…		…
707	rcvseq = sndseq = 0;	732	rcvseq = sndseq = 0;
708		733
709	last_sent = last_received = 0;	734	last_sent = last_received = 0;
710	poll_interval = MIN_POLL_INTERVAL;	735	poll_interval = MIN_POLL_INTERVAL;
711	send_interval = 0.5; // starting rate	736	send_interval = 0.5; // starting rate
712	last_latency = INITIAL_TIMEOUT;	737	min_latency = INITIAL_TIMEOUT;
713	}	738	}
714		739
715	dns_connection::~dns_connection ()	740	dns_connection::~dns_connection ()
716	{	741	{
717	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();	742	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
…		…
730	poll_interval = send_interval;	755	poll_interval = send_interval;
731	}	756	}
732	else	757	else
733	{	758	{
734	poll_interval *= 1.5;	759	poll_interval *= 1.5;
		760
735	if (poll_interval > MAX_POLL_INTERVAL)	761	if (poll_interval > MAX_POLL_INTERVAL)
736	poll_interval = MAX_POLL_INTERVAL;	762	poll_interval = MAX_POLL_INTERVAL;
737	}	763	}
738		764
739	rcvpq.push_back (r);	765	rcvpq.push_back (r);
…		…
765	}	791	}
766		792
767	while (vpn_packet *pkt = rcvdq.get ())	793	while (vpn_packet *pkt = rcvdq.get ())
768	{	794	{
769	sockinfo si;	795	sockinfo si;
770	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;	796	si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;
771		797
772	vpn->recv_vpn_packet (pkt, si);	798	vpn->recv_vpn_packet (pkt, si);
773		799
774	delete pkt;	800	delete pkt;
775	}	801	}
…		…
789	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	815	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
790		816
791	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))	817	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))
792	&& pkt.qdcount == htons (1))	818	&& pkt.qdcount == htons (1))
793	{	819	{
794	char qname[MAXSIZE];	820	char qname [MAXSIZE];
795	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);	821	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
796		822
797	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];	823	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
798	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];	824	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
799		825
…		…
806		832
807	int dlen = strlen (THISNODE->domain);	833	int dlen = strlen (THISNODE->domain);
808		834
809	if (qclass == RR_CLASS_IN	835	if (qclass == RR_CLASS_IN
810	&& qlen > dlen + 1	836	&& qlen > dlen + 1
811	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	837	&& !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
812	{	838	{
813	// now generate reply	839	// now generate reply
814	pkt.ancount = htons (1); // one answer RR	840	pkt.ancount = htons (1); // one answer RR
815	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);	841	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
816		842
…		…
857	// new packet, queue	883	// new packet, queue
858	rcv = new dns_rcv (seqno, data, datalen);	884	rcv = new dns_rcv (seqno, data, datalen);
859	dns->receive_rep (rcv);	885	dns->receive_rep (rcv);
860	}	886	}
861		887
		888	{
862	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section	889	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
863		890
864	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;	891	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
865	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type	892	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type
866	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class	893	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
867	pkt [offs++] = 0; pkt [offs++] = 0;	894	pkt [offs++] = 0; pkt [offs++] = 0;
868	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL	895	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
869		896
870	int rdlen_offs = offs += 2;	897	int rdlen_offs = offs += 2;
871		898
872	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;	899	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;
873	// bind doesn't compress well, so reduce further by one label length	900	// bind doesn't compress well, so reduce further by one label length
874	dlen -= qlen;	901	dlen -= qlen;
875		902
876	if (dns)	903	if (dns)
877	{	904	{
878	// only put data into in-order sequence packets, if	905	// only put data into in-order sequence packets, if
879	// we receive out-of-order packets we generate empty	906	// we receive out-of-order packets we generate empty
880	// replies	907	// replies
881	while (dlen > 1 && !dns->snddq.empty () && in_seq)	908	while (dlen > 1 && !dns->snddq.empty () && in_seq)
882	{	909	{
883	int txtlen = dlen <= 255 ? dlen - 1 : 255;	910	int txtlen = dlen <= 255 ? dlen - 1 : 255;
884		911
885	if (txtlen > dns->snddq.size ())	912	if (txtlen > dns->snddq.size ())
886	txtlen = dns->snddq.size ();	913	txtlen = dns->snddq.size ();
887		914
888	pkt[offs++] = txtlen;	915	pkt[offs++] = txtlen;
889	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);	916	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
890	offs += txtlen;	917	offs += txtlen;
891	dns->snddq.remove (txtlen);	918	dns->snddq.remove (txtlen);
892		919
893	dlen -= txtlen + 1;	920	dlen -= txtlen + 1;
894	}	921	}
895		922
896	// avoid empty TXT rdata	923	// avoid empty TXT rdata
897	if (offs == rdlen_offs)	924	if (offs == rdlen_offs)
898	pkt[offs++] = 0;	925	pkt[offs++] = 0;
899		926
900	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());	927	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
901	}	928	}
902	else	929	else
903	{	930	{
904	// send RST	931	// send RST
905	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;
906	pkt [offs++] = CMD_IP_RST;	933	pkt [offs++] = CMD_IP_RST;
907	}	934	}
908		935
909	int rdlen = offs - rdlen_offs;	936	int rdlen = offs - rdlen_offs;
910		937
911	pkt [rdlen_offs - 2] = rdlen >> 8;	938	pkt [rdlen_offs - 2] = rdlen >> 8;
912	pkt [rdlen_offs - 1] = rdlen;	939	pkt [rdlen_offs - 1] = rdlen;
913		940
914	if (dns)	941	if (dns)
915	{	942	{
916	// now update dns_rcv copy	943	// now update dns_rcv copy
917	rcv->pkt->len = offs;	944	rcv->pkt->len = offs;
918	memcpy (rcv->pkt->at (0), pkt.at (0), offs);	945	memcpy (rcv->pkt->at (0), pkt.at (0), offs);
919	}	946	}
		947	}
920		948
921	duplicate_request: ;	949	duplicate_request: ;
922	}	950	}
923	else	951	else
924	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	952	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
…		…
936	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
937	pkt [offs++] = 0; pkt [offs++] = 0;	965	pkt [offs++] = 0; pkt [offs++] = 0;
938	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL	966	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
939	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength	967	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
940		968
941	slog (L_INFO, _("DNS: client %d tries to connect"), client);	969	slog (L_INFO, _("DNS: client %d connects"), client);
942		970
943	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;
944	pkt [offs++] = CMD_IP_REJ;	972	pkt [offs++] = CMD_IP_REJ;
945		973
946	if (0 < client && client <= conns.size ())	974	if (0 < client && client <= conns.size ())
…		…
998	dns->send_interval = MIN_SEND_INTERVAL;	1026	dns->send_interval = MIN_SEND_INTERVAL;
999		1027
1000	// the latency surely puts an upper bound on	1028	// the latency surely puts an upper bound on
1001	// the minimum send interval	1029	// the minimum send interval
1002	double latency = NOW - (*i)->sent;	1030	double latency = NOW - (*i)->sent;
		1031
		1032	if (latency < dns->min_latency)
1003	dns->last_latency = latency;	1033	dns->min_latency = latency;
1004		1034
1005	if (dns->send_interval > latency)	1035	if (dns->send_interval > dns->min_latency * LATENCY_FACTOR)
1006	dns->send_interval = latency;	1036	dns->send_interval = dns->min_latency * LATENCY_FACTOR;
1007	}	1037	}
1008		1038
1009	delete *i;	1039	delete *i;
1010	dns_sndpq.erase (i);	1040	dns_sndpq.erase (i);
1011		1041
…		…
1128		1158
1129	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);
1130		1160
1131	if (pkt->len > 0)	1161	if (pkt->len > 0)
1132	{	1162	{
1133	if (THISNODE->dns_port)	1163	if (ntohs (pkt->flags) & FLAG_RESPONSE)
		1164	dnsv4_client (*pkt);
		1165	else
1134	{	1166	{
1135	dnsv4_server (*pkt);	1167	dnsv4_server (*pkt);
1136	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);
1137	}	1169	}
1138	else
1139	dnsv4_client (*pkt);
1140		1170
1141	delete pkt;	1171	delete pkt;
1142	}	1172	}
1143	}	1173	}
1144	}	1174	}
1145		1175
1146	bool	1176	bool
1147	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)
1148	{	1178	{
		1179	int client = ntohs (si.port);
		1180
		1181	assert (0 < client && client <= conns.size ());
		1182
		1183	connection *c = conns [client - 1];
		1184
1149	if (!dns)	1185	if (!c->dns)
1150	dns = new dns_connection (this);	1186	c->dns = new dns_connection (c);
1151		1187
1152	if (!dns->snddq.put (pkt))	1188	if (!c->dns->snddq.put (pkt))
1153	return false;	1189	return false;
1154		1190
1155	dns->tw.trigger ();	1191	c->dns->tw.trigger ();
1156		1192
1157	return true;	1193	return true;
1158	}	1194	}
1159		1195
1160	void	1196	void
…		…
1187	if (!send)	1223	if (!send)
1188	{	1224	{
1189	send = r;	1225	send = r;
1190		1226
1191	r->retry++;	1227	r->retry++;
1192	r->timeout = NOW + (r->retry * last_latency * 8.);	1228	r->timeout = NOW + (r->retry * min_latency * 8.);
1193		1229
1194	// the following code changes the query section a bit, forcing	1230	// the following code changes the query section a bit, forcing
1195	// the forwarder to generate a new request	1231	// the forwarder to generate a new request
1196	if (r->stdhdr)	1232	if (r->stdhdr)
1197	{	1233	{
…		…
1215	if (vpn->dns_sndpq.empty ())	1251	if (vpn->dns_sndpq.empty ())
1216	{	1252	{
1217	send = new dns_snd (this);	1253	send = new dns_snd (this);
1218		1254
1219	cfg.reset (THISNODE->id);	1255	cfg.reset (THISNODE->id);
1220	send->gen_syn_req (cfg);	1256	send->gen_syn_req ();
1221	}	1257	}
1222	}	1258	}
1223	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING	1259	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
1224	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))	1260	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1225	{	1261	{
1226	if (!snddq.empty ())	1262	//printf ("sending data request etc.\n"); //D
		1263	if (!snddq.empty () \|\| last_received + 1. > NOW)
1227	{	1264	{
1228	poll_interval = send_interval;	1265	poll_interval = send_interval;
1229	NEXT (NOW + send_interval);	1266	NEXT (NOW + send_interval);
1230	}	1267	}
1231		1268
1232	send = new dns_snd (this);	1269	send = new dns_snd (this);
1233	send->gen_stream_req (sndseq, snddq);	1270	send->gen_stream_req (sndseq, snddq);
1234	send->timeout = NOW + last_latency * 8.;	1271	send->timeout = NOW + min_latency * 8.;
1235		1272
1236	sndseq = (sndseq + 1) & SEQNO_MASK;	1273	sndseq = (sndseq + 1) & SEQNO_MASK;
1237	}	1274	}
1238		1275
1239	if (send)	1276	if (send)

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.17 by pcg, Sat Mar 5 03:47:05 2005 UTC vs. Revision 1.25 by pcg, Mon Mar 7 22:24:24 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.17 by pcg, Sat Mar 5 03:47:05 2005 UTC vs.
Revision 1.25 by pcg, Mon Mar 7 22:24:24 2005 UTC