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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs.
Revision 1.11 by pcg, Fri Mar 4 08:45:24 2005 UTC

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

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs. Revision 1.11 by pcg, Fri Mar 4 08:45:24 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs.
Revision 1.11 by pcg, Fri Mar 4 08:45:24 2005 UTC