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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.3 by pcg, Tue Mar 1 06:27:20 2005 UTC vs.
Revision 1.6 by pcg, Thu Mar 3 08:38:32 2005 UTC

…		…
42	#include "vpn.h"	42	#include "vpn.h"
43		43
44	#define MIN_RETRY 1.	44	#define MIN_RETRY 1.
45	#define MAX_RETRY 60.	45	#define MAX_RETRY 60.
46		46
47	#define MAX_OUTSTANDING 10 // max. outstanding requests	47	#define MAX_OUTSTANDING 40 // max. outstanding requests
		48	#define MAX_WINDOW 100 // max. for MAX_OUTSTANDING
		49	#define MAX_RATE 1000 // requests/s
		50	#define MAX_BACKLOG (10*1024) // size of protocol backlog, must be > MAXSIZE
		51
		52	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well
		53	// 240 leaves about 4 bytes of server reply data
		54	// every two request byte sless give room for one reply byte
		55
		56	// seqno has 12 bits, but the lower bit is always left as zero
		57	// as bind caches ttl=0 records and we have to generate
		58	// sequence numbers that always differ case-insensitively
		59	#define SEQNO_MASK 0x07ff
48		60
49	/*	61	/*
50		62
51	protocol, in shorthand :)	63	protocol, in shorthand :)
52		64
…		…
75	static const char encode_chars[64 + 1];	87	static const char encode_chars[64 + 1];
76	static s8 decode_chars[256];	88	static s8 decode_chars[256];
77		89
78	static int encode_len (int bytes) { return (bytes * 8 + 5) / 6; }	90	static int encode_len (int bytes) { return (bytes * 8 + 5) / 6; }
79	static int decode_len (int bytes) { return (bytes * 6) / 8; }	91	static int decode_len (int bytes) { return (bytes * 6) / 8; }
80	static void encode (char dst, u8 src, int len);	92	static int encode (char dst, u8 src, int len);
81	static void decode (u8 dst, char src, int len);	93	static int decode (u8 dst, char src, int len);
82		94
83	dns64 ();	95	dns64 ();
84	} dns64;	96	} dns64;
85		97
86	const char dns64::encode_chars[64 + 1] = "0123456789-abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ";	98	// the following sequence has been crafted to
		99	// a) look somewhat random
		100	// b) the even (and odd) indices never share the same character as upper/lowercase
		101	const char dns64::encode_chars[64 + 1] = "_-dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI";
87	s8 dns64::decode_chars[256];	102	s8 dns64::decode_chars[256];
88		103
89	dns64::dns64 ()	104	dns64::dns64 ()
90	{	105	{
91	for (int i = 0; i < 64; i++)	106	for (int i = 0; i < 64; i++)
92	decode_chars [encode_chars [i]] = i + 1;	107	decode_chars [encode_chars [i]] = i + 1;
93	}	108	}
94		109
95	void dns64::encode (char dst, u8 src, int len)	110	int dns64::encode (char dst, u8 src, int len)
96	{	111	{
97	// slow, but easy to debug	112	// slow, but easy to debug
		113	char *beg = dst;
98	unsigned int accum, bits = 0;	114	unsigned int accum, bits = 0;
99		115
100	while (len--)	116	while (len--)
101	{	117	{
102	accum <<= 8;	118	accum <<= 8;
…		…
110	}	126	}
111	}	127	}
112		128
113	if (bits)	129	if (bits)
114	*dst++ = encode_chars [(accum << (6 - bits)) & 63];	130	*dst++ = encode_chars [(accum << (6 - bits)) & 63];
115	}
116		131
		132	return dst - beg;
		133	}
		134
117	void dns64::decode (u8 dst, char src, int len)	135	int dns64::decode (u8 dst, char src, int len)
118	{	136	{
119	// slow, but easy to debug	137	// slow, but easy to debug
		138	u8 *beg = dst;
120	unsigned int accum, bits = 0;	139	unsigned int accum, bits = 0;
121		140
122	while (len--)	141	while (len--)
123	{	142	{
124	s8 chr = decode_chars [(u8)*src++];	143	s8 chr = decode_chars [(u8)*src++];
125		144
126
127	if (!chr)	145	if (!chr)
128	break;	146	continue;
129		147
130	accum <<= 6;	148	accum <<= 6;
131	accum \|= chr - 1;	149	accum \|= chr - 1;
132	bits += 6;	150	bits += 6;
133		151
…		…
135	{	153	{
136	*dst++ = accum >> (bits - 8);	154	*dst++ = accum >> (bits - 8);
137	bits -= 8;	155	bits -= 8;
138	}	156	}
139	}	157	}
		158
		159	return dst - beg;
		160	}
		161
		162	/////////////////////////////////////////////////////////////////////////////
		163
		164	struct byte_stream
		165	{
		166	u8 *data;
		167	int maxsize;
		168	int fill;
		169
		170	byte_stream (int maxsize);
		171	~byte_stream ();
		172
		173	bool empty () { return !fill; }
		174	int size () { return fill; }
		175
		176	bool put (u8 *data, unsigned int datalen);
		177	bool put (vpn_packet *pkt);
		178	vpn_packet *get ();
		179
		180	u8 *begin () { return data; }
		181	void remove (int count);
		182	};
		183
		184	byte_stream::byte_stream (int maxsize)
		185	: maxsize (maxsize), fill (0)
		186	{
		187	data = new u8 [maxsize];
		188	}
		189
		190	byte_stream::~byte_stream ()
		191	{
		192	delete data;
		193	}
		194
		195	void byte_stream::remove (int count)
		196	{
		197	if (count > fill)
		198	abort ();
		199
		200	memmove (data, data + count, fill -= count);
		201	}
		202
		203	bool byte_stream::put (u8 *data, unsigned int datalen)
		204	{
		205	if (maxsize - fill < datalen)
		206	return false;
		207
		208	memcpy (this->data + fill, data, datalen); fill += datalen;
		209
		210	return true;
		211	}
		212
		213	bool byte_stream::put (vpn_packet *pkt)
		214	{
		215	if (maxsize - fill < pkt->len + 2)
		216	return false;
		217
		218	data [fill++] = pkt->len >> 8;
		219	data [fill++] = pkt->len;
		220
		221	memcpy (data + fill, &((*pkt)[0]), pkt->len); fill += pkt->len;
		222
		223	return true;
		224	}
		225
		226	vpn_packet *byte_stream::get ()
		227	{
		228	int len = (data [0] << 8) \| data [1];
		229
		230	if (len > MAXSIZE && fill >= 2)
		231	abort (); // TODO handle this gracefully, connection reset
		232
		233	if (fill < len + 2)
		234	return 0;
		235
		236	vpn_packet *pkt = new vpn_packet;
		237
		238	pkt->len = len;
		239	memcpy (&((*pkt)[0]), data + 2, len);
		240	remove (len + 2);
		241
		242	return pkt;
140	}	243	}
141		244
142	/////////////////////////////////////////////////////////////////////////////	245	/////////////////////////////////////////////////////////////////////////////
143		246
144	#define FLAG_QUERY ( 0 << 15)	247	#define FLAG_QUERY ( 0 << 15)
…		…
147	#define FLAG_OP_QUERY ( 0 << 11)	250	#define FLAG_OP_QUERY ( 0 << 11)
148	#define FLAG_AA ( 1 << 10)	251	#define FLAG_AA ( 1 << 10)
149	#define FLAG_TC ( 1 << 9)	252	#define FLAG_TC ( 1 << 9)
150	#define FLAG_RD ( 1 << 8)	253	#define FLAG_RD ( 1 << 8)
151	#define FLAG_RA ( 1 << 7)	254	#define FLAG_RA ( 1 << 7)
		255	#define FLAG_AUTH ( 1 << 5)
152	#define FLAG_RCODE_MASK (15 << 0)	256	#define FLAG_RCODE_MASK (15 << 0)
153	#define FLAG_RCODE_OK ( 0 << 0)	257	#define FLAG_RCODE_OK ( 0 << 0)
154	#define FLAG_RCODE_FORMERR ( 1 << 0)	258	#define FLAG_RCODE_FORMERR ( 1 << 0)
155	#define FLAG_RCODE_SERVFAIL ( 2 << 0)	259	#define FLAG_RCODE_SERVFAIL ( 2 << 0)
156	#define FLAG_RCODE_NXDOMAIN ( 3 << 0)	260	#define FLAG_RCODE_NXDOMAIN ( 3 << 0)
157	#define FLAG_RCODE_REFUSED ( 5 << 0)	261	#define FLAG_RCODE_REFUSED ( 5 << 0)
158		262
159	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)	263	#define DEFAULT_CLIENT_FLAGS (FLAG_QUERY \| FLAG_OP_QUERY \| FLAG_RD)
160	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD)	264	#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE \| FLAG_OP_QUERY \| FLAG_AA \| FLAG_RD \| FLAG_RA)
161		265
162	struct dns_packet : net_packet	266	struct dns_packet : net_packet
163	{	267	{
164	u16 id;	268	u16 id;
165	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	269	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
…		…
209	struct dns_req	313	struct dns_req
210	{	314	{
211	dns_packet *pkt;	315	dns_packet *pkt;
212	tstamp next;	316	tstamp next;
213	int retry;	317	int retry;
		318	connection *conn;
		319	int seqno;
214		320
215	dns_req (connection c, vpn_packet p, int &offs);	321	dns_req (connection *c);
		322	void gen_stream_req (int seqno, byte_stream *stream);
216	};	323	};
217		324
218	struct dns_rep
219	{
220	};
221
222	static u16 dns_id; // TODO: should be per-vpn	325	static u16 dns_id = 12098; // TODO: should be per-vpn
223		326
224	dns_req::dns_req (connection c, vpn_packet p, int &offs)	327	static u16 next_id ()
		328	{
		329	// the simplest lsfr with periodicity 65535 i could find
		330	dns_id = (dns_id << 1)
		331	\| (((dns_id >> 1)
		332	^ (dns_id >> 2)
		333	^ (dns_id >> 4)
		334	^ (dns_id >> 15)) & 1);
		335
		336	return dns_id;
		337	}
		338
		339	dns_req::dns_req (connection *c)
		340	: conn (c)
225	{	341	{
226	next = 0;	342	next = 0;
227	retry = 0;	343	retry = 0;
228		344
229	pkt = new dns_packet;	345	pkt = new dns_packet;
230		346
231	pkt->id = dns_id++;	347	pkt->id = next_id ();
		348	}
		349
		350	void dns_req::gen_stream_req (int seqno, byte_stream *stream)
		351	{
		352	this->seqno = seqno;
		353
232	pkt->flags = DEFAULT_CLIENT_FLAGS;	354	pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
233	pkt->qdcount = htons (1 * 0);	355	pkt->qdcount = htons (1);
234	pkt->ancount = 0;
235	pkt->nscount = 0;
236	pkt->arcount = 0;
237		356
238	offs += 10000;	357	int offs = 6*2;
		358	int dlen = MAX_DOMAIN_SIZE - strlen (THISNODE->domain) - 2;
		359	// MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,
		360	// so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
239		361
240	c->dns_sndq.push_back (this);	362	u8 data[256]; //TODO
		363
		364	data[0] = THISNODE->id; //TODO
		365	data[1] = seqno >> 7; //TODO
		366	data[2] = seqno << 1; //TODO
		367
		368	int datalen = dns64::decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE) - 3;
		369
		370	if (datalen > stream->size ())
		371	datalen = stream->size ();
		372
		373	char enc[256], *encp = enc;
		374
		375	memcpy (data + 3, stream->begin (), datalen);
		376	int enclen = dns64::encode (enc, data, datalen + 3);
		377	stream->remove (datalen);
		378
		379	while (enclen)
		380	{
		381	int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE;
		382
		383	(*pkt)[offs++] = lbllen;
		384	memcpy (pkt->at (offs), encp, lbllen);
		385
		386	offs += lbllen;
		387	encp += lbllen;
		388
		389	enclen -= lbllen;
		390	}
		391
		392	const char *suffix = THISNODE->domain;
		393
		394	// add tunnel domain
		395	for (;;)
		396	{
		397	const char *end = strchr (suffix, '.');
		398
		399	if (!end)
		400	end = suffix + strlen (suffix);
		401
		402	int len = end - suffix;
		403
		404	(*pkt)[offs++] = len;
		405	memcpy (&((*pkt)[offs]), suffix, len);
		406	offs += len;
		407
		408	if (!*end)
		409	break;
		410
		411	suffix = end + 1;
		412	}
		413
		414	(*pkt)[offs++] = 0;
		415	(pkt)[offs++] = RR_TYPE_ANY >> 8; (pkt)[offs++] = RR_TYPE_ANY;
		416	(pkt)[offs++] = RR_CLASS_IN >> 8; (pkt)[offs++] = RR_CLASS_IN;
		417
		418	pkt->len = offs;
		419	}
		420
		421	struct dns_rcv
		422	{
		423	int seqno;
		424	dns_packet *pkt; // reply packet
		425	u8 data [MAXSIZE]; // actually part of the reply packet...
		426	int datalen;
		427
		428	dns_rcv (int seqno, u8 *data, int datalen);
		429	~dns_rcv ();
		430	};
		431
		432	dns_rcv::dns_rcv (int seqno, u8 *data, int datalen)
		433	: seqno (seqno), pkt (new dns_packet), datalen (datalen)
		434	{
		435	memcpy (this->data, data, datalen);
		436	}
		437
		438	dns_rcv::~dns_rcv ()
		439	{
		440	delete pkt;
241	}	441	}
242		442
243	/////////////////////////////////////////////////////////////////////////////	443	/////////////////////////////////////////////////////////////////////////////
244		444
245	struct dns_cfg	445	struct dns_cfg
…		…
249	u8 unused1;	449	u8 unused1;
250	u16 max_size;	450	u16 max_size;
251	u8 flags1, flags2;	451	u8 flags1, flags2;
252	};	452	};
253		453
254	// reply to client-poll	454	void connection::dnsv4_receive_rep (struct dns_rcv *r)
255	void dnsv4_poll (dns_packet *pkt, int &offs)
256	{	455	{
257	int dlen = MAX_PKT_SIZE - offs - 2;	456	dns_rcvpq.push_back (r);
258		457
259	(*pkt) [offs++] = 0;	458	redo:
260	(*pkt) [offs++] = 5;
261	memcpy (&((*pkt)[offs]), "\01H\02\xff\x00", 5);
262	offs += 5;
263		459
264	pkt->ancount = htons (1);	460	for (vector<dns_rcv *>::iterator i = dns_rcvpq.begin ();
		461	i != dns_rcvpq.end ();
		462	++i)
		463	if (dns_rcvseq == (*i)->seqno)
		464	{
		465	dns_rcv r = i;
		466
		467	dns_rcvseq = (dns_rcvseq + 1) & SEQNO_MASK;
		468
		469	if (!dns_snddq && !dns_rcvdq)
		470	{
		471	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);
		472	dns_snddq = new byte_stream (MAX_BACKLOG);
		473
		474	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		475	}
		476
		477	if (!dns_rcvdq->put (r->data, r->datalen))
		478	abort (); // MUST never overflow, can be caused by data corruption, TODO
		479
		480	while (vpn_packet *pkt = dns_rcvdq->get ())
		481	{
		482	sockinfo si;
		483	si.host = 0; si.port = 0; si.prot = PROT_DNSv4;
		484
		485	vpn->recv_vpn_packet (pkt, si);
		486	}
		487	}
		488	else if ((u32)(i)->seqno - (u32)dns_rcvseq + MAX_WINDOW > MAX_WINDOW 2)
		489	{
		490	//D
		491	//abort();
		492	printf ("%d erasing %d (%d)\n", THISNODE->id, (u32)(*i)->seqno, dns_rcvseq);
		493	dns_rcvpq.erase (i);
		494	goto redo;
		495	}
		496	}
		497
		498	dns_packet *
		499	vpn::dnsv4_server (dns_packet *pkt)
		500	{
		501	u16 flags = ntohs (pkt->flags);
		502
		503	//memcpy (&((rep)[0]), &((pkt)[0]), pkt->len);
		504	int offs = 6 * 2; // skip header
		505
265	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);	506	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
266		507
267	printf ("we have room for %d bytes\n", dlen);	508	if (!(flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))
		509	&& pkt->qdcount == htons (1))
		510	{
		511	char qname[MAXSIZE];
		512	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);
		513
		514	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];
		515	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];
		516
		517	pkt->qdcount = htons (1);
		518	pkt->ancount = 0;
		519	pkt->nscount = 0; // should be self, as other nameservers reply like this
		520	pkt->arcount = 0; // a record for self, as other nameservers reply like this
		521
		522	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);
		523
		524	int dlen = strlen (THISNODE->domain);
		525
		526	if (qclass == RR_CLASS_IN
		527	&& (qtype == RR_TYPE_ANY \|\| qtype == RR_TYPE_TXT)
		528	&& qlen > dlen + 1
		529	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))
		530	{
		531	// correct class, domain: parse
		532	u8 data[MAXSIZE];
		533	int datalen = dns64::decode (data, qname, qlen - dlen - 1);
		534
		535	int client = data[0];
		536	int seqno = ((data[1] << 7) \| (data[2] >> 1)) & SEQNO_MASK;
		537
		538	if (0 < client && client <= conns.size ())
		539	{
		540	connection *c = conns [client - 1];
		541
		542	redo:
		543
		544	for (vector<dns_rcv *>::iterator i = c->dns_rcvpq.begin ();
		545	i != c->dns_rcvpq.end ();
		546	++i)
		547	if ((*i)->seqno == seqno)
		548	{
		549	// already seen that request: simply reply with the cached reply
		550	dns_rcv r = i;
		551
		552	printf ("DUPLICATE %d\n", htons (r->pkt->id));//D
		553
		554	offs = r->pkt->len;
		555	memcpy (pkt->at (0), r->pkt->at (0), offs);
		556	goto duplicate_request;
		557	}
		558
		559	// new packet, queue
		560	dns_rcv *rcv = new dns_rcv (seqno, data + 3, datalen - 3);
		561	c->dnsv4_receive_rep (rcv);
		562
		563	// now generate reply
		564	pkt->ancount = htons (1); // one answer RR
		565	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
		566
		567	(*pkt) [offs++] = 0xc0;
		568	(pkt) [offs++] = 6 2; // same as in query section
		569
		570	(pkt) [offs++] = RR_TYPE_TXT >> 8; (pkt) [offs++] = RR_TYPE_TXT;
		571	(pkt) [offs++] = RR_CLASS_IN >> 8; (pkt) [offs++] = RR_CLASS_IN;
		572
		573	(pkt) [offs++] = 0; (pkt) [offs++] = 0;
		574	(pkt) [offs++] = 0; (pkt) [offs++] = 0; // TTL
		575
		576	int dlen = MAX_PKT_SIZE - offs - 2;
		577
		578	// bind doesn't compress well, so reduce further by one label length
		579	dlen -= qlen;
		580
		581	int rdlen_offs = offs += 2;
		582
		583	while (c->dns_snddq
		584	&& !c->dns_snddq->empty ()
		585	&& dlen > 1)
		586	{
		587	int txtlen = dlen <= 255 ? dlen - 1 : 255;
		588
		589	if (txtlen > c->dns_snddq->size ())
		590	txtlen = c->dns_snddq->size ();
		591
		592	(*pkt)[offs++] = txtlen;
		593	memcpy (pkt->at (offs), c->dns_snddq->begin (), txtlen);
		594	offs += txtlen;
		595	c->dns_snddq->remove (txtlen);
		596
		597	dlen -= txtlen + 1;
		598	}
		599
		600	// avoid empty TXT rdata
		601	if (offs == rdlen_offs)
		602	(*pkt)[offs++] = 0;
		603
		604	int rdlen = offs - rdlen_offs;
		605
		606	(*pkt) [rdlen_offs - 2] = rdlen >> 8;
		607	(*pkt) [rdlen_offs - 1] = rdlen;
		608
		609	// now update dns_rcv copy
		610	rcv->pkt->len = offs;
		611	memcpy (rcv->pkt->at (0), pkt->at (0), offs);
		612
		613	duplicate_request: ;
		614	}
		615	else
		616	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
		617	}
		618
		619	pkt->len = offs;
		620	}
		621
		622	return pkt;
		623	}
		624
		625	void
		626	vpn::dnsv4_client (dns_packet *pkt)
		627	{
		628	u16 flags = ntohs (pkt->flags);
		629	int offs = 6 * 2; // skip header
		630
		631	pkt->qdcount = ntohs (pkt->qdcount);
		632	pkt->ancount = ntohs (pkt->ancount);
		633
		634	// go through our request list and find the corresponding request
		635	for (vector<dns_req *>::iterator i = dns_sndpq.begin ();
		636	i != dns_sndpq.end ();
		637	++i)
		638	if ((*i)->pkt->id == pkt->id)
		639	{
		640	connection c = (i)->conn;
		641	int seqno = (*i)->seqno;
		642	u8 data[MAXSIZE], *datap = data;
		643
		644	delete *i;
		645	dns_sndpq.erase (i);
		646
		647	if (flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))
		648	{
		649	char qname[MAXSIZE];
		650
		651	while (pkt->qdcount-- && offs < MAXSIZE - 4)
		652	{
		653	int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);
		654	offs += 4; // skip qtype, qclass
		655	}
		656
		657	while (pkt->ancount-- && offs < MAXSIZE - 10)
		658	{
		659	pkt->decode_label ((char *)qname, MAXSIZE - offs, offs);
		660
		661	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];
		662	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];
		663	u32 ttl = (*pkt) [offs++] << 24;
		664	ttl \|= (*pkt) [offs++] << 16;
		665	ttl \|= (*pkt) [offs++] << 8;
		666	ttl \|= (*pkt) [offs++];
		667
		668	u16 rdlen = (pkt) [offs++] << 8; rdlen \|= (pkt) [offs++];
		669
		670	if (rdlen <= MAXSIZE - offs)
		671	{
		672	// decode bytes, finally
		673
		674	while (rdlen)
		675	{
		676	int txtlen = (*pkt) [offs++];
		677
		678	assert (txtlen + offs < MAXSIZE - 1);
		679
		680	memcpy (datap, pkt->at (offs), txtlen);
		681	datap += txtlen; offs += txtlen;
		682
		683	rdlen -= txtlen + 1;
		684	}
		685
		686	}
		687
		688	}
		689	}
		690
		691	// todo: pkt now used
		692	c->dnsv4_receive_rep (new dns_rcv (seqno, data, datap - data));
		693
		694	break;
		695	}
		696
		697	delete pkt;
268	}	698	}
269		699
270	void	700	void
271	vpn::dnsv4_ev (io_watcher &w, short revents)	701	vpn::dnsv4_ev (io_watcher &w, short revents)
272	{	702	{
…		…
274	{	704	{
275	dns_packet *pkt = new dns_packet;	705	dns_packet *pkt = new dns_packet;
276	struct sockaddr_in sa;	706	struct sockaddr_in sa;
277	socklen_t sa_len = sizeof (sa);	707	socklen_t sa_len = sizeof (sa);
278		708
279	int len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	709	pkt->len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
280	pkt->len = len;
281		710
282	u16 flags = ntohs (pkt->flags);	711	if (pkt->len > 0)
283
284	if (THISNODE->dns_port)
285	{	712	{
286	// server	713	if (pkt->flags & htons (FLAG_TC))
287	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
288
289	int offs = 6 * 2; // skip header
290
291	if (!(flags & (FLAG_RESPONSE \| FLAG_OP_MASK \| FLAG_TC))
292	&& pkt->qdcount == htons (1))
293	{	714	{
294	char qname[MAXSIZE];	715	slog (L_WARN, _("DNS request/response truncated, check protocol settings."));
295	int qlen = pkt->decode_label ((char *)qname, MAXSIZE, offs);	716	//TODO connection reset
296
297	printf ("rcvd packet len %d, id%04x flags%04x q%04x a%04x n%04x a%04x <%s>\n", len,
298	pkt->id, flags, pkt->qdcount, pkt->ancount, pkt->nscount, pkt->arcount, qname);//D
299
300	u16 qtype = (pkt) [offs++] << 8; qtype \|= (pkt) [offs++];
301	u16 qclass = (pkt) [offs++] << 8; qclass \|= (pkt) [offs++];
302
303	pkt->qdcount = htons (1);
304	pkt->ancount = 0;
305	pkt->nscount = 0; // should be self, as other nameservers reply like this
306	pkt->arcount = 0; // a record for self, as other nameservers reply like this
307
308	pkt->flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_NXDOMAIN);
309
310	int dlen = strlen (THISNODE->domain);
311
312	if (qclass == RR_CLASS_IN
313	&& (qtype == RR_TYPE_ANY \|\| qtype == RR_TYPE_TXT)
314	&& qlen > dlen + 1
315	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))
316	{
317	// correct class, now generate reply
318	pkt->ancount = htons (1); // one answer RR
319
320	(*pkt) [offs++] = 0xc0;
321	(pkt) [offs++] = 6 2; // same as in query section
322
323	(pkt) [offs++] = RR_TYPE_TXT >> 8; (pkt) [offs++] = RR_TYPE_TXT;
324	(pkt) [offs++] = RR_CLASS_IN >> 8; (pkt) [offs++] = RR_CLASS_IN;
325
326	(pkt) [offs++] = 0; (pkt) [offs++] = 0;
327	(pkt) [offs++] = 0; (pkt) [offs++] = 0; // TTL
328
329	dnsv4_poll (pkt, offs);
330	printf ("correct class\n");
331	}
332	}	717	}
333		718
		719	if (THISNODE->dns_port)
		720	{
		721	pkt = dnsv4_server (pkt);
334	sendto (w.fd, &((pkt)[0]), offs, 0, (sockaddr )&sa, sa_len);	722	sendto (w.fd, &((pkt)[0]), pkt->len, 0, (sockaddr )&sa, sa_len);
335	}	723	}
336	else	724	else
337	{	725	dnsv4_client (pkt);
338	// client
339	}	726	}
340	}	727	}
341	}	728	}
342		729
343	bool	730	bool
344	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	731	connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
345	{	732	{
346	if (dns_sndq.size () >= MAX_OUTSTANDING)	733	// never initialized
		734	if (!dns_snddq && !dns_rcvdq)
		735	{
		736	dns_rcvdq = new byte_stream (MAX_BACKLOG * 2);
		737	dns_snddq = new byte_stream (MAX_BACKLOG);
		738
		739	//dns_rcvseq = dns_sndseq = 0;
		740
		741	dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		742	}
		743
		744	if (!dns_snddq->put (pkt))
347	return false;	745	return false;
348		746
349	// split vpn packet into dns packets, add to sndq	747	// start timer if neccessary
350	for (int offs = 0; offs < pkt->len; )	748	if (!THISNODE->dns_port && !dnsv4_tw.active)
351	new dns_req (this, pkt, offs);
352
353	// force transmit
354	dnsv4_cb (dnsv4_tw);	749	dnsv4_cb (dnsv4_tw);
355		750
356	return true;	751	return true;
357	}	752	}
358		753
359	void	754	void
360	connection::dnsv4_cb (time_watcher &w)	755	connection::dnsv4_cb (time_watcher &w)
361	{	756	{
362	// check for timeouts and (re)transmit	757	// check for timeouts and (re)transmit
363	tstamp next = NOW + 60;	758	tstamp next = NOW + 60;
		759	dns_req *send = 0;
364		760
365	slog (L_NOISE, _("dnsv4, %d packets in send queue\n"), dns_sndq.size ());
366
367	if (dns_sndq.empty ())
368	{
369	next = NOW + 1;
370	// push poll packet
371	}
372
373	for (vector<dns_req *>::iterator i = dns_sndq.begin ();	761	for (vector<dns_req *>::iterator i = vpn->dns_sndpq.begin ();
374	i != dns_sndq.end ();	762	i != vpn->dns_sndpq.end ();
375	++i)	763	++i)
376	{	764	{
377	dns_req r = i;	765	dns_req r = i;
378		766
379	if (r->next <= NOW)	767	if (r->next <= NOW)
380	{	768	{
381	slog (L_NOISE, _("dnsv4, send req %d\n"), r->pkt->id);	769	if (!send)
		770	{
		771	send = r;
		772
		773	if (r->retry)//D
		774	printf ("req %d, retry %d\n", r->pkt->id, r->retry);
382	r->retry++;	775	r->retry++;
383	r->next = NOW + r->retry;	776	r->next = NOW + r->retry;
		777	}
384	}	778	}
385		779
386	if (r->next < next)	780	if (r->next < next)
387	next = r->next;	781	next = r->next;
388	}	782	}
389		783
390	printf ("%f next\n", next);	784	if (!send
		785	&& vpn->dns_sndpq.size () < MAX_OUTSTANDING)
		786	{
		787	send = new dns_req (this);
		788	send->gen_stream_req (dns_sndseq, dns_snddq);
		789	vpn->dns_sndpq.push_back (send);
		790
		791	dns_sndseq = (dns_sndseq + 1) & SEQNO_MASK;
		792	}
		793
		794	tstamp min_next = NOW + (1. / (tstamp)MAX_RATE);
		795
		796	if (send)
		797	{
		798	dns_packet *pkt = send->pkt;
		799
		800	next = min_next;
		801
		802	sendto (vpn->dnsv4_fd, &((*pkt)[0]), pkt->len, 0, dns_si.sav4 (), dns_si.salenv4 ());
		803	}
		804	else if (next < min_next)
		805	next = min_next;
		806
391	w.start (next);	807	w.start (next);
392	}	808	}
393		809
394	#endif	810	#endif
395		811

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.3 by pcg, Tue Mar 1 06:27:20 2005 UTC vs. Revision 1.6 by pcg, Thu Mar 3 08:38:32 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.3 by pcg, Tue Mar 1 06:27:20 2005 UTC vs.
Revision 1.6 by pcg, Thu Mar 3 08:38:32 2005 UTC