ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn_dns.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines