1 | /* |
1 | /* |
2 | vpn_dns.C -- handle the dns tunnel part of the protocol. |
2 | vpn_dns.C -- handle the dns tunnel part of the protocol. |
3 | Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> |
3 | Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> |
4 | |
4 | |
5 | This file is part of GVPE. |
5 | This file is part of GVPE. |
6 | |
6 | |
7 | GVPE is free software; you can redistribute it and/or modify |
7 | GVPE is free software; you can redistribute it and/or modify it |
8 | it under the terms of the GNU General Public License as published by |
8 | under the terms of the GNU General Public License as published by the |
9 | the Free Software Foundation; either version 2 of the License, or |
9 | Free Software Foundation; either version 3 of the License, or (at your |
10 | (at your option) any later version. |
10 | option) any later version. |
11 | |
11 | |
12 | This program is distributed in the hope that it will be useful, |
12 | This program is distributed in the hope that it will be useful, but |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
15 | GNU General Public License for more details. |
15 | Public License for more details. |
16 | |
16 | |
17 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License along |
18 | along with gvpe; if not, write to the Free Software |
18 | with this program; if not, see <http://www.gnu.org/licenses/>. |
19 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | |
|
|
20 | Additional permission under GNU GPL version 3 section 7 |
|
|
21 | |
|
|
22 | If you modify this Program, or any covered work, by linking or |
|
|
23 | combining it with the OpenSSL project's OpenSSL library (or a modified |
|
|
24 | version of that library), containing parts covered by the terms of the |
|
|
25 | OpenSSL or SSLeay licenses, the licensors of this Program grant you |
|
|
26 | additional permission to convey the resulting work. Corresponding |
|
|
27 | Source for a non-source form of such a combination shall include the |
|
|
28 | source code for the parts of OpenSSL used as well as that of the |
|
|
29 | covered work. |
20 | */ |
30 | */ |
|
|
31 | |
|
|
32 | // TODO: EDNS0 option to increase dns mtu? |
|
|
33 | // TODO: re-write dns packet parsing/creation using a safe mem-buffer |
|
|
34 | // to ensure no buffer overflows or similar problems. |
21 | |
35 | |
22 | #include "config.h" |
36 | #include "config.h" |
23 | |
37 | |
24 | #if ENABLE_DNS |
38 | #if ENABLE_DNS |
25 | |
39 | |
… | |
… | |
38 | #include <unistd.h> |
52 | #include <unistd.h> |
39 | #include <fcntl.h> |
53 | #include <fcntl.h> |
40 | |
54 | |
41 | #include <map> |
55 | #include <map> |
42 | |
56 | |
|
|
57 | #include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */ |
43 | #include <gmp.h> |
58 | #include <gmp.h> |
44 | |
59 | |
45 | #include "netcompat.h" |
60 | #include "netcompat.h" |
46 | |
61 | |
47 | #include "vpn.h" |
62 | #include "vpn.h" |
… | |
… | |
68 | #define MAX_PKT_SIZE 512 |
83 | #define MAX_PKT_SIZE 512 |
69 | |
84 | |
70 | #define RR_TYPE_A 1 |
85 | #define RR_TYPE_A 1 |
71 | #define RR_TYPE_NULL 10 |
86 | #define RR_TYPE_NULL 10 |
72 | #define RR_TYPE_TXT 16 |
87 | #define RR_TYPE_TXT 16 |
|
|
88 | #define RR_TYPE_AAAA 28 |
73 | #define RR_TYPE_ANY 255 |
89 | #define RR_TYPE_ANY 255 |
74 | |
90 | |
75 | #define RR_CLASS_IN 1 |
91 | #define RR_CLASS_IN 1 |
76 | |
92 | |
77 | #define CMD_IP_1 207 |
93 | #define CMD_IP_1 207 |
… | |
… | |
101 | memset (enc, (char) 0, 256); |
117 | memset (enc, (char) 0, 256); |
102 | memset (dec, (char)INVALID, 256); |
118 | memset (dec, (char)INVALID, 256); |
103 | |
119 | |
104 | for (size = 0; cmap [size]; size++) |
120 | for (size = 0; cmap [size]; size++) |
105 | { |
121 | { |
|
|
122 | char c = cmap [size]; |
|
|
123 | |
106 | enc [size] = cmap [size]; |
124 | enc [size] = c; |
107 | dec [(u8)enc [size]] = size; |
125 | dec [(u8)c] = size; |
|
|
126 | |
|
|
127 | // allow lowercase/uppercase aliases if possible |
|
|
128 | if (c >= 'A' && c <= 'Z' && dec [c + ('a' - 'A')] == INVALID) dec [c + ('a' - 'A')] = size; |
|
|
129 | if (c >= 'a' && c <= 'z' && dec [c - ('a' - 'A')] == INVALID) dec [c - ('a' - 'A')] = size; |
108 | } |
130 | } |
109 | |
131 | |
110 | assert (size < 256); |
132 | assert (size < 256); |
111 | } |
133 | } |
112 | |
134 | |
… | |
… | |
152 | enc_len [len] = n; |
174 | enc_len [len] = n; |
153 | dec_len [n] = len; |
175 | dec_len [n] = len; |
154 | } |
176 | } |
155 | } |
177 | } |
156 | |
178 | |
|
|
179 | unsigned int |
157 | unsigned int basecoder::encode_len (unsigned int len) |
180 | basecoder::encode_len (unsigned int len) |
158 | { |
181 | { |
159 | return enc_len [len]; |
182 | return enc_len [len]; |
160 | } |
183 | } |
161 | |
184 | |
|
|
185 | unsigned int |
162 | unsigned int basecoder::decode_len (unsigned int len) |
186 | basecoder::decode_len (unsigned int len) |
163 | { |
187 | { |
164 | while (len && !dec_len [len]) |
188 | while (len && !dec_len [len]) |
165 | --len; |
189 | --len; |
166 | |
190 | |
167 | return dec_len [len]; |
191 | return dec_len [len]; |
168 | } |
192 | } |
169 | |
193 | |
|
|
194 | unsigned int |
170 | unsigned int basecoder::encode (char *dst, u8 *src, unsigned int len) |
195 | basecoder::encode (char *dst, u8 *src, unsigned int len) |
171 | { |
196 | { |
172 | if (!len || len > MAX_DEC_LEN) |
197 | if (!len || len > MAX_DEC_LEN) |
173 | return 0; |
198 | return 0; |
174 | |
199 | |
175 | int elen = encode_len (len); |
200 | int elen = encode_len (len); |
… | |
… | |
194 | *dst++ = cmap.encode [dst_ [i]]; |
219 | *dst++ = cmap.encode [dst_ [i]]; |
195 | |
220 | |
196 | return elen; |
221 | return elen; |
197 | } |
222 | } |
198 | |
223 | |
|
|
224 | unsigned int |
199 | unsigned int basecoder::decode (u8 *dst, char *src, unsigned int len) |
225 | basecoder::decode (u8 *dst, char *src, unsigned int len) |
200 | { |
226 | { |
201 | if (!len || len > MAX_ENC_LEN) |
227 | if (!len || len > MAX_ENC_LEN) |
202 | return 0; |
228 | return 0; |
203 | |
229 | |
204 | u8 src_ [MAX_ENC_LEN]; |
230 | u8 src_ [MAX_ENC_LEN]; |
… | |
… | |
263 | |
289 | |
264 | ///////////////////////////////////////////////////////////////////////////// |
290 | ///////////////////////////////////////////////////////////////////////////// |
265 | |
291 | |
266 | #define HDRSIZE 6 |
292 | #define HDRSIZE 6 |
267 | |
293 | |
|
|
294 | inline void |
268 | inline void encode_header (char *data, int clientid, int seqno, int retry = 0) |
295 | encode_header (char *data, int clientid, int seqno, int retry = 0) |
269 | { |
296 | { |
270 | seqno &= SEQNO_MASK; |
297 | seqno &= SEQNO_MASK; |
271 | |
298 | |
272 | u8 hdr[3] = { |
299 | u8 hdr[3] = { |
273 | clientid, |
300 | clientid, |
… | |
… | |
278 | assert (clientid < 256); |
305 | assert (clientid < 256); |
279 | |
306 | |
280 | cdc26.encode (data, hdr, 3); |
307 | cdc26.encode (data, hdr, 3); |
281 | } |
308 | } |
282 | |
309 | |
|
|
310 | inline void |
283 | inline void decode_header (char *data, int &clientid, int &seqno) |
311 | decode_header (char *data, int &clientid, int &seqno) |
284 | { |
312 | { |
285 | u8 hdr[3]; |
313 | u8 hdr[3]; |
286 | |
314 | |
287 | cdc26.decode (hdr, data, HDRSIZE); |
315 | cdc26.decode (hdr, data, HDRSIZE); |
288 | |
316 | |
… | |
… | |
321 | byte_stream::~byte_stream () |
349 | byte_stream::~byte_stream () |
322 | { |
350 | { |
323 | delete data; |
351 | delete data; |
324 | } |
352 | } |
325 | |
353 | |
|
|
354 | void |
326 | void byte_stream::remove (int count) |
355 | byte_stream::remove (int count) |
327 | { |
356 | { |
328 | if (count > fill) |
357 | if (count > fill) |
329 | assert (count <= fill); |
358 | assert (count <= fill); |
330 | |
359 | |
331 | memmove (data, data + count, fill -= count); |
360 | memmove (data, data + count, fill -= count); |
332 | } |
361 | } |
333 | |
362 | |
|
|
363 | bool |
334 | bool byte_stream::put (u8 *data, unsigned int datalen) |
364 | byte_stream::put (u8 *data, unsigned int datalen) |
335 | { |
365 | { |
336 | if (maxsize - fill < datalen) |
366 | if (maxsize - fill < datalen) |
337 | return false; |
367 | return false; |
338 | |
368 | |
339 | memcpy (this->data + fill, data, datalen); fill += datalen; |
369 | memcpy (this->data + fill, data, datalen); fill += datalen; |
340 | |
370 | |
341 | return true; |
371 | return true; |
342 | } |
372 | } |
343 | |
373 | |
|
|
374 | bool |
344 | bool byte_stream::put (vpn_packet *pkt) |
375 | byte_stream::put (vpn_packet *pkt) |
345 | { |
376 | { |
346 | if (maxsize - fill < pkt->len + 2) |
377 | if (maxsize - fill < pkt->len + 2) |
347 | return false; |
378 | return false; |
348 | |
379 | |
349 | data [fill++] = pkt->len >> 8; |
380 | data [fill++] = pkt->len >> 8; |
… | |
… | |
431 | bool valid (); |
462 | bool valid (); |
432 | }; |
463 | }; |
433 | |
464 | |
434 | int dns_cfg::next_uid; |
465 | int dns_cfg::next_uid; |
435 | |
466 | |
|
|
467 | void |
436 | void dns_cfg::reset (int clientid) |
468 | dns_cfg::reset (int clientid) |
437 | { |
469 | { |
438 | id1 = 'G'; |
470 | id1 = 'G'; |
439 | id2 = 'V'; |
471 | id2 = 'V'; |
440 | id3 = 'P'; |
472 | id3 = 'P'; |
441 | id4 = 'E'; |
473 | id4 = 'E'; |
… | |
… | |
455 | |
487 | |
456 | r3 = r4 = 0; |
488 | r3 = r4 = 0; |
457 | r4 = r5 = r6 = r7 = 0; |
489 | r4 = r5 = r6 = r7 = 0; |
458 | } |
490 | } |
459 | |
491 | |
|
|
492 | bool |
460 | bool dns_cfg::valid () |
493 | dns_cfg::valid () |
461 | { |
494 | { |
|
|
495 | // although the protocol itself allows for some configurability, |
|
|
496 | // only the following encoding/decoding settings are implemented. |
462 | return id1 == 'G' |
497 | return id1 == 'G' |
463 | && id2 == 'V' |
498 | && id2 == 'V' |
464 | && id3 == 'P' |
499 | && id3 == 'P' |
465 | && id4 == 'E' |
500 | && id4 == 'E' |
466 | && seq_cdc == 26 |
501 | && seq_cdc == 26 |
… | |
… | |
478 | u8 data [MAXSIZE - 6 * 2]; |
513 | u8 data [MAXSIZE - 6 * 2]; |
479 | |
514 | |
480 | int decode_label (char *data, int size, int &offs); |
515 | int decode_label (char *data, int size, int &offs); |
481 | }; |
516 | }; |
482 | |
517 | |
|
|
518 | int |
483 | int dns_packet::decode_label (char *data, int size, int &offs) |
519 | dns_packet::decode_label (char *data, int size, int &offs) |
484 | { |
520 | { |
485 | char *orig = data; |
521 | char *orig = data; |
486 | |
522 | |
487 | memset (data, 0, size); |
523 | memset (data, 0, size); |
488 | |
524 | |
… | |
… | |
514 | return data - orig; |
550 | return data - orig; |
515 | } |
551 | } |
516 | |
552 | |
517 | ///////////////////////////////////////////////////////////////////////////// |
553 | ///////////////////////////////////////////////////////////////////////////// |
518 | |
554 | |
|
|
555 | static |
|
|
556 | u16 next_id () |
|
|
557 | { |
519 | static u16 dns_id = 0; // TODO: should be per-vpn |
558 | static u16 dns_id = 0; // TODO: should be per-vpn |
520 | |
559 | |
521 | static u16 next_id () |
|
|
522 | { |
|
|
523 | if (!dns_id) |
560 | if (!dns_id) |
524 | dns_id = time (0); |
561 | dns_id = time (0); |
525 | |
562 | |
526 | // the simplest lsfr with periodicity 65535 i could find |
563 | // the simplest lsfr with periodicity 65535 i could find |
527 | dns_id = (dns_id << 1) |
564 | dns_id = (dns_id << 1) |
… | |
… | |
553 | vector<dns_rcv *> rcvpq; |
590 | vector<dns_rcv *> rcvpq; |
554 | |
591 | |
555 | byte_stream rcvdq; int rcvseq; int repseq; |
592 | byte_stream rcvdq; int rcvseq; int repseq; |
556 | byte_stream snddq; int sndseq; |
593 | byte_stream snddq; int sndseq; |
557 | |
594 | |
558 | void time_cb (time_watcher &w); time_watcher tw; |
595 | inline void time_cb (ev::timer &w, int revents); ev::timer tw; |
559 | void receive_rep (dns_rcv *r); |
596 | void receive_rep (dns_rcv *r); |
560 | |
597 | |
561 | dns_connection (connection *c); |
598 | dns_connection (connection *c); |
562 | ~dns_connection (); |
599 | ~dns_connection (); |
563 | }; |
600 | }; |
… | |
… | |
582 | : dns (dns) |
619 | : dns (dns) |
583 | { |
620 | { |
584 | timeout = 0; |
621 | timeout = 0; |
585 | retry = 0; |
622 | retry = 0; |
586 | seqno = 0; |
623 | seqno = 0; |
587 | sent = NOW; |
624 | sent = ev_now (); |
588 | stdhdr = false; |
625 | stdhdr = false; |
589 | |
626 | |
590 | pkt = new dns_packet; |
627 | pkt = new dns_packet; |
591 | |
628 | |
592 | pkt->id = next_id (); |
629 | pkt->id = next_id (); |
… | |
… | |
595 | dns_snd::~dns_snd () |
632 | dns_snd::~dns_snd () |
596 | { |
633 | { |
597 | delete pkt; |
634 | delete pkt; |
598 | } |
635 | } |
599 | |
636 | |
|
|
637 | static void |
600 | static void append_domain (dns_packet &pkt, int &offs, const char *domain) |
638 | append_domain (dns_packet &pkt, int &offs, const char *domain) |
601 | { |
639 | { |
602 | // add tunnel domain |
640 | // add tunnel domain |
603 | for (;;) |
641 | for (;;) |
604 | { |
642 | { |
605 | const char *end = strchr (domain, '.'); |
643 | const char *end = strchr (domain, '.'); |
… | |
… | |
618 | |
656 | |
619 | domain = end + 1; |
657 | domain = end + 1; |
620 | } |
658 | } |
621 | } |
659 | } |
622 | |
660 | |
|
|
661 | void |
623 | void dns_snd::gen_stream_req (int seqno, byte_stream &stream) |
662 | dns_snd::gen_stream_req (int seqno, byte_stream &stream) |
624 | { |
663 | { |
625 | stdhdr = true; |
664 | stdhdr = true; |
626 | this->seqno = seqno; |
665 | this->seqno = seqno; |
627 | |
666 | |
628 | timeout = NOW + INITIAL_TIMEOUT; |
667 | timeout = ev_now () + INITIAL_TIMEOUT; |
629 | |
668 | |
630 | pkt->flags = htons (DEFAULT_CLIENT_FLAGS); |
669 | pkt->flags = htons (DEFAULT_CLIENT_FLAGS); |
631 | pkt->qdcount = htons (1); |
670 | pkt->qdcount = htons (1); |
632 | |
671 | |
633 | int offs = 6*2; |
672 | int offs = 6*2; |
… | |
… | |
666 | (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; |
705 | (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; |
667 | |
706 | |
668 | pkt->len = offs; |
707 | pkt->len = offs; |
669 | } |
708 | } |
670 | |
709 | |
|
|
710 | void |
671 | void dns_snd::gen_syn_req () |
711 | dns_snd::gen_syn_req () |
672 | { |
712 | { |
673 | timeout = NOW + INITIAL_SYN_TIMEOUT; |
713 | timeout = ev_now () + INITIAL_SYN_TIMEOUT; |
674 | |
714 | |
675 | pkt->flags = htons (DEFAULT_CLIENT_FLAGS); |
715 | pkt->flags = htons (DEFAULT_CLIENT_FLAGS); |
676 | pkt->qdcount = htons (1); |
716 | pkt->qdcount = htons (1); |
677 | |
717 | |
678 | int offs = 6 * 2; |
718 | int offs = 6 * 2; |
… | |
… | |
718 | |
758 | |
719 | dns_connection::dns_connection (connection *c) |
759 | dns_connection::dns_connection (connection *c) |
720 | : c (c) |
760 | : c (c) |
721 | , rcvdq (MAX_BACKLOG * 2) |
761 | , rcvdq (MAX_BACKLOG * 2) |
722 | , snddq (MAX_BACKLOG) |
762 | , snddq (MAX_BACKLOG) |
723 | , tw (this, &dns_connection::time_cb) |
|
|
724 | { |
763 | { |
|
|
764 | tw.set<dns_connection, &dns_connection::time_cb> (this); |
|
|
765 | |
725 | vpn = c->vpn; |
766 | vpn = c->vpn; |
726 | |
767 | |
727 | established = false; |
768 | established = false; |
728 | |
769 | |
729 | rcvseq = repseq = sndseq = 0; |
770 | rcvseq = repseq = sndseq = 0; |
… | |
… | |
740 | i != rcvpq.end (); |
781 | i != rcvpq.end (); |
741 | ++i) |
782 | ++i) |
742 | delete *i; |
783 | delete *i; |
743 | } |
784 | } |
744 | |
785 | |
|
|
786 | void |
745 | void dns_connection::receive_rep (dns_rcv *r) |
787 | dns_connection::receive_rep (dns_rcv *r) |
746 | { |
788 | { |
747 | if (r->datalen) |
789 | if (r->datalen) |
748 | { |
790 | { |
749 | last_received = NOW; |
791 | last_received = ev_now (); |
750 | tw.trigger (); |
792 | tw (); |
751 | |
793 | |
752 | poll_interval = send_interval; |
794 | poll_interval = send_interval; |
753 | } |
795 | } |
754 | else |
796 | else |
755 | { |
797 | { |
… | |
… | |
765 | |
807 | |
766 | // find next packet |
808 | // find next packet |
767 | for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) |
809 | for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) |
768 | if (SEQNO_EQ (rcvseq, (*i)->seqno)) |
810 | if (SEQNO_EQ (rcvseq, (*i)->seqno)) |
769 | { |
811 | { |
|
|
812 | //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D |
770 | // enter the packet into our input stream |
813 | // enter the packet into our input stream |
771 | r = *i; |
814 | r = *i; |
772 | |
815 | |
773 | // remove the oldest packet, look forward, as it's oldest first |
816 | // remove the oldest packet, look forward, as it's oldest first |
774 | for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) |
817 | for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) |
775 | if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) |
818 | if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) |
776 | { |
819 | { |
|
|
820 | //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D |
777 | delete *j; |
821 | delete *j; |
778 | rcvpq.erase (j); |
822 | rcvpq.erase (j); |
779 | break; |
823 | break; |
780 | } |
824 | } |
781 | |
825 | |
782 | rcvseq = (rcvseq + 1) & SEQNO_MASK; |
826 | rcvseq = (rcvseq + 1) & SEQNO_MASK; |
783 | |
827 | |
784 | if (!rcvdq.put (r->data, r->datalen)) |
828 | if (!rcvdq.put (r->data, r->datalen)) |
785 | { |
829 | { |
|
|
830 | // MUST never overflow, can be caused by data corruption, TODO |
786 | slog (L_ERR, "DNS: !rcvdq.put (r->data, r->datalen)"); |
831 | slog (L_CRIT, "DNS: !rcvdq.put (r->data, r->datalen)"); |
787 | abort (); // MUST never overflow, can be caused by data corruption, TODO |
832 | c->dnsv4_reset_connection (); |
|
|
833 | return; |
788 | } |
834 | } |
789 | |
835 | |
790 | while (vpn_packet *pkt = rcvdq.get ()) |
836 | while (vpn_packet *pkt = rcvdq.get ()) |
791 | { |
837 | { |
792 | sockinfo si; |
838 | sockinfo si; |
793 | si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4; |
839 | si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4; |
794 | |
840 | |
795 | vpn->recv_vpn_packet (pkt, si); |
841 | vpn->recv_vpn_packet (pkt, si); |
796 | |
|
|
797 | delete pkt; |
842 | delete pkt; |
798 | } |
843 | } |
799 | |
844 | |
800 | // check for further packets |
845 | // check for further packets |
801 | goto redo; |
846 | goto redo; |
… | |
… | |
1009 | { |
1054 | { |
1010 | dns_connection *dns = (*i)->dns; |
1055 | dns_connection *dns = (*i)->dns; |
1011 | connection *c = dns->c; |
1056 | connection *c = dns->c; |
1012 | int seqno = (*i)->seqno; |
1057 | int seqno = (*i)->seqno; |
1013 | u8 data[MAXSIZE], *datap = data; |
1058 | u8 data[MAXSIZE], *datap = data; |
|
|
1059 | //printf ("rcv pkt %x\n", seqno);//D |
1014 | |
1060 | |
1015 | if ((*i)->retry) |
1061 | if ((*i)->retry) |
1016 | { |
1062 | { |
1017 | dns->send_interval *= 1.01; |
1063 | dns->send_interval *= 1.01; |
1018 | if (dns->send_interval > MAX_SEND_INTERVAL) |
1064 | if (dns->send_interval > MAX_SEND_INTERVAL) |
… | |
… | |
1023 | #if 0 |
1069 | #if 0 |
1024 | dns->send_interval *= 0.999; |
1070 | dns->send_interval *= 0.999; |
1025 | #endif |
1071 | #endif |
1026 | // the latency surely puts an upper bound on |
1072 | // the latency surely puts an upper bound on |
1027 | // the minimum send interval |
1073 | // the minimum send interval |
1028 | double latency = NOW - (*i)->sent; |
1074 | double latency = ev_now () - (*i)->sent; |
1029 | |
1075 | |
1030 | if (latency < dns->min_latency) |
1076 | if (latency < dns->min_latency) |
1031 | dns->min_latency = latency; |
1077 | dns->min_latency = latency; |
1032 | |
1078 | |
1033 | if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor) |
1079 | if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor) |
… | |
… | |
1098 | |
1144 | |
1099 | if (ip [3] == CMD_IP_RST) |
1145 | if (ip [3] == CMD_IP_RST) |
1100 | { |
1146 | { |
1101 | slog (L_DEBUG, _("DNS: got tunnel RST request")); |
1147 | slog (L_DEBUG, _("DNS: got tunnel RST request")); |
1102 | |
1148 | |
1103 | delete dns; c->dns = 0; |
1149 | c->dnsv4_reset_connection (); |
1104 | |
|
|
1105 | return; |
|
|
1106 | } |
1150 | } |
1107 | else if (ip [3] == CMD_IP_SYN) |
1151 | else if (ip [3] == CMD_IP_SYN) |
1108 | { |
1152 | { |
1109 | slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us.")); |
1153 | slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us.")); |
1110 | dns->established = true; |
1154 | dns->established = true; |
1111 | } |
1155 | } |
1112 | else if (ip [3] == CMD_IP_REJ) |
1156 | else if (ip [3] == CMD_IP_REJ) |
1113 | { |
|
|
1114 | slog (L_DEBUG, _("DNS: got tunnel REJ reply, server does not like us, aborting.")); |
1157 | slog (L_ERR, _("DNS: got tunnel REJ reply, server does not like us.")); |
1115 | abort (); |
|
|
1116 | } |
|
|
1117 | else |
1158 | else |
1118 | slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]); |
1159 | slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]); |
1119 | } |
1160 | } |
1120 | else |
1161 | else |
1121 | slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"), |
1162 | slog (L_INFO, _("DNS: got spurious a record %d.%d.%d.%d"), |
… | |
… | |
1147 | break; |
1188 | break; |
1148 | } |
1189 | } |
1149 | } |
1190 | } |
1150 | |
1191 | |
1151 | void |
1192 | void |
1152 | vpn::dnsv4_ev (io_watcher &w, short revents) |
1193 | vpn::dnsv4_ev (ev::io &w, int revents) |
1153 | { |
1194 | { |
1154 | if (revents & EVENT_READ) |
1195 | if (revents & EV_READ) |
1155 | { |
1196 | { |
1156 | dns_packet *pkt = new dns_packet; |
1197 | dns_packet *pkt = new dns_packet; |
1157 | struct sockaddr_in sa; |
1198 | struct sockaddr_in sa; |
1158 | socklen_t sa_len = sizeof (sa); |
1199 | socklen_t sa_len = sizeof (sa); |
1159 | |
1200 | |
… | |
… | |
1185 | |
1226 | |
1186 | if (!c->dns) |
1227 | if (!c->dns) |
1187 | c->dns = new dns_connection (c); |
1228 | c->dns = new dns_connection (c); |
1188 | |
1229 | |
1189 | if (c->dns->snddq.put (pkt)) |
1230 | if (c->dns->snddq.put (pkt)) |
1190 | c->dns->tw.trigger (); |
1231 | c->dns->tw (); |
1191 | |
1232 | |
1192 | // always return true even if the buffer overflows |
1233 | // always return true even if the buffer overflows |
1193 | return true; |
1234 | return true; |
1194 | } |
1235 | } |
1195 | |
1236 | |
… | |
… | |
1200 | } |
1241 | } |
1201 | |
1242 | |
1202 | #define NEXT(w) do { if (next > (w)) next = w; } while (0) |
1243 | #define NEXT(w) do { if (next > (w)) next = w; } while (0) |
1203 | |
1244 | |
1204 | void |
1245 | void |
1205 | dns_connection::time_cb (time_watcher &w) |
1246 | dns_connection::time_cb (ev::timer &w, int revents) |
1206 | { |
1247 | { |
1207 | // servers have to be polled |
1248 | // servers have to be polled |
1208 | if (THISNODE->dns_port) |
1249 | if (THISNODE->dns_port) |
1209 | return; |
1250 | return; |
1210 | |
1251 | |
1211 | // check for timeouts and (re)transmit |
1252 | // check for timeouts and (re)transmit |
1212 | tstamp next = NOW + poll_interval; |
1253 | tstamp next = ev::now () + poll_interval; |
1213 | dns_snd *send = 0; |
1254 | dns_snd *send = 0; |
1214 | |
1255 | |
1215 | for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); |
1256 | for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); |
1216 | i != vpn->dns_sndpq.end (); |
1257 | i != vpn->dns_sndpq.end (); |
1217 | ++i) |
1258 | ++i) |
1218 | { |
1259 | { |
1219 | dns_snd *r = *i; |
1260 | dns_snd *r = *i; |
1220 | |
1261 | |
1221 | if (r->timeout <= NOW) |
1262 | if (r->timeout <= ev_now ()) |
1222 | { |
1263 | { |
1223 | if (!send) |
1264 | if (!send) |
1224 | { |
1265 | { |
1225 | send = r; |
1266 | send = r; |
1226 | |
1267 | |
1227 | r->retry++; |
1268 | r->retry++; |
1228 | r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor); |
1269 | r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor); |
|
|
1270 | //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D |
1229 | |
1271 | |
1230 | // the following code changes the query section a bit, forcing |
1272 | // the following code changes the query section a bit, forcing |
1231 | // the forwarder to generate a new request |
1273 | // the forwarder to generate a new request |
1232 | if (r->stdhdr) |
1274 | if (r->stdhdr) |
1233 | { |
|
|
1234 | //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry); |
|
|
1235 | //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); |
1275 | encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); |
1236 | } |
|
|
1237 | } |
1276 | } |
1238 | } |
1277 | } |
1239 | else |
1278 | else |
1240 | NEXT (r->timeout); |
1279 | NEXT (r->timeout); |
1241 | } |
1280 | } |
… | |
… | |
1255 | } |
1294 | } |
1256 | } |
1295 | } |
1257 | else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding |
1296 | else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding |
1258 | && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) |
1297 | && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) |
1259 | { |
1298 | { |
1260 | if (last_sent + send_interval <= NOW) |
1299 | if (last_sent + send_interval <= ev_now ()) |
1261 | { |
1300 | { |
1262 | //printf ("sending data request etc.\n"); //D |
1301 | //printf ("sending data request etc.\n"); //D |
1263 | if (!snddq.empty () || last_received + 1. > NOW) |
1302 | if (!snddq.empty () || last_received + 1. > ev_now ()) |
1264 | { |
1303 | { |
1265 | poll_interval = send_interval; |
1304 | poll_interval = send_interval; |
1266 | NEXT (NOW + send_interval); |
1305 | NEXT (ev_now () + send_interval); |
1267 | } |
1306 | } |
1268 | |
1307 | |
1269 | send = new dns_snd (this); |
1308 | send = new dns_snd (this); |
1270 | send->gen_stream_req (sndseq, snddq); |
1309 | send->gen_stream_req (sndseq, snddq); |
1271 | send->timeout = NOW + min_latency * conf.dns_timeout_factor; |
1310 | send->timeout = ev_now () + min_latency * conf.dns_timeout_factor; |
|
|
1311 | //printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D |
1272 | |
1312 | |
1273 | sndseq = (sndseq + 1) & SEQNO_MASK; |
1313 | sndseq = (sndseq + 1) & SEQNO_MASK; |
1274 | } |
1314 | } |
1275 | else |
1315 | else |
1276 | NEXT (last_sent + send_interval); |
1316 | NEXT (last_sent + send_interval); |
… | |
… | |
1280 | vpn->dns_sndpq.push_back (send); |
1320 | vpn->dns_sndpq.push_back (send); |
1281 | } |
1321 | } |
1282 | |
1322 | |
1283 | if (send) |
1323 | if (send) |
1284 | { |
1324 | { |
1285 | last_sent = NOW; |
1325 | last_sent = ev_now (); |
1286 | sendto (vpn->dnsv4_fd, |
1326 | sendto (vpn->dnsv4_fd, |
1287 | send->pkt->at (0), send->pkt->len, 0, |
1327 | send->pkt->at (0), send->pkt->len, 0, |
1288 | vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); |
1328 | vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); |
1289 | } |
1329 | } |
1290 | |
1330 | |
1291 | slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)", |
1331 | slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)", |
1292 | poll_interval, send_interval, next - NOW, |
1332 | poll_interval, send_interval, next - ev_now (), |
1293 | vpn->dns_sndpq.size (), snddq.size (), |
1333 | vpn->dns_sndpq.size (), snddq.size (), |
1294 | rcvpq.size ()); |
1334 | rcvpq.size ()); |
1295 | |
1335 | |
1296 | // TODO: no idea when this happens, but when next < NOW, we have a problem |
1336 | // TODO: no idea when this happens, but when next < ev_now (), we have a problem |
1297 | // doesn't seem to happen anymore |
1337 | // doesn't seem to happen anymore |
1298 | if (next < NOW + 0.001) |
1338 | if (next < ev_now () + 0.001) |
1299 | next = NOW + 0.1; |
1339 | next = ev_now () + 0.1; |
1300 | |
1340 | |
1301 | w.start (next); |
1341 | w.start (next - ev_now ()); |
1302 | } |
1342 | } |
1303 | |
1343 | |
1304 | #endif |
1344 | #endif |
1305 | |
1345 | |