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

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.42 by pcg, Sat Nov 10 05:14:22 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.42 by pcg, Sat Nov 10 05:14:22 2007 UTC