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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.30 by pcg, Mon Mar 14 17:40:01 2005 UTC vs.
Revision 1.52 by root, Sun Mar 6 21:01:37 2011 UTC

…		…
1	/*	1	/*
2	vpn_dns.C -- handle the dns tunnel part of the protocol.	2	vpn_dns.C -- handle the dns tunnel part of the protocol.
3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>	3	Copyright (C) 2003-2011 Marc Lehmann <gvpe@schmorp.de>
4		4
5	This file is part of GVPE.	5	This file is part of GVPE.
6		6
7	GVPE is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	8	under the terms of the GNU General Public License as published by the
9	the Free Software Foundation; either version 2 of the License, or	9	Free Software Foundation; either version 3 of the License, or (at your
10	(at your option) any later version.	10	option) any later version.
11		11
12	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15	GNU General Public License for more details.	15	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 along
18	along with gvpe; if not, write to the Free Software	18	with this program; if not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19
		20	Additional permission under GNU GPL version 3 section 7
		21
		22	If you modify this Program, or any covered work, by linking or
		23	combining it with the OpenSSL project's OpenSSL library (or a modified
		24	version of that library), containing parts covered by the terms of the
		25	OpenSSL or SSLeay licenses, the licensors of this Program grant you
		26	additional permission to convey the resulting work. Corresponding
		27	Source for a non-source form of such a combination shall include the
		28	source code for the parts of OpenSSL used as well as that of the
		29	covered work.
20	*/	30	*/
		31
		32	// TODO: EDNS0 option to increase dns mtu?
		33	// TODO: re-write dns packet parsing/creation using a safe mem-buffer
		34	// to ensure no buffer overflows or similar problems.
21		35
22	#include "config.h"	36	#include "config.h"
23		37
24	#if ENABLE_DNS	38	#if ENABLE_DNS
25		39
38	#include <unistd.h>	52	#include <unistd.h>
39	#include <fcntl.h>	53	#include <fcntl.h>
40		54
41	#include <map>	55	#include <map>
42		56
		57	#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
43	#include <gmp.h>	58	#include <gmp.h>
44		59
45	#include "netcompat.h"	60	#include "netcompat.h"
46		61
47	#include "vpn.h"	62	#include "vpn.h"
48		63
		64	#define MIN_POLL_INTERVAL 0.025 // poll at most this often when no data received
49	#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data	65	#define MAX_POLL_INTERVAL 1. // how often to poll minimally when the server has no data
50	#define ACTIVITY_INTERVAL 5.
51		66
52	#define INITIAL_TIMEOUT 0.1 // retry timeouts	67	#define INITIAL_TIMEOUT 0.1 // retry timeouts
53	#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn	68	#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
54		69
55	#define MIN_SEND_INTERVAL 0.001 // wait at least this time between sending requests
56	#define MAX_SEND_INTERVAL 2. // optimistic?	70	#define MAX_SEND_INTERVAL 5. // optimistic?
57		71
58	#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate
59	#define MAX_OUTSTANDING 2 // max. outstanding requests
60	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog	72	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
61	#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE	73	#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62		74
63	#define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well	75	#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	76	// 240 leaves about 4 bytes of server reply data
65	// every two request bytes less give room for one reply byte	77	// every request byte less give room for two reply bytes
66		78
67	#define SEQNO_MASK 0x3fff	79	#define SEQNO_MASK 0x3fff
68	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )	80	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69		81
70	#define MAX_LBL_SIZE 63	82	#define MAX_LBL_SIZE 63
71	#define MAX_PKT_SIZE 512	83	#define MAX_PKT_SIZE 512
72		84
73	#define RR_TYPE_A 1	85	#define RR_TYPE_A 1
74	#define RR_TYPE_NULL 10	86	#define RR_TYPE_NULL 10
75	#define RR_TYPE_TXT 16	87	#define RR_TYPE_TXT 16
		88	#define RR_TYPE_AAAA 28
76	#define RR_TYPE_ANY 255	89	#define RR_TYPE_ANY 255
77		90
78	#define RR_CLASS_IN 1	91	#define RR_CLASS_IN 1
79		92
80	#define CMD_IP_1 207	93	#define CMD_IP_1 207
81	#define CMD_IP_2 46	94	#define CMD_IP_2 46
82	#define CMD_IP_3 236	95	#define CMD_IP_3 236
83	#define CMD_IP_RST 29	96
84	#define CMD_IP_SYN 113	97	#define CMD_IP_RST 29 // some error, reset and retry
85	#define CMD_IP_REJ 32	98	#define CMD_IP_REJ 32 // do not want you
		99	#define CMD_IP_SYN 113 // connection established
		100	#define CMD_IP_CSE 213 // connection established, but likely case mismatch
		101
		102	static bool
		103	is_uc (char c)
		104	{
		105	return 'A' <= c && c <= 'Z';
		106	}
		107
		108	static bool
		109	is_lc (char c)
		110	{
		111	return 'a' <= c && c <= 'z';
		112	}
