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.4 by pcg, Wed Mar 2 05:49:31 2005 UTC vs.
Revision 1.52 by root, Sun Mar 6 21:01:37 2011 UTC

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

Diff Legend

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