[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.46 by pcg, Thu Dec 6 00:35:29 2007 UTC

…		…
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	15	GNU General Public License for more details.
16		16
17	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
18	along with gvpe; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	*/	20	*/
		21
		22	// TODO: EDNS0 option to increase dns mtu?
		23	// TODO: re-write dns packet parsing/creation using a safe mem-buffer
		24	// to ensure no buffer overflows or similar problems.
21		25
22	#include "config.h"	26	#include "config.h"
23		27
24	#if ENABLE_DNS	28	#if ENABLE_DNS
25		29
26	// dns processing is EXTREMELY ugly. For obvious(?) reasons.	30	// dns processing is EXTREMELY ugly. For obvious(?) reasons.
27	// it's a hack, use only in emergency situations please.	31	// it's a hack, use only in emergency situations please.
28		32
29	#include <cstring>	33	#include <cstring>
		34	#include <cassert>
30		35
31	#include <sys/types.h>	36	#include <sys/types.h>
32	#include <sys/socket.h>	37	#include <sys/socket.h>
33	#include <sys/wait.h>	38	#include <sys/wait.h>
34	#include <sys/uio.h>	39	#include <sys/uio.h>
…		…
37	#include <unistd.h>	42	#include <unistd.h>
38	#include <fcntl.h>	43	#include <fcntl.h>
39		44
40	#include <map>	45	#include <map>
41		46
		47	#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
42	#include <gmp.h>	48	#include <gmp.h>
43		49
44	#include "netcompat.h"	50	#include "netcompat.h"
45		51
46	#include "vpn.h"	52	#include "vpn.h"
47		53
48	#define MIN_POLL_INTERVAL .2 // how often to poll minimally when the server is having data
49	#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data	54	#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
50	#define ACTIVITY_INTERVAL 5.	55	#define ACTIVITY_INTERVAL 5.
51		56
52	#define INITIAL_TIMEOUT 1.	57	#define INITIAL_TIMEOUT 0.1 // retry timeouts
53	#define INITIAL_SYN_TIMEOUT 2.	58	#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
54		59
55	#define MIN_SEND_INTERVAL (1./1000.)
56	#define MAX_SEND_INTERVAL 0.5 // optimistic?	60	#define MAX_SEND_INTERVAL 2. // optimistic?
57		61
58	#define MAX_OUTSTANDING 400 // max. outstanding requests
59	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING	62	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
60	#define MAX_RATE 100 // requests/s
61	#define MAX_BACKLOG (100*1024) // size of protocol backlog, must be > MAXSIZE	63	#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62		64
63	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well	65	#define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well
64	// 240 leaves about 4 bytes of server reply data	66	// 240 leaves about 4 bytes of server reply data
65	// every two request byte sless give room for one reply byte	67	// every request byte less give room for two reply bytes
66		68
67	#define SEQNO_MASK 0xffff	69	#define SEQNO_MASK 0x3fff
68	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )	70	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69		71
70	#define MAX_LBL_SIZE 63	72	#define MAX_LBL_SIZE 63
71	#define MAX_PKT_SIZE 512	73	#define MAX_PKT_SIZE 512
72		74
…		…
265	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");	267	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
266		268
267	/////////////////////////////////////////////////////////////////////////////	269	/////////////////////////////////////////////////////////////////////////////
268		270
269	#define HDRSIZE 6	271	#define HDRSIZE 6
270		272
271	inline void encode_header (char *data, int clientid, int seqno)	273	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
272	{	274	{
273	u8 hdr[3] = { clientid, seqno >> 8, seqno };	275	seqno &= SEQNO_MASK;
		276
		277	u8 hdr[3] = {
		278	clientid,
		279	(seqno >> 8) \| (retry << 6),
		280	seqno,
		281	};
274		282
275	assert (clientid < 256);	283	assert (clientid < 256);
276		284
277	cdc26.encode (data, hdr, 3);	285	cdc26.encode (data, hdr, 3);
278	}	286	}
…		…
282	u8 hdr[3];	290	u8 hdr[3];
283		291
284	cdc26.decode (hdr, data, HDRSIZE);	292	cdc26.decode (hdr, data, HDRSIZE);
285		293
286	clientid = hdr[0];	294	clientid = hdr[0];
287	seqno = (hdr[1] << 8) \| hdr[2];	295	seqno = ((hdr[1] << 8) \| hdr[2]) & SEQNO_MASK;
288	}	296	}
289		297
290	/////////////////////////////////////////////////////////////////////////////	298	/////////////////////////////////////////////////////////////////////////////
291		299
292	struct byte_stream	300	struct byte_stream
…		…
321	}	329	}
322		330
323	void byte_stream::remove (int count)	331	void byte_stream::remove (int count)
324	{	332	{
325	if (count > fill)	333	if (count > fill)
326	abort ();	334	assert (count <= fill);
327		335
328	memmove (data, data + count, fill -= count);	336	memmove (data, data + count, fill -= count);
329	}	337	}
330		338
331	bool byte_stream::put (u8 *data, unsigned int datalen)	339	bool byte_stream::put (u8 *data, unsigned int datalen)
…		…
351	return true;	359	return true;
352	}	360	}
353		361
354	vpn_packet *byte_stream::get ()	362	vpn_packet *byte_stream::get ()
355	{	363	{
		364	unsigned int len;
		365
		366	for (;;)
		367	{
356	int len = (data [0] << 8) \| data [1];	368	len = (data [0] << 8) \| data [1];
357		369
358	if (len > MAXSIZE && fill >= 2)	370	if (len <= MAXSIZE \|\| fill < 2)
359	abort (); // TODO handle this gracefully, connection reset	371	break;
360		372
		373	// TODO: handle this better than skipping, e.g. by reset
		374	slog (L_DEBUG, _("DNS: corrupted packet stream skipping a byte..."));
		375	remove (1);
		376	}
		377
361	if (fill < len + 2)	378	if (fill < len + 2)
362	return 0;	379	return 0;
363		380
364	vpn_packet *pkt = new vpn_packet;	381	vpn_packet *pkt = new vpn_packet;
365		382
…		…
394	struct dns_cfg	411	struct dns_cfg
395	{	412	{
396	static int next_uid;	413	static int next_uid;
397		414
398	u8 id1, id2, id3, id4;	415	u8 id1, id2, id3, id4;
		416
399	u8 version;	417	u8 version;
		418	u8 flags;
400	u8 rrtype;	419	u8 rrtype;
401	u8 flags;
402	u8 def_ttl;	420	u8 def_ttl;
403	u8 rcv_cdc;	421
404	u8 snd_cdc;
405	u16 max_size;
406	u16 client;	422	u16 client;
407	u16 uid; // to make request unique	423	u16 uid; // to make request unique
408		424
409	u8 reserved[8];	425	u16 max_size;
		426	u8 seq_cdc;
		427	u8 req_cdc;
		428
		429	u8 rep_cdc;
		430	u8 delay; // time in 0.01s units that the server may delay replying packets
		431	u8 r3, r4;
		432
		433	u8 r5, r6, r7, r8;
410		434
411	void reset (int clientid);	435	void reset (int clientid);
412	bool valid ();	436	bool valid ();
413	};	437	};
414		438
…		…
424	version = 1;	448	version = 1;
425		449
426	rrtype = RR_TYPE_TXT;	450	rrtype = RR_TYPE_TXT;
427	flags = 0;	451	flags = 0;
428	def_ttl = 0;	452	def_ttl = 0;
		453	seq_cdc = 26;
		454	req_cdc = 62;
429	rcv_cdc = 0;	455	rep_cdc = 0;
430	snd_cdc = 62;
431	max_size = ntohs (MAX_PKT_SIZE);	456	max_size = htons (MAX_PKT_SIZE);
432	client = ntohs (clientid);	457	client = htons (clientid);
433	uid = next_uid++;	458	uid = next_uid++;
		459	delay = 0;
434		460
435	memset (reserved, 0, 8);	461	r3 = r4 = 0;
		462	r4 = r5 = r6 = r7 = 0;
436	}	463	}
437		464
438	bool dns_cfg::valid ()	465	bool dns_cfg::valid ()
439	{	466	{
		467	// although the protocol itself allows for some configurability,
		468	// only the following encoding/decoding settings are implemented.
440	return id1 == 'G'	469	return id1 == 'G'
441	&& id2 == 'V'	470	&& id2 == 'V'
442	&& id3 == 'P'	471	&& id3 == 'P'
443	&& id4 == 'E'	472	&& id4 == 'E'
		473	&& seq_cdc == 26
		474	&& req_cdc == 62
		475	&& rep_cdc == 0
444	&& version == 1	476	&& version == 1;
445	&& flags == 0
446	&& rcv_cdc == 0
447	&& snd_cdc == 62
448	&& max_size == ntohs (MAX_PKT_SIZE);
449	}	477	}
450		478
451	struct dns_packet : net_packet	479	struct dns_packet : net_packet
452	{	480	{
453	u16 id;	481	u16 id;
454	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	482	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
455	u16 qdcount, ancount, nscount, arcount;	483	u16 qdcount, ancount, nscount, arcount;
456		484
457	u8 data[MAXSIZE - 6 * 2];	485	u8 data [MAXSIZE - 6 * 2];
458		486
459	int decode_label (char *data, int size, int &offs);	487	int decode_label (char *data, int size, int &offs);
460	};	488	};
461		489
462	int dns_packet::decode_label (char *data, int size, int &offs)	490	int dns_packet::decode_label (char *data, int size, int &offs)
…		…
493	return data - orig;	521	return data - orig;
494	}	522	}
495		523
496	/////////////////////////////////////////////////////////////////////////////	524	/////////////////////////////////////////////////////////////////////////////
497		525
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	526	static u16 dns_id = 0; // TODO: should be per-vpn
512		527
513	static u16 next_id ()	528	static u16 next_id ()
514	{	529	{
		530	if (!dns_id)
		531	dns_id = time (0);
		532
515	// the simplest lsfr with periodicity 65535 i could find	533	// the simplest lsfr with periodicity 65535 i could find
516	dns_id = (dns_id << 1)	534	dns_id = (dns_id << 1)
517	\| (((dns_id >> 1)	535	\| (((dns_id >> 1)
518	^ (dns_id >> 2)	536	^ (dns_id >> 2)
519	^ (dns_id >> 4)	537	^ (dns_id >> 4)
520	^ (dns_id >> 15)) & 1);	538	^ (dns_id >> 15)) & 1);
521		539
522	return dns_id;	540	return dns_id;
523	}	541	}
524		542
		543	struct dns_rcv;
		544	struct dns_snd;
		545
		546	struct dns_connection
		547	{
		548	connection *c;
		549	struct vpn *vpn;
		550
		551	dns_cfg cfg;
		552
		553	bool established;
		554
		555	tstamp last_received;
		556	tstamp last_sent;
		557	double min_latency;
		558	double poll_interval, send_interval;
		559
		560	vector<dns_rcv *> rcvpq;
		561
		562	byte_stream rcvdq; int rcvseq; int repseq;
		563	byte_stream snddq; int sndseq;
		564
		565	inline void time_cb (ev::timer &w, int revents); ev::timer tw;
		566	void receive_rep (dns_rcv *r);
		567
		568	dns_connection (connection *c);
		569	~dns_connection ();
		570	};
		571
		572	struct dns_snd
		573	{
		574	dns_packet *pkt;
		575	tstamp timeout, sent;
		576	int retry;
		577	struct dns_connection *dns;
		578	int seqno;
		579	bool stdhdr;
		580
		581	void gen_stream_req (int seqno, byte_stream &stream);
		582	void gen_syn_req ();
		583
		584	dns_snd (dns_connection *dns);
		585	~dns_snd ();
		586	};
		587
