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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs.
Revision 1.21 by pcg, Sun Mar 6 21:33:40 2005 UTC

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

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs. Revision 1.21 by pcg, Sun Mar 6 21:33:40 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.8 by pcg, Fri Mar 4 03:43:09 2005 UTC vs.
Revision 1.21 by pcg, Sun Mar 6 21:33:40 2005 UTC