86		113
87	// works for cmaps up to 255 (not 256!)	114	// works for cmaps up to 255 (not 256!)
88	struct charmap	115	struct charmap
89	{	116	{
90	enum { INVALID = (u8)255 };	117	enum { INVALID = (u8)255 };
…		…
104	memset (enc, (char) 0, 256);	131	memset (enc, (char) 0, 256);
105	memset (dec, (char)INVALID, 256);	132	memset (dec, (char)INVALID, 256);
106		133
107	for (size = 0; cmap [size]; size++)	134	for (size = 0; cmap [size]; size++)
108	{	135	{
		136	char c = cmap [size];
		137
109	enc [size] = cmap [size];	138	enc [size] = c;
110	dec [(u8)enc [size]] = size;	139	dec [(u8)c] = size;
		140
		141	// allow lowercase/uppercase aliases if possible
		142	if (is_uc (c) && dec [c + ('a' - 'A')] == INVALID) dec [c + ('a' - 'A')] = size;
		143	if (is_lc (c) && dec [c - ('a' - 'A')] == INVALID) dec [c - ('a' - 'A')] = size;
111	}	144	}
112		145
113	assert (size < 256);	146	assert (size < 256);
114	}	147	}
115		148
…		…
122	{	155	{
123	charmap cmap;	156	charmap cmap;
124	unsigned int enc_len [MAX_DEC_LEN];	157	unsigned int enc_len [MAX_DEC_LEN];
125	unsigned int dec_len [MAX_ENC_LEN];	158	unsigned int dec_len [MAX_ENC_LEN];
126		159
127	unsigned int encode_len (unsigned int len);	160	unsigned int encode_len (unsigned int len) const;
128	unsigned int decode_len (unsigned int len);	161	unsigned int decode_len (unsigned int len) const;
129		162
130	unsigned int encode (char dst, u8 src, unsigned int len);	163	unsigned int encode (char dst, u8 src, unsigned int len) const;
131	unsigned int decode (u8 dst, char src, unsigned int len);	164	unsigned int decode (u8 dst, char src, unsigned int len) const;
132		165
133	basecoder (const char *cmap);	166	basecoder (const char *cmap);
134	};	167	};
135		168
136	basecoder::basecoder (const char *cmap)	169	basecoder::basecoder (const char *cmap)
…		…
155	enc_len [len] = n;	188	enc_len [len] = n;
156	dec_len [n] = len;	189	dec_len [n] = len;
157	}	190	}
158	}	191	}
159		192
		193	unsigned int
160	unsigned int basecoder::encode_len (unsigned int len)	194	basecoder::encode_len (unsigned int len) const
161	{	195	{
162	return enc_len [len];	196	return enc_len [len];
163	}	197	}
164		198
		199	unsigned int
165	unsigned int basecoder::decode_len (unsigned int len)	200	basecoder::decode_len (unsigned int len) const
166	{	201	{
167	while (len && !dec_len [len])	202	while (len && !dec_len [len])
168	--len;	203	--len;
169		204
170	return dec_len [len];	205	return dec_len [len];
171	}	206	}
172		207
		208	unsigned int
173	unsigned int basecoder::encode (char dst, u8 src, unsigned int len)	209	basecoder::encode (char dst, u8 src, unsigned int len) const
174	{	210	{
175	if (!len \|\| len > MAX_DEC_LEN)	211	if (!len \|\| len > MAX_DEC_LEN)
176	return 0;	212	return 0;
177		213
178	int elen = encode_len (len);	214	int elen = encode_len (len);
…		…
197	*dst++ = cmap.encode [dst_ [i]];	233	*dst++ = cmap.encode [dst_ [i]];
198		234
199	return elen;	235	return elen;
200	}	236	}
201		237
		238	unsigned int
202	unsigned int basecoder::decode (u8 dst, char src, unsigned int len)	239	basecoder::decode (u8 dst, char src, unsigned int len) const
203	{	240	{
204	if (!len \|\| len > MAX_ENC_LEN)	241	if (!len \|\| len > MAX_ENC_LEN)
205	return 0;	242	return 0;
206		243
207	u8 src_ [MAX_ENC_LEN];	244	u8 src_ [MAX_ENC_LEN];
…		…
256	}	293	}
257	abort ();	294	abort ();
258	}	295	}
259	#endif	296	#endif
260		297
261	//static basecoder cdc64 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI-");
262	//static basecoder cdc63 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");
263	static basecoder cdc62 ("dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI");	298	static basecoder cdc62 ("dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI"); // a-zA-Z0-9
264	//static basecoder cdc36 ("dphzr06qmjkb34tsvl81xaef92wgyo57ucni"); // unused as of yet	299	static basecoder cdc36 ("dPhZr06QmJkB34tSvL81xAeF92wGyO57uCnI"); // a-z0-9 for case-changers
265	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");	300	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyOuCnI"); // a-z
266		301
267	/////////////////////////////////////////////////////////////////////////////	302	/////////////////////////////////////////////////////////////////////////////
268		303
269	#define HDRSIZE 6	304	#define HDRSIZE 5
270		305
		306	inline void
271	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)	307	encode_header (char *data, int clientid, int seqno, int retry = 0)
272	{	308	{
		309	assert (clientid < 256);
		310
273	seqno &= SEQNO_MASK;	311	seqno &= SEQNO_MASK;
274		312
275	u8 hdr[3] = {	313	u8 hdr[3] = {
		314	seqno,
		315	(seqno >> 8) \| (retry << 6),
276	clientid,	316	clientid,
277	(seqno >> 8) \| (retry << 6),
278	seqno,
279	};	317	};
280		318
281	assert (clientid < 256);
282
283	cdc26.encode (data, hdr, 3);	319	cdc36.encode (data, hdr, 3);
284	}	320	}
285		321
		322	inline void
286	inline void decode_header (char *data, int &clientid, int &seqno)	323	decode_header (char *data, int &clientid, int &seqno)
287	{	324	{
288	u8 hdr[3];	325	u8 hdr[3];
289		326
290	cdc26.decode (hdr, data, HDRSIZE);	327	cdc36.decode (hdr, data, HDRSIZE);
291		328
292	clientid = hdr[0];	329	clientid = hdr[2];
293	seqno = ((hdr[1] << 8) \| hdr[2]) & SEQNO_MASK;	330	seqno = ((hdr[1] << 8) \| hdr[0]) & SEQNO_MASK;
294	}	331	}
295		332
296	/////////////////////////////////////////////////////////////////////////////	333	/////////////////////////////////////////////////////////////////////////////
297		334
298	struct byte_stream	335	struct byte_stream
…		…
324	byte_stream::~byte_stream ()	361	byte_stream::~byte_stream ()
325	{	362	{
326	delete data;	363	delete data;
327	}	364	}
328		365
		366	void