525	dns_snd::dns_snd (dns_connection *dns)	588	dns_snd::dns_snd (dns_connection *dns)
526	: dns (dns)	589	: dns (dns)
527	{	590	{
528	timeout = 0;	591	timeout = 0;
529	retry = 0;	592	retry = 0;
530	seqno = 0;	593	seqno = 0;
		594	sent = ev_now ();
		595	stdhdr = false;
531		596
532	pkt = new dns_packet;	597	pkt = new dns_packet;
533		598
534	pkt->id = next_id ();	599	pkt->id = next_id ();
		600	}
		601
		602	dns_snd::~dns_snd ()
		603	{
		604	delete pkt;
535	}	605	}
536		606
537	static void append_domain (dns_packet &pkt, int &offs, const char *domain)	607	static void append_domain (dns_packet &pkt, int &offs, const char *domain)
538	{	608	{
539	// add tunnel domain	609	// add tunnel domain
…		…
557	}	627	}
558	}	628	}
559		629
560	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)	630	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
561	{	631	{
		632	stdhdr = true;
562	this->seqno = seqno;	633	this->seqno = seqno;
563		634
564	timeout = NOW + INITIAL_TIMEOUT;	635	timeout = ev_now () + INITIAL_TIMEOUT;
565		636
566	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	637	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
567	pkt->qdcount = htons (1);	638	pkt->qdcount = htons (1);
568		639
569	int offs = 6*2;	640	int offs = 6*2;
570	int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);	641	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,	642	// 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	643	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
573		644
574	char enc[256], *encp = enc;	645	char enc[256], *encp = enc;
575	encode_header (enc, THISNODE->id, seqno);	646	encode_header (enc, THISNODE->id, seqno);
…		…
593	encp += lbllen;	664	encp += lbllen;
594		665
595	enclen -= lbllen;	666	enclen -= lbllen;
596	}	667	}
597		668
598	append_domain (*pkt, offs, THISNODE->domain);	669	append_domain (*pkt, offs, dns->c->conf->domain);
599		670
600	(*pkt)[offs++] = 0;	671	(*pkt)[offs++] = 0;
601	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;	672	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
602	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	673	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
603		674
604	pkt->len = offs;	675	pkt->len = offs;
605	}	676	}
606		677
607	void dns_snd::gen_syn_req (const dns_cfg &cfg)	678	void dns_snd::gen_syn_req ()
608	{	679	{
609	timeout = NOW + INITIAL_SYN_TIMEOUT;	680	timeout = ev_now () + INITIAL_SYN_TIMEOUT;
610		681
611	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	682	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
612	pkt->qdcount = htons (1);	683	pkt->qdcount = htons (1);
613		684
614	int offs = 6*2;	685	int offs = 6 * 2;
615		686
616	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&cfg, sizeof (dns_cfg));	687	int elen = cdc26.encode ((char )pkt->at (offs + 1), (u8 )&dns->cfg, sizeof (dns_cfg));
617		688
618	assert (elen <= MAX_LBL_SIZE);	689	assert (elen <= MAX_LBL_SIZE);
619		690
620	(*pkt)[offs] = elen;	691	(*pkt)[offs] = elen;
621	offs += elen + 1;	692	offs += elen + 1;
622	append_domain (*pkt, offs, THISNODE->domain);	693	append_domain (*pkt, offs, dns->c->conf->domain);
623		694
624	(*pkt)[offs++] = 0;	695	(*pkt)[offs++] = 0;
625	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;	696	(pkt)[offs++] = RR_TYPE_A >> 8; (pkt)[offs++] = RR_TYPE_A;
626	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	697	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
627		698
…		…
650	delete pkt;	721	delete pkt;
651	}	722	}
652		723
653	/////////////////////////////////////////////////////////////////////////////	724	/////////////////////////////////////////////////////////////////////////////
654		725
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)	726	dns_connection::dns_connection (connection *c)
681	: c (c)	727	: c (c)
682	, rcvdq (MAX_BACKLOG * 2)	728	, rcvdq (MAX_BACKLOG * 2)
683	, snddq (MAX_BACKLOG * 2)	729	, snddq (MAX_BACKLOG)
684	, tw (this, &dns_connection::time_cb)
685	{	730	{
		731	tw.set<dns_connection, &dns_connection::time_cb> (this);
		732
686	vpn = c->vpn;	733	vpn = c->vpn;
687		734
688	established = false;	735	established = false;
689		736
690	rcvseq = sndseq = 0;	737	rcvseq = repseq = sndseq = 0;
691		738
692	last_sent = last_received = 0;	739	last_sent = last_received = 0;
693	poll_interval = MIN_POLL_INTERVAL;	740	poll_interval = 0.5; // starting here
694	send_interval = 0.2; // starting rate	741	send_interval = 0.5; // starting rate
		742	min_latency = INITIAL_TIMEOUT;
695	}	743	}
696		744
697	dns_connection::~dns_connection ()	745	dns_connection::~dns_connection ()
698	{	746	{
699	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();	747	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
…		…
704		752
705	void dns_connection::receive_rep (dns_rcv *r)	753	void dns_connection::receive_rep (dns_rcv *r)
706	{	754	{
707	if (r->datalen)	755	if (r->datalen)
708	{	756	{
709	last_received = NOW;	757	last_received = ev_now ();
710	tw.trigger ();	758	tw ();
711		759
712	poll_interval *= 0.99;	760	poll_interval = send_interval;
713	if (poll_interval > MIN_POLL_INTERVAL)
714	poll_interval = MIN_POLL_INTERVAL;
715	}	761	}
716	else	762	else
717	{	763	{
718	poll_interval *= 1.1;	764	poll_interval *= 1.5;
		765
719	if (poll_interval > MAX_POLL_INTERVAL)	766	if (poll_interval > MAX_POLL_INTERVAL)
720	poll_interval = MAX_POLL_INTERVAL;	767	poll_interval = MAX_POLL_INTERVAL;
721	}	768	}
722		769
723	rcvpq.push_back (r);	770	rcvpq.push_back (r);
…		…
726		773
727	// find next packet	774	// find next packet
728	for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )	775	for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
729	if (SEQNO_EQ (rcvseq, (*i)->seqno))	776	if (SEQNO_EQ (rcvseq, (*i)->seqno))
730	{	777	{
		778	//printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
731	// enter the packet into our input stream	779	// enter the packet into our input stream
732	r = *i;	780	r = *i;
733		781
734	// remove the oldest packet, look forward, as it's oldest first	782	// remove the oldest packet, look forward, as it's oldest first
735	for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)	783	for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
736	if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))	784	if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
737	{	785	{
		786	//printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
738	delete *j;	787	delete *j;
739	rcvpq.erase (j);	788	rcvpq.erase (j);
740	break;	789	break;
741	}	790	}
742		791
743	rcvseq = (rcvseq + 1) & SEQNO_MASK;	792	rcvseq = (rcvseq + 1) & SEQNO_MASK;
744		793
745	if (!rcvdq.put (r->data, r->datalen))	794	if (!rcvdq.put (r->data, r->datalen))
		795	{
		796	slog (L_ERR, "DNS: !rcvdq.put (r->data, r->datalen)");
746	abort (); // MUST never overflow, can be caused by data corruption, TODO	797	abort (); // MUST never overflow, can be caused by data corruption, TODO
		798	}
747		799
748	while (vpn_packet *pkt = rcvdq.get ())	800	while (vpn_packet *pkt = rcvdq.get ())
749	{	801	{
750	sockinfo si;	802	sockinfo si;
751	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;	803	si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
752		804
753	vpn->recv_vpn_packet (pkt, si);	805	vpn->recv_vpn_packet (pkt, si);
		806
		807	delete pkt;
754	}	808	}
755		809
756	// check for further packets	810	// check for further packets
757	goto redo;	811	goto redo;
758	}	812	}
…		…
768	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	822	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
769		823
770	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))	824	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))
771	&& pkt.qdcount == htons (1))	825	&& pkt.qdcount == htons (1))
772	{	826	{
773	char qname[MAXSIZE];	827	char qname [MAXSIZE];
774	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);	828	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
775		829
776	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];	830	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
777	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];	831	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
778		832
779	pkt.qdcount = htons (1);	833	pkt.qdcount = htons (1);
780	pkt.ancount = 0;	834	pkt.ancount = 0;
781	pkt.nscount = 0; // should be self, as other nameservers reply like this	835	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	836	pkt.arcount = 0; // a record for self, as other nameservers reply like this
783		837
784	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);	838	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_SERVFAIL);
785		839
786	int dlen = strlen (THISNODE->domain);	840	int dlen = strlen (THISNODE->domain);
787		841
788	if (qclass == RR_CLASS_IN	842	if (qclass == RR_CLASS_IN
789	&& qlen > dlen + 1	843	&& qlen > dlen + 1
790	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	844	&& !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
791	{	845	{
792	// now generate reply	846	// now generate reply
793	pkt.ancount = htons (1); // one answer RR	847	pkt.ancount = htons (1); // one answer RR
794	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);	848	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
795		849
…		…
817	if (SEQNO_EQ ((*i)->seqno, seqno))	871	if (SEQNO_EQ ((*i)->seqno, seqno))
818	{	872	{
819	// already seen that request: simply reply with the cached reply	873	// already seen that request: simply reply with the cached reply
820	dns_rcv r = i;	874	dns_rcv r = i;
821		875
822	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D	876	slog (L_DEBUG, "DNS: duplicate packet received ID %d, SEQ %d", htons (r->pkt->id), seqno);
		877
		878	// refresh header & id, as the retry count could have changed
		879	memcpy (r->pkt->at (6 * 2 + 1), pkt.at (6 * 2 + 1), HDRSIZE);
		880	r->pkt->id = pkt.id;
823		881
824	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);	882	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
825	pkt.id = r->pkt->id;	883
826	goto duplicate_request;	884	goto duplicate_request;
827	}	885	}
828		886
829	// new packet, queue	887	// new packet, queue
830	rcv = new dns_rcv (seqno, data, datalen);	888	rcv = new dns_rcv (seqno, data, datalen);
831	dns->receive_rep (rcv);	889	dns->receive_rep (rcv);
832	}	890	}
833		891
		892	{
834	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section	893	pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
835		894
836	// type
837	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;	895	int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
838	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype;	896	pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type
839
840	// class
841	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN;	897	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
842
843	// TTL
844	pkt [offs++] = 0; pkt [offs++] = 0;	898	pkt [offs++] = 0; pkt [offs++] = 0;
845	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0;	899	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
846		900
847	int rdlen_offs = offs += 2;	901	int rdlen_offs = offs += 2;
848		902
		903	if (dns)
		904	{
849	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;	905	int dlen = ntohs (dns->cfg.max_size) - offs;
		906
850	// bind doesn't compress well, so reduce further by one label length	907	// bind doesn't compress well, so reduce further by one label length
851	dlen -= qlen;	908	dlen -= qlen;
852		909
853	if (dns)	910	// only put data into in-order sequence packets, if
854	{	911	// we receive out-of-order packets we generate empty
855	while (dlen > 1 && !dns->snddq.empty ())	912	// replies
		913	//printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
		914	if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
856	{	915	{
		916	dns->repseq = seqno;
		917
		918	while (dlen > 1 && !dns->snddq.empty ())
		919	{
857	int txtlen = dlen <= 255 ? dlen - 1 : 255;	920	int txtlen = dlen <= 255 ? dlen - 1 : 255;
858		921
859	if (txtlen > dns->snddq.size ())	922	if (txtlen > dns->snddq.size ())
860	txtlen = dns->snddq.size ();	923	txtlen = dns->snddq.size ();
861		924
862	pkt[offs++] = txtlen;	925	pkt[offs++] = txtlen;
863	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);	926	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
864	offs += txtlen;	927	offs += txtlen;
865	dns->snddq.remove (txtlen);	928	dns->snddq.remove (txtlen);
866		929
867	dlen -= txtlen + 1;	930	dlen -= txtlen + 1;
		931	}
868	}	932	}
869		933
870	// avoid empty TXT rdata	934	// avoid completely empty TXT rdata
871	if (offs == rdlen_offs)	935	if (offs == rdlen_offs)
872	pkt[offs++] = 0;	936	pkt[offs++] = 0;
		937
		938	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
873	}	939	}
874	else	940	else
875	{	941	{
876	// send RST	942	// send RST
877	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	943	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
878	pkt [offs++] = CMD_IP_RST;	944	pkt [offs++] = CMD_IP_RST;
879	}	945	}
880		946
881	int rdlen = offs - rdlen_offs;	947	int rdlen = offs - rdlen_offs;
882		948
883	pkt [rdlen_offs - 2] = rdlen >> 8;	949	pkt [rdlen_offs - 2] = rdlen >> 8;
884	pkt [rdlen_offs - 1] = rdlen;	950	pkt [rdlen_offs - 1] = rdlen;
885		951
886	if (dns)	952	if (dns)
887	{	953	{
888	// now update dns_rcv copy	954	// now update dns_rcv copy
889	rcv->pkt->len = offs;	955	rcv->pkt->len = offs;
890	memcpy (rcv->pkt->at (0), pkt.at (0), offs);	956	memcpy (rcv->pkt->at (0), pkt.at (0), offs);
891	}	957	}
		958	}
892		959
893	duplicate_request: ;	960	duplicate_request: ;
894	}	961	}
895	else	962	else
896	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	963	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
…		…
908	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class	975	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
909	pkt [offs++] = 0; pkt [offs++] = 0;	976	pkt [offs++] = 0; pkt [offs++] = 0;
910	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL	977	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
911	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength	978	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
912		979
913	slog (L_INFO, _("DNS tunnel: client %d tries to connect"), client);	980	slog (L_INFO, _("DNS: client %d connects"), client);
914		981
915	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	982	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
916	pkt [offs++] = CMD_IP_REJ;	983	pkt [offs++] = CMD_IP_REJ;
917		984
918	if (0 < client && client <= conns.size ())	985	if (0 < client && client <= conns.size ())
…		…
949	i != dns_sndpq.end ();	1016	i != dns_sndpq.end ();
950	++i)	1017	++i)
951	if ((*i)->pkt->id == pkt.id)	1018	if ((*i)->pkt->id == pkt.id)
952	{	1019	{
953	dns_connection dns = (i)->dns;	1020	dns_connection dns = (i)->dns;
		1021	connection *c = dns->c;
954	int seqno = (*i)->seqno;	1022	int seqno = (*i)->seqno;
955	u8 data[MAXSIZE], *datap = data;	1023	u8 data[MAXSIZE], *datap = data;
		1024	//printf ("rcv pkt %x\n", seqno);//D
956		1025
957	if ((*i)->retry)	1026	if ((*i)->retry)
958	{	1027	{
959	dns->send_interval *= 1.01;	1028	dns->send_interval *= 1.01;
960	if (dns->send_interval < MAX_SEND_INTERVAL)	1029	if (dns->send_interval > MAX_SEND_INTERVAL)
961	dns->send_interval = MAX_SEND_INTERVAL;	1030	dns->send_interval = MAX_SEND_INTERVAL;
962	}	1031	}
963	else	1032	else
964	{	1033	{
		1034	#if 0
965	dns->send_interval *= 0.99;	1035	dns->send_interval *= 0.999;
966	if (dns->send_interval < MIN_SEND_INTERVAL)	1036	#endif
967	dns->send_interval = MIN_SEND_INTERVAL;
968
969	// the latency surely puts an upper bound on	1037	// the latency surely puts an upper bound on
970	// the minimum send interval	1038	// the minimum send interval
971	if (dns->send_interval > NOW - (*i)->sent)	1039	double latency = ev_now () - (*i)->sent;
972	dns->send_interval = NOW - (*i)->sent;	1040
		1041	if (latency < dns->min_latency)
		1042	dns->min_latency = latency;
		1043
		1044	if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
		1045	dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
		1046
		1047	if (dns->send_interval < conf.dns_send_interval)
		1048	dns->send_interval = conf.dns_send_interval;
973	}	1049	}
974		1050
975	delete *i;	1051	delete *i;
976	dns_sndpq.erase (i);	1052	dns_sndpq.erase (i);
977		1053
…		…
1027		1103
1028	if (ip [0] == CMD_IP_1	1104	if (ip [0] == CMD_IP_1
1029	&& ip [1] == CMD_IP_2	1105	&& ip [1] == CMD_IP_2
1030	&& ip [2] == CMD_IP_3)	1106	&& ip [2] == CMD_IP_3)
1031	{	1107	{
1032	slog (L_TRACE, _("got tunnel meta command %02x"), ip [3]);	1108	slog (L_TRACE, _("DNS: got tunnel meta command %02x"), ip [3]);
1033		1109
1034	if (ip [3] == CMD_IP_RST)	1110	if (ip [3] == CMD_IP_RST)
1035	{	1111	{
1036	slog (L_DEBUG, _("got tunnel RST request"));	1112	slog (L_DEBUG, _("DNS: got tunnel RST request"));
1037		1113
1038	connection *c = dns->c;
1039	delete c->dns; c->dns = 0;	1114	delete dns; c->dns = 0;
1040		1115
1041	return;	1116	return;
1042	}	1117	}
1043	else if (ip [3] == CMD_IP_SYN)	1118	else if (ip [3] == CMD_IP_SYN)
		1119	{
		1120	slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us."));
1044	dns->established = true;	1121	dns->established = true;
		1122	}
		1123	else if (ip [3] == CMD_IP_REJ)
		1124	{
		1125	slog (L_DEBUG, _("DNS: got tunnel REJ reply, server does not like us, aborting."));
		1126	abort ();
		1127	}
1045	else	1128	else
1046	slog (L_INFO, _("got unknown meta command %02x"), ip [3]);	1129	slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]);
1047	}	1130	}
1048	else	1131	else
1049	slog (L_INFO, _("got spurious a record %d.%d.%d.%d"),	1132	slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"),
1050	ip [0], ip [1], ip [2], ip [3]);	1133	ip [0], ip [1], ip [2], ip [3]);
1051		1134
1052	return;	1135	return;
1053	}	1136	}
1054		1137
1055	int client, rseqno;	1138	int client, rseqno;
1056	decode_header (qname, client, rseqno);	1139	decode_header (qname, client, rseqno);
1057		1140
1058	if (client != THISNODE->id)	1141	if (client != THISNODE->id)
1059	{	1142	{
1060	slog (L_INFO, _("got dns tunnel response with wrong clientid, ignoring"));	1143	slog (L_INFO, _("DNS: got dns tunnel response with wrong clientid, ignoring"));
1061	datap = 0;	1144	datap = 0;
1062	}	1145	}
1063	else if (rseqno != seqno)	1146	else if (rseqno != seqno)
1064	{	1147	{
1065	slog (L_DEBUG, _("got dns tunnel response with wrong seqno, badly caching nameserver?"));	1148	slog (L_DEBUG, _("DNS: got dns tunnel response with wrong seqno, badly caching nameserver?"));
1066	datap = 0;	1149	datap = 0;
1067	}	1150	}
1068	}	1151	}
1069	}	1152	}
1070		1153
…		…
1075	break;	1158	break;
1076	}	1159	}
1077	}	1160	}
1078		1161
1079	void	1162	void
1080	vpn::dnsv4_ev (io_watcher &w, short revents)	1163	vpn::dnsv4_ev (ev::io &w, int revents)
1081	{	1164	{
1082	if (revents & EVENT_READ)	1165	if (revents & EV_READ)
1083	{	1166	{
1084	dns_packet *pkt = new dns_packet;	1167	dns_packet *pkt = new dns_packet;
1085	struct sockaddr_in sa;	1168	struct sockaddr_in sa;
1086	socklen_t sa_len = sizeof (sa);	1169	socklen_t sa_len = sizeof (sa);
1087		1170
1088	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);	1171	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1089		1172
1090	if (pkt->len > 0)	1173	if (pkt->len > 0)
1091	{	1174	{
1092	if (THISNODE->dns_port)	1175	if (ntohs (pkt->flags) & FLAG_RESPONSE)
		1176	dnsv4_client (*pkt);
		1177	else
1093	{	1178	{
1094	dnsv4_server (*pkt);	1179	dnsv4_server (*pkt);
1095	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);	1180	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1096	}	1181	}
1097	else
1098	dnsv4_client (*pkt);
1099		1182
1100	delete pkt;	1183	delete pkt;
1101	}	1184	}
1102	}	1185	}
1103	}	1186	}
1104		1187
1105	bool	1188	bool
1106	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	1189	vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1107	{	1190	{
		1191	int client = ntohl (si.host);
		1192
		1193	assert (0 < client && client <= conns.size ());
		1194
		1195	connection *c = conns [client - 1];
		1196
1108	if (!dns)	1197	if (!c->dns)
1109	dns = new dns_connection (this);	1198	c->dns = new dns_connection (c);
1110		1199
1111	if (!dns->snddq.put (pkt))	1200	if (c->dns->snddq.put (pkt))
1112	return false;	1201	c->dns->tw ();
1113		1202
1114	dns->tw.trigger ();	1203	// always return true even if the buffer overflows
1115
1116	return true;	1204	return true;
1117	}	1205	}
1118		1206
		1207	void
		1208	connection::dnsv4_reset_connection ()
		1209	{
		1210	//delete dns; dns = 0; //TODO
		1211	}
		1212