329	void byte_stream::remove (int count)	367	byte_stream::remove (int count)
330	{	368	{
331	if (count > fill)	369	if (count > fill)
332	assert (count <= fill);	370	assert (count <= fill);
333		371
334	memmove (data, data + count, fill -= count);	372	memmove (data, data + count, fill -= count);
335	}	373	}
336		374
		375	bool
337	bool byte_stream::put (u8 *data, unsigned int datalen)	376	byte_stream::put (u8 *data, unsigned int datalen)
338	{	377	{
339	if (maxsize - fill < datalen)	378	if (maxsize - fill < datalen)
340	return false;	379	return false;
341		380
342	memcpy (this->data + fill, data, datalen); fill += datalen;	381	memcpy (this->data + fill, data, datalen); fill += datalen;
343		382
344	return true;	383	return true;
345	}	384	}
346		385
		386	bool
347	bool byte_stream::put (vpn_packet *pkt)	387	byte_stream::put (vpn_packet *pkt)
348	{	388	{
349	if (maxsize - fill < pkt->len + 2)	389	if (maxsize - fill < pkt->len + 2)
350	return false;	390	return false;
351		391
352	data [fill++] = pkt->len >> 8;	392	data [fill++] = pkt->len >> 8;
…		…
408		448
409	struct dns_cfg	449	struct dns_cfg
410	{	450	{
411	static int next_uid;	451	static int next_uid;
412		452
413	u8 id1, id2, id3, id4;	453	u8 chksum;
		454	u8 rrtype;
		455	u16 uid; // to make request unique
414		456
415	u8 version;	457	u8 version;
416	u8 flags;	458	u8 flags;
417	u8 rrtype;	459	u16 max_size;
		460
		461	u8 id1, id2, id3, id4;
		462
		463	u16 client;
418	u8 def_ttl;	464	u8 def_ttl;
		465	u8 r0;
419		466
420	u16 client;	467	u8 syn_cdc; // cdc en/decoder for syn (A?) requests
421	u16 uid; // to make request unique	468	u8 hdr_cdc; // cdc en/decoder for regular request headers
		469	u8 req_cdc; // cdc en/decoder for regular (ANY?) request data
		470	u8 rep_cdc; // cdc en/decoder for regular (TXT) replies, 0 == 8 bit encoding
422		471
423	u16 max_size;
424	u8 seq_cdc;
425	u8 req_cdc;
426
427	u8 rep_cdc;
428	u8 delay; // time in 0.01s units that the server may delay replying packets
429	u8 r3, r4;
430
431	u8 r5, r6, r7, r8;	472	u8 r1, r2, r3, r4;
432		473
433	void reset (int clientid);	474	void reset (int clientid);
434	bool valid ();	475	bool valid ();
		476	u8 get_chksum ();
435	};	477	};
436		478
437	int dns_cfg::next_uid;	479	int dns_cfg::next_uid;
438		480
		481	void
439	void dns_cfg::reset (int clientid)	482	dns_cfg::reset (int clientid)
440	{	483	{
		484	// this ID must result in some mixed-case characters in cdc26-encoding
441	id1 = 'G';	485	id1 = 'G';
442	id2 = 'V';	486	id2 = 'V';
443	id3 = 'P';	487	id3 = 'P';
444	id4 = 'E';	488	id4 = 'E';
445		489
446	version = 1;	490	version = 2;
447		491
448	rrtype = RR_TYPE_TXT;	492	rrtype = RR_TYPE_TXT;
449	flags = 0;	493	flags = 0;
450	def_ttl = 0;	494	def_ttl = 0;
451	seq_cdc = 26;	495	syn_cdc = 26;
452	req_cdc = 62;	496	hdr_cdc = 36;
		497	req_cdc = conf.dns_case_preserving ? 62 : 36;
453	rep_cdc = 0;	498	rep_cdc = 0;
454	max_size = htons (MAX_PKT_SIZE);	499	max_size = htons (MAX_PKT_SIZE);
455	client = htons (clientid);	500	client = htons (clientid);
456	uid = next_uid++;	501	uid = ++next_uid;
457	delay = 0;
458		502
459	r3 = r4 = 0;	503	r0 = r1 = r2 = r3 = r4 = 0;
460	r4 = r5 = r6 = r7 = 0;
461	}
462		504
		505	chksum = get_chksum ();
		506	}
		507
		508	// simple but not trivial chksum
		509	u8
		510	dns_cfg::get_chksum ()
		511	{
		512	unsigned int sum = 0xff00; // only 16 bits required
		513
		514	u8 old_chksum = chksum;
		515	chksum = 0;
		516
		517	for (unsigned int i = 0; i < sizeof (*this); ++i)
		518	sum += ((u8 )this)[i] (i + 1);
		519
		520	chksum = old_chksum;
		521
		522	return sum + (sum >> 8);
		523	}
		524
		525	bool
463	bool dns_cfg::valid ()	526	dns_cfg::valid ()
464	{	527	{
		528	// although the protocol itself allows for some configurability,
		529	// only the following encoding/decoding settings are implemented.
465	return id1 == 'G'	530	return id1 == 'G'
466	&& id2 == 'V'	531	&& id2 == 'V'
467	&& id3 == 'P'	532	&& id3 == 'P'
468	&& id4 == 'E'	533	&& id4 == 'E'
		534	&& version == 2
469	&& seq_cdc == 26	535	&& syn_cdc == 26
470	&& req_cdc == 62	536	&& hdr_cdc == 36
		537	&& (req_cdc == 36 \|\| req_cdc == 62)
471	&& rep_cdc == 0	538	&& rep_cdc == 0
472	&& version == 1;	539	&& chksum == get_chksum ();
473	}	540	}
474		541
475	struct dns_packet : net_packet	542	struct dns_packet : net_packet
476	{	543	{
477	u16 id;	544	u16 id;
…		…
481	u8 data [MAXSIZE - 6 * 2];	548	u8 data [MAXSIZE - 6 * 2];
482		549
483	int decode_label (char *data, int size, int &offs);	550	int decode_label (char *data, int size, int &offs);
484	};	551	};
485		552
		553	int
486	int dns_packet::decode_label (char *data, int size, int &offs)	554	dns_packet::decode_label (char *data, int size, int &offs)
487	{	555	{
488	char *orig = data;	556	char *orig = data;
489		557
490	memset (data, 0, size);	558	memset (data, 0, size);
491		559
…		…
517	return data - orig;	585	return data - orig;
518	}	586	}
519		587
520	/////////////////////////////////////////////////////////////////////////////	588	/////////////////////////////////////////////////////////////////////////////
521		589
		590	static
		591	u16 next_id ()
		592	{
522	static u16 dns_id = 0; // TODO: should be per-vpn	593	static u16 dns_id = 0; // TODO: should be per-vpn
523		594
524	static u16 next_id ()
525	{
526	if (!dns_id)	595	if (!dns_id)
527	dns_id = time (0);	596	dns_id = time (0);
528		597
529	// the simplest lsfr with periodicity 65535 i could find	598	// the simplest lsfr with periodicity 65535 i could find
530	dns_id = (dns_id << 1)	599	dns_id = (dns_id << 1)
…		…
545	struct vpn *vpn;	614	struct vpn *vpn;
546		615
547	dns_cfg cfg;	616	dns_cfg cfg;
548		617
549	bool established;	618	bool established;
		619	const basecoder *cdc;
550		620
551	tstamp last_received;	621	tstamp last_received;
552	tstamp last_sent;	622	tstamp last_sent;
553	double min_latency;	623	double min_latency;
554	double poll_interval, send_interval;	624	double poll_interval, send_interval;
555		625
556	vector<dns_rcv *> rcvpq;	626	vector<dns_rcv *> rcvpq;
557		627
558	byte_stream rcvdq; int rcvseq;	628	byte_stream rcvdq; int rcvseq; int repseq;
559	byte_stream snddq; int sndseq;	629	byte_stream snddq; int sndseq;
560		630
561	void time_cb (time_watcher &w); time_watcher tw;	631	inline void time_cb (ev::timer &w, int revents); ev::timer tw;
562	void receive_rep (dns_rcv *r);	632	void receive_rep (dns_rcv *r);
		633
		634	void reset (); // quite like tcp RST
		635	void set_cfg (); // to be called after any cfg changes
563		636
564	dns_connection (connection *c);	637	dns_connection (connection *c);
565	~dns_connection ();	638	~dns_connection ();
566	};	639	};
567		640
…		…
585	: dns (dns)	658	: dns (dns)
586	{	659	{
587	timeout = 0;	660	timeout = 0;
588	retry = 0;	661	retry = 0;
589	seqno = 0;	662	seqno = 0;
590	sent = NOW;	663	sent = ev_now ();
591	stdhdr = false;	664	stdhdr = false;
592		665
593	pkt = new dns_packet;	666	pkt = new dns_packet;
594		667
595	pkt->id = next_id ();	668	pkt->id = next_id ();
…		…
598	dns_snd::~dns_snd ()	671	dns_snd::~dns_snd ()
599	{	672	{
600	delete pkt;	673	delete pkt;
601	}	674	}
602		675
		676	static void
603	static void append_domain (dns_packet &pkt, int &offs, const char *domain)	677	append_domain (dns_packet &pkt, int &offs, const char *domain)
604	{	678	{
605	// add tunnel domain	679	// add tunnel domain
606	for (;;)	680	for (;;)
607	{	681	{
608	const char *end = strchr (domain, '.');	682	const char *end = strchr (domain, '.');
…		…
621		695
622	domain = end + 1;	696	domain = end + 1;
623	}	697	}
624	}	698	}
625		699
		700	void
626	void dns_snd::gen_stream_req (int seqno, byte_stream &stream)	701	dns_snd::gen_stream_req (int seqno, byte_stream &stream)
627	{	702	{
628	stdhdr = true;	703	stdhdr = true;
629	this->seqno = seqno;	704	this->seqno = seqno;
630		705
631	timeout = NOW + INITIAL_TIMEOUT;	706	timeout = ev_now () + INITIAL_TIMEOUT;
632		707
633	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	708	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
634	pkt->qdcount = htons (1);	709	pkt->qdcount = htons (1);
635		710
636	int offs = 6*2;	711	int offs = 6*2;
…		…
639	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra	714	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
640		715
641	char enc[256], *encp = enc;	716	char enc[256], *encp = enc;
642	encode_header (enc, THISNODE->id, seqno);	717	encode_header (enc, THISNODE->id, seqno);
643		718
644	int datalen = cdc62.decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE - HDRSIZE);	719	int datalen = dns->cdc->decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE - HDRSIZE);
645		720
646	if (datalen > stream.size ())	721	if (datalen > stream.size ())
647	datalen = stream.size ();	722	datalen = stream.size ();
648		723
649	int enclen = cdc62.encode (enc + HDRSIZE, stream.begin (), datalen) + HDRSIZE;	724	int enclen = dns->cdc->encode (enc + HDRSIZE, stream.begin (), datalen) + HDRSIZE;
650	stream.remove (datalen);	725	stream.remove (datalen);
651		726
652	while (enclen)	727	while (enclen)
653	{	728	{
654	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;	729	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;
…		…
669	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;	744	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
670		745
671	pkt->len = offs;	746	pkt->len = offs;
672	}	747	}
673		748
		749	void
674	void dns_snd::gen_syn_req ()	750	dns_snd::gen_syn_req ()
675	{	751	{
676	timeout = NOW + INITIAL_SYN_TIMEOUT;	752	timeout = ev_now () + INITIAL_SYN_TIMEOUT;
677		753
678	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);	754	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
679	pkt->qdcount = htons (1);	755	pkt->qdcount = htons (1);
680		756
681	int offs = 6 * 2;	757	int offs = 6 * 2;
…		…
720	/////////////////////////////////////////////////////////////////////////////	796	/////////////////////////////////////////////////////////////////////////////
721		797
722	dns_connection::dns_connection (connection *c)	798	dns_connection::dns_connection (connection *c)
723	: c (c)	799	: c (c)
724	, rcvdq (MAX_BACKLOG * 2)	800	, rcvdq (MAX_BACKLOG * 2)
725	, snddq (MAX_BACKLOG * 2)	801	, snddq (MAX_BACKLOG)
726	, tw (this, &dns_connection::time_cb)
727	{	802	{
		803	tw.set<dns_connection, &dns_connection::time_cb> (this);
		804
728	vpn = c->vpn;	805	vpn = c->vpn;
729		806
		807	reset ();
		808	}
		809
		810	dns_connection::~dns_connection ()
		811	{
		812	reset ();
		813	}
		814
		815	void
		816	dns_connection::reset ()
		817	{
		818	while (!rcvpq.empty ())
		819	{
		820	delete rcvpq.back ();
		821	rcvpq.pop_back ();
		822	}
		823
		824	for (int i = vpn->dns_sndpq.size (); i--; )
		825	if (vpn->dns_sndpq [i]->dns == this)
		826	{
		827	vpn->dns_sndpq [i] = vpn->dns_sndpq.back ();
		828	vpn->dns_sndpq.pop_back ();
		829	}
		830
730	established = false;	831	established = false;
731		832
732	rcvseq = sndseq = 0;	833	rcvseq = repseq = sndseq = 0;
733		834
734	last_sent = last_received = 0;	835	last_sent = 0;
735	poll_interval = 0.5; // starting here	836	poll_interval = 0.5; // starting here
736	send_interval = 0.5; // starting rate	837	send_interval = 0.5; // starting rate
737	min_latency = INITIAL_TIMEOUT;	838	min_latency = INITIAL_TIMEOUT;
738	}	839	}
739		840
740	dns_connection::~dns_connection ()	841	void
		842	dns_connection::set_cfg ()
741	{	843	{
742	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();	844	cdc = cfg.req_cdc == 36 ? &cdc36 : &cdc62;
743	i != rcvpq.end ();
744	++i)
745	delete *i;
746	}	845	}
747		846
		847	void
748	void dns_connection::receive_rep (dns_rcv *r)	848	dns_connection::receive_rep (dns_rcv *r)
749	{	849	{
750	if (r->datalen)	850	if (r->datalen)
751	{	851	poll_interval = max (poll_interval * (1. / 1.2), MIN_POLL_INTERVAL);
752	last_received = NOW;
753	tw.trigger ();
754
755	poll_interval = send_interval;
756	}
757	else	852	else
758	{	853	poll_interval = min (poll_interval * 1.1, MAX_POLL_INTERVAL);
759	poll_interval *= 1.5;
760
761	if (poll_interval > MAX_POLL_INTERVAL)
762	poll_interval = MAX_POLL_INTERVAL;
763	}
764		854
765	rcvpq.push_back (r);	855	rcvpq.push_back (r);
766		856
767	redo:	857	redo:
768		858
769	// find next packet	859	// find next packet
770	for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )	860	for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
771	if (SEQNO_EQ (rcvseq, (*i)->seqno))	861	if (SEQNO_EQ (rcvseq, (*i)->seqno))
772	{	862	{
		863	//printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
773	// enter the packet into our input stream	864	// enter the packet into our input stream
774	r = *i;	865	r = *i;
775		866
776	// remove the oldest packet, look forward, as it's oldest first	867	// remove the oldest packet, look forward, as it's oldest first
777	for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)	868	for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
778	if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))	869	if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
779	{	870	{
		871	//printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
780	delete *j;	872	delete *j;
781	rcvpq.erase (j);	873	rcvpq.erase (j);
782	break;	874	break;
783	}	875	}
784		876
785	rcvseq = (rcvseq + 1) & SEQNO_MASK;	877	rcvseq = (rcvseq + 1) & SEQNO_MASK;
786		878
787	if (!rcvdq.put (r->data, r->datalen))	879	if (!rcvdq.put (r->data, r->datalen))
788	{	880	{
		881	// MUST never overflow, can be caused by data corruption, TODO
789	slog (L_ERR, "DNS: !rcvdq.put (r->data, r->datalen)");	882	slog (L_CRIT, "DNS: !rcvdq.put (r->data, r->datalen)");
790	abort (); // MUST never overflow, can be caused by data corruption, TODO	883	reset ();
		884	return;
791	}	885	}
792		886
793	while (vpn_packet *pkt = rcvdq.get ())	887	while (vpn_packet *pkt = rcvdq.get ())
794	{	888	{
795	sockinfo si;	889	sockinfo si;
796	si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;	890	si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
797		891
798	vpn->recv_vpn_packet (pkt, si);	892	vpn->recv_vpn_packet (pkt, si);
799
800	delete pkt;	893	delete pkt;
801	}	894	}
802		895
803	// check for further packets	896	// check for further packets
804	goto redo;	897	goto redo;
…		…
847	{	940	{
848	// correct class, domain: parse	941	// correct class, domain: parse
849	int client, seqno;	942	int client, seqno;
850	decode_header (qname, client, seqno);	943	decode_header (qname, client, seqno);
851		944
852	u8 data[MAXSIZE];
853	int datalen = cdc62.decode (data, qname + HDRSIZE, qlen - (dlen + 1 + HDRSIZE));
854
855	if (0 < client && client <= conns.size ())	945	if (0 < client && client <= conns.size ())
856	{	946	{
857	connection *c = conns [client - 1];	947	connection *c = conns [client - 1];
858	dns_connection *dns = c->dns;	948	dns_connection *dns = c->dns;
859	dns_rcv *rcv;	949	dns_rcv *rcv;
860	bool in_seq;
861		950
862	if (dns)	951	if (dns)
863	{	952	{
		953	u8 data[MAXSIZE];
		954	int datalen = dns->cdc->decode (data, qname + HDRSIZE, qlen - (dlen + 1 + HDRSIZE));
		955
864	for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )	956	for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
865	if (SEQNO_EQ ((*i)->seqno, seqno))	957	if (SEQNO_EQ ((*i)->seqno, seqno))
866	{	958	{
867	// already seen that request: simply reply with the cached reply	959	// already seen that request: simply reply with the cached reply
868	dns_rcv r = i;	960	dns_rcv r = i;
…		…
876	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);	968	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
877		969
878	goto duplicate_request;	970	goto duplicate_request;
879	}	971	}
880		972
881	in_seq = dns->rcvseq == seqno;
882
883	// new packet, queue	973	// new packet, queue
884	rcv = new dns_rcv (seqno, data, datalen);	974	rcv = new dns_rcv (seqno, data, datalen);
885	dns->receive_rep (rcv);	975	dns->receive_rep (rcv);
886	}	976	}
887		977
…		…
904	dlen -= qlen;	994	dlen -= qlen;
905		995
906	// only put data into in-order sequence packets, if	996	// only put data into in-order sequence packets, if
907	// we receive out-of-order packets we generate empty	997	// we receive out-of-order packets we generate empty
908	// replies	998	// replies
909	while (dlen > 1 && !dns->snddq.empty () && in_seq)	999	//printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
		1000	if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
910	{	1001	{
		1002	dns->repseq = seqno;
		1003
		1004	while (dlen > 1 && !dns->snddq.empty ())
		1005	{
911	int txtlen = dlen <= 255 ? dlen - 1 : 255;	1006	int txtlen = dlen <= 255 ? dlen - 1 : 255;
912		1007
913	if (txtlen > dns->snddq.size ())	1008	if (txtlen > dns->snddq.size ())
914	txtlen = dns->snddq.size ();	1009	txtlen = dns->snddq.size ();
915		1010
916	pkt[offs++] = txtlen;	1011	pkt[offs++] = txtlen;
917	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);	1012	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
918	offs += txtlen;	1013	offs += txtlen;
919	dns->snddq.remove (txtlen);	1014	dns->snddq.remove (txtlen);
920		1015
921	dlen -= txtlen + 1;	1016	dlen -= txtlen + 1;
		1017	}
922	}	1018	}
923		1019
924	// avoid empty TXT rdata	1020	// avoid completely empty TXT rdata
925	if (offs == rdlen_offs)	1021	if (offs == rdlen_offs)
926	pkt[offs++] = 0;	1022	pkt[offs++] = 0;
927		1023
928	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());	1024	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
929	}	1025	}
…		…
965	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class	1061	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
966	pkt [offs++] = 0; pkt [offs++] = 0;	1062	pkt [offs++] = 0; pkt [offs++] = 0;
967	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL	1063	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
968	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength	1064	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
969		1065
970	slog (L_INFO, _("DNS: client %d connects"), client);
971
972	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	1066	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
973	pkt [offs++] = CMD_IP_REJ;	1067	pkt [offs++] = CMD_IP_REJ;
974		1068
975	if (0 < client && client <= conns.size ())	1069	if (0 < client && client <= conns.size ())
976	{	1070	{
977	connection *c = conns [client - 1];	1071	connection *c = conns [client - 1];
978		1072
979	if (cfg.valid ())	1073	if (cfg.valid ())
980	{	1074	{
981	pkt [offs - 1] = CMD_IP_SYN;	1075	slog (L_INFO, _("DNS: client %d connects (version %d, req_cdc %d)"), client, cfg.version, cfg.req_cdc);
		1076
		1077	// check for any encoding mismatches - hints at a case problem
		1078	char qname2 [MAX_ENC_LEN];
		1079	cdc26.encode (qname2, (u8 *)&cfg, sizeof (dns_cfg));
982		1080
983	delete c->dns;	1081	delete c->dns;
		1082
		1083	pkt [offs - 1] = memcmp (qname, qname2, cdc26.encode_len (sizeof (dns_cfg)))
		1084	? CMD_IP_CSE : CMD_IP_SYN;
		1085
984	c->dns = new dns_connection (c);	1086	c->dns = new dns_connection (c);
985	c->dns->cfg = cfg;	1087	c->dns->cfg = cfg;
		1088	c->dns->set_cfg ();
986	}	1089	}
987	}	1090	}
988	}	1091	}
989	}	1092	}
990		1093
…		…
1009	{	1112	{
1010	dns_connection dns = (i)->dns;	1113	dns_connection dns = (i)->dns;
1011	connection *c = dns->c;	1114	connection *c = dns->c;
1012	int seqno = (*i)->seqno;	1115	int seqno = (*i)->seqno;
1013	u8 data[MAXSIZE], *datap = data;	1116	u8 data[MAXSIZE], *datap = data;
		1117	//printf ("rcv pkt %x\n", seqno);//D
1014		1118
1015	if ((*i)->retry)	1119	if ((*i)->retry)
1016	{	1120	{
1017	dns->send_interval *= 1.01;	1121	dns->send_interval *= 1.01;
1018	if (dns->send_interval > MAX_SEND_INTERVAL)	1122	if (dns->send_interval > MAX_SEND_INTERVAL)
…		…
1023	#if 0	1127	#if 0
1024	dns->send_interval *= 0.999;	1128	dns->send_interval *= 0.999;
1025	#endif	1129	#endif
1026	// the latency surely puts an upper bound on	1130	// the latency surely puts an upper bound on
1027	// the minimum send interval	1131	// the minimum send interval
1028	double latency = NOW - (*i)->sent;	1132	double latency = ev_now () - (*i)->sent;
1029		1133
1030	if (latency < dns->min_latency)	1134	if (latency < dns->min_latency)
1031	dns->min_latency = latency;	1135	dns->min_latency = latency;
1032		1136
1033	if (dns->send_interval > dns->min_latency * LATENCY_FACTOR)	1137	if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
1034	dns->send_interval = dns->min_latency * LATENCY_FACTOR;	1138	dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
1035		1139
1036	if (dns->send_interval < MIN_SEND_INTERVAL)	1140	if (dns->send_interval < conf.dns_send_interval)
1037	dns->send_interval = MIN_SEND_INTERVAL;	1141	dns->send_interval = conf.dns_send_interval;
1038	}	1142	}
1039		1143
1040	delete *i;	1144	delete *i;
1041	dns_sndpq.erase (i);	1145	dns_sndpq.erase (i);
1042		1146
…		…
1060	ttl \|= pkt [offs++] << 16;	1164	ttl \|= pkt [offs++] << 16;
1061	ttl \|= pkt [offs++] << 8;	1165	ttl \|= pkt [offs++] << 8;
1062	ttl \|= pkt [offs++];	1166	ttl \|= pkt [offs++];
1063	u16 rdlen = pkt [offs++] << 8; rdlen \|= pkt [offs++];	1167	u16 rdlen = pkt [offs++] << 8; rdlen \|= pkt [offs++];
1064		1168
1065	if (qtype == RR_TYPE_NULL \|\| qtype == RR_TYPE_TXT)	1169	if (qtype == RR_TYPE_NULL \|\| qtype == RR_TYPE_TXT \|\| qtype == dns->cfg.rrtype)
1066	{	1170	{
1067	if (rdlen <= MAXSIZE - offs)	1171	if (rdlen <= MAXSIZE - offs)
1068	{	1172	{
1069	// decode bytes, finally	1173	// decode bytes, finally
1070		1174
…		…
1096	{	1200	{
1097	slog (L_TRACE, _("DNS: got tunnel meta command %02x"), ip [3]);	1201	slog (L_TRACE, _("DNS: got tunnel meta command %02x"), ip [3]);
1098		1202
1099	if (ip [3] == CMD_IP_RST)	1203	if (ip [3] == CMD_IP_RST)
1100	{	1204	{
1101	slog (L_DEBUG, _("DNS: got tunnel RST request"));	1205	slog (L_DEBUG, _("DNS: got tunnel RST request."));
1102		1206
1103	delete dns; c->dns = 0;	1207	dns->reset ();
1104
1105	return;	1208	return;
1106	}	1209	}
1107	else if (ip [3] == CMD_IP_SYN)	1210	else if (ip [3] == CMD_IP_SYN)
1108	{	1211	{
1109	slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us."));	1212	slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us."));
1110	dns->established = true;	1213	dns->established = true;
1111	}	1214	}
		1215	else if (ip [3] == CMD_IP_CSE)
		1216	{
		1217	if (conf.dns_case_preserving)
		1218	{
		1219	slog (L_INFO, _("DNS: got tunnel CSE reply, globally downgrading to case-insensitive protocol."));
		1220	conf.dns_case_preserving = false;
		1221	dns->reset ();
		1222	return;
		1223	}
		1224	else
		1225	{
		1226	slog (L_DEBUG, _("DNS: got tunnel CSE reply, server likes us."));
		1227	dns->established = true;
		1228	}
		1229	}
1112	else if (ip [3] == CMD_IP_REJ)	1230	else if (ip [3] == CMD_IP_REJ)
1113	{	1231	{
1114	slog (L_DEBUG, _("DNS: got tunnel REJ reply, server does not like us, aborting."));	1232	slog (L_ERR, _("DNS: got tunnel REJ reply, server does not like us."));
1115	abort ();	1233	dns->tw.start (60.);
1116	}	1234	}
1117	else	1235	else
		1236	{
1118	slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]);	1237	slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]);
		1238	dns->tw.start (60.);
		1239	}
1119	}	1240	}
1120	else	1241	else
1121	slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"),	1242	slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"),
1122	ip [0], ip [1], ip [2], ip [3]);	1243	ip [0], ip [1], ip [2], ip [3]);
1123		1244
…		…
1147	break;	1268	break;
1148	}	1269	}
1149	}	1270	}
1150		1271
1151	void	1272	void
1152	vpn::dnsv4_ev (io_watcher &w, short revents)	1273	vpn::dnsv4_ev (ev::io &w, int revents)
1153	{	1274	{
1154	if (revents & EVENT_READ)	1275	if (revents & EV_READ)
1155	{	1276	{
1156	dns_packet *pkt = new dns_packet;	1277	dns_packet *pkt = new dns_packet;
1157	struct sockaddr_in sa;	1278	struct sockaddr_in sa;
1158	socklen_t sa_len = sizeof (sa);	1279	socklen_t sa_len = sizeof (sa);
1159		1280
…		…
1175	}	1296	}
1176		1297
1177	bool	1298	bool
1178	vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	1299	vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1179	{	1300	{
1180	int client = ntohs (si.port);	1301	int client = ntohl (si.host);
1181		1302
1182	assert (0 < client && client <= conns.size ());	1303	assert (0 < client && client <= conns.size ());
1183		1304
1184	connection *c = conns [client - 1];	1305	connection *c = conns [client - 1];
1185		1306
1186	if (!c->dns)	1307	if (!c->dns)
1187	c->dns = new dns_connection (c);	1308	c->dns = new dns_connection (c);
1188		1309
1189	if (!c->dns->snddq.put (pkt))	1310	if (c->dns->snddq.put (pkt))
1190	return false;	1311	{
		1312	min_it (c->dns->poll_interval, 0.25);
		1313	c->dns->tw ();
		1314	}
1191		1315
1192	c->dns->tw.trigger ();	1316	// always return true even if the buffer overflows
1193
1194	return true;	1317	return true;
1195	}	1318	}
1196		1319
1197	void	1320	void
1198	connection::dnsv4_reset_connection ()	1321	dns_connection::time_cb (ev::timer &w, int revents)
1199	{
1200	//delete dns; dns = 0; //TODO
1201	}
1202
1203	#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1204
1205	void
1206	dns_connection::time_cb (time_watcher &w)
1207	{	1322	{
1208	// servers have to be polled	1323	// servers have to be polled
1209	if (THISNODE->dns_port)	1324	if (THISNODE->dns_port)
1210	return;	1325	return;
1211		1326
1212	// check for timeouts and (re)transmit	1327	// check for timeouts and (re)transmit
1213	tstamp next = NOW + poll_interval;	1328	tstamp next = 86400 * 365;
1214	dns_snd *send = 0;	1329	dns_snd *send = 0;
1215		1330
1216	for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();	1331	for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1217	i != vpn->dns_sndpq.end ();	1332	i != vpn->dns_sndpq.end ();
1218	++i)	1333	++i)
1219	{	1334	{
1220	dns_snd r = i;	1335	dns_snd r = i;
1221		1336
1222	if (r->timeout <= NOW)	1337	if (r->timeout <= ev_now ())
1223	{	1338	{
1224	if (!send)	1339	if (!send)
1225	{	1340	{
1226	send = r;	1341	send = r;
1227		1342
1228	r->retry++;	1343	r->retry++;
1229	r->timeout = NOW + (r->retry * min_latency * 8.);	1344	r->timeout = ev_now () + r->retry * min_latency * conf.dns_timeout_factor;
		1345	//printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D
1230		1346
1231	// the following code changes the query section a bit, forcing	1347	// the following code changes the query section a bit, forcing
1232	// the forwarder to generate a new request	1348	// the forwarder to generate a new request
1233	if (r->stdhdr)	1349	if (r->stdhdr)
1234	{
1235	//printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1236	//encode_header ((char )r->pkt->at (6 2 + 1), THISNODE->id, r->seqno, r->retry);	1350	encode_header ((char )r->pkt->at (6 2 + 1), THISNODE->id, r->seqno, r->retry);
1237	}
1238	}	1351	}
1239	}	1352	}
1240	else	1353	else
1241	NEXT (r->timeout);	1354	min_it (next, r->timeout - ev_now ());
1242	}	1355	}
1243		1356
1244	if (!send)	1357	if (!send)
1245	{	1358	{
1246	// generate a new packet, if wise	1359	// generate a new packet, if wise
…		…
1250	if (vpn->dns_sndpq.empty ())	1363	if (vpn->dns_sndpq.empty ())
1251	{	1364	{
1252	send = new dns_snd (this);	1365	send = new dns_snd (this);
1253		1366
1254	cfg.reset (THISNODE->id);	1367	cfg.reset (THISNODE->id);
		1368	set_cfg ();
1255	send->gen_syn_req ();	1369	send->gen_syn_req ();
1256	}	1370	}
1257	}	1371	}
1258	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING	1372	else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1259	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))	1373	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1260	{	1374	{
1261	if (last_sent + send_interval <= NOW)	1375	if (last_sent + send_interval <= ev_now ())
1262	{	1376	{
1263	//printf ("sending data request etc.\n"); //D	1377	//printf ("sending data request etc.\n"); //D
1264	if (!snddq.empty () \|\| last_received + 1. > NOW)	1378	if (!snddq.empty ())
1265	{
1266	poll_interval = send_interval;
1267	NEXT (NOW + send_interval);	1379	min_it (next, send_interval);
1268	}
1269		1380
1270	send = new dns_snd (this);	1381	send = new dns_snd (this);
1271	send->gen_stream_req (sndseq, snddq);	1382	send->gen_stream_req (sndseq, snddq);
1272	send->timeout = NOW + min_latency * 8.;	1383	send->timeout = ev_now () + min_latency * conf.dns_timeout_factor;
		1384	//printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D
1273		1385
1274	sndseq = (sndseq + 1) & SEQNO_MASK;	1386	sndseq = (sndseq + 1) & SEQNO_MASK;
1275	}	1387	}
1276	else	1388	else
1277	NEXT (last_sent + send_interval);	1389	min_it (next, last_sent + send_interval - ev_now ());
1278	}	1390	}
1279		1391
1280	if (send)	1392	if (send)
1281	vpn->dns_sndpq.push_back (send);	1393	vpn->dns_sndpq.push_back (send);
1282	}	1394	}
1283		1395
1284	if (send)	1396	if (send)
1285	{	1397	{
1286	last_sent = NOW;	1398	last_sent = ev_now ();
1287	sendto (vpn->dnsv4_fd,	1399	sendto (vpn->dnsv4_fd,
1288	send->pkt->at (0), send->pkt->len, 0,	1400	send->pkt->at (0), send->pkt->len, 0,
1289	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());	1401	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1290	}	1402	}
1291		1403
		1404	min_it (next, last_sent + max (poll_interval, send_interval) - ev_now ());
		1405
1292	slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",	1406	slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1293	poll_interval, send_interval, next - NOW,	1407	poll_interval, send_interval, next - ev_now (),
1294	vpn->dns_sndpq.size (), snddq.size (),	1408	vpn->dns_sndpq.size (), snddq.size (),
1295	rcvpq.size ());	1409	rcvpq.size ());
1296		1410
1297	// TODO: no idea when this happens, but when next < NOW, we have a problem
1298	if (next < NOW + 0.001)
1299	next = NOW + 0.1;
1300
1301	w.start (next);	1411	w.start (next);
1302	}	1412	}
1303		1413
1304	#endif	1414	#endif
1305		1415

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.30 by pcg, Mon Mar 14 17:40:01 2005 UTC vs. Revision 1.52 by root, Sun Mar 6 21:01:37 2011 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.30 by pcg, Mon Mar 14 17:40:01 2005 UTC vs.
Revision 1.52 by root, Sun Mar 6 21:01:37 2011 UTC