1119	#define NEXT(w) do { if (next > (w)) next = w; } while (0)	1213	#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1120		1214
1121	void	1215	void
1122	dns_connection::time_cb (time_watcher &w)	1216	dns_connection::time_cb (ev::timer &w, int revents)
1123	{	1217	{
1124	// servers have to be polled	1218	// servers have to be polled
1125	if (THISNODE->dns_port)	1219	if (THISNODE->dns_port)
1126	return;	1220	return;
1127		1221
1128	// check for timeouts and (re)transmit	1222	// check for timeouts and (re)transmit
1129	tstamp next = NOW + poll_interval;	1223	tstamp next = ev::now () + poll_interval;
1130	dns_snd *send = 0;	1224	dns_snd *send = 0;
1131		1225
1132	for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();	1226	for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1133	i != vpn->dns_sndpq.end ();	1227	i != vpn->dns_sndpq.end ();
1134	++i)	1228	++i)
1135	{	1229	{
1136	dns_snd r = i;	1230	dns_snd r = i;
1137		1231
1138	if (r->timeout <= NOW)	1232	if (r->timeout <= ev_now ())
1139	{	1233	{
1140	if (!send)	1234	if (!send)
1141	{	1235	{
1142	send = r;	1236	send = r;
1143		1237
1144	r->retry++;	1238	r->retry++;
1145	r->timeout = NOW + r->retry;	1239	r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor);
		1240	//printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D
		1241
		1242	// the following code changes the query section a bit, forcing
		1243	// the forwarder to generate a new request
		1244	if (r->stdhdr)
		1245	encode_header ((char )r->pkt->at (6 2 + 1), THISNODE->id, r->seqno, r->retry);
1146	}	1246	}
1147	}	1247	}
1148	else if (r->timeout < next)	1248	else
1149	NEXT (r->timeout);	1249	NEXT (r->timeout);
1150	}	1250	}
1151		1251
1152	if (last_sent + send_interval <= NOW)
1153	{
1154	if (!send)	1252	if (!send)
		1253	{
		1254	// generate a new packet, if wise
		1255
		1256	if (!established)
1155	{	1257	{
1156	// generate a new packet, if wise
1157
1158	if (!established)
1159	{
1160	if (vpn->dns_sndpq.empty ())	1258	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	{	1259	{
1170	send = new dns_snd (this);	1260	send = new dns_snd (this);
		1261
		1262	cfg.reset (THISNODE->id);
		1263	send->gen_syn_req ();
		1264	}
		1265	}
		1266	else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
		1267	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
		1268	{
		1269	if (last_sent + send_interval <= ev_now ())
		1270	{
		1271	//printf ("sending data request etc.\n"); //D
		1272	if (!snddq.empty () \|\| last_received + 1. > ev_now ())
		1273	{
		1274	poll_interval = send_interval;
		1275	NEXT (ev_now () + send_interval);
		1276	}
		1277
		1278	send = new dns_snd (this);
1171	send->gen_stream_req (sndseq, snddq);	1279	send->gen_stream_req (sndseq, snddq);
		1280	send->timeout = ev_now () + min_latency * conf.dns_timeout_factor;
		1281	//printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D
1172		1282
1173	sndseq = (sndseq + 1) & SEQNO_MASK;	1283	sndseq = (sndseq + 1) & SEQNO_MASK;
1174	}	1284	}
1175		1285	else
1176	if (send)	1286	NEXT (last_sent + send_interval);
1177	vpn->dns_sndpq.push_back (send);
1178	}	1287	}
1179		1288
1180	if (send)	1289	if (send)
1181	{	1290	vpn->dns_sndpq.push_back (send);
1182	printf ("send pkt\n");	1291	}
1183	last_sent = NOW;
1184		1292
1185	if (!send->retry)	1293	if (send)
1186	send->sent = NOW;	1294	{
1187		1295	last_sent = ev_now ();
1188	sendto (vpn->dnsv4_fd,	1296	sendto (vpn->dnsv4_fd,
1189	send->pkt->at (0), send->pkt->len, 0,	1297	send->pkt->at (0), send->pkt->len, 0,
1190	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());	1298	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1191	}
1192	}	1299	}
1193	else
1194	NEXT (last_sent + send_interval);
1195		1300
1196	printf ("pi %f si %f N %f (%d:%d)\n", poll_interval, send_interval, next - NOW, vpn->dns_sndpq.size (), snddq.size ());	1301	slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
		1302	poll_interval, send_interval, next - ev_now (),
		1303	vpn->dns_sndpq.size (), snddq.size (),
		1304	rcvpq.size ());
1197		1305
1198	w.start (next);	1306	// TODO: no idea when this happens, but when next < ev_now (), we have a problem
		1307	// doesn't seem to happen anymore
		1308	if (next < ev_now () + 0.001)
		1309	next = ev_now () + 0.1;
		1310
		1311	w.start (next - ev_now ());
1199	}	1312	}
1200		1313
1201	#endif	1314	#endif
1202		1315

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.46 by pcg, Thu Dec 6 00:35:29 2007 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.46 by pcg, Thu Dec 6 00:35:29 2007 UTC