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.18 by pcg, Sat Mar 5 19:13:16 2005 UTC vs.
Revision 1.50 by root, Sun Mar 6 13:49:50 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-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
26// dns processing is EXTREMELY ugly. For obvious(?) reasons. 40// dns processing is EXTREMELY ugly. For obvious(?) reasons.
27// it's a hack, use only in emergency situations please. 41// it's a hack, use only in emergency situations please.
28 42
29#include <cstring> 43#include <cstring>
44#include <cassert>
30 45
31#include <sys/types.h> 46#include <sys/types.h>
32#include <sys/socket.h> 47#include <sys/socket.h>
33#include <sys/wait.h> 48#include <sys/wait.h>
34#include <sys/uio.h> 49#include <sys/uio.h>
… …
37#include <unistd.h> 52#include <unistd.h>
38#include <fcntl.h> 53#include <fcntl.h>
39 54
40#include <map> 55#include <map>
41 56
57#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
42#include <gmp.h> 58#include <gmp.h>
43 59
44#include "netcompat.h" 60#include "netcompat.h"
45 61
46#include "vpn.h" 62#include "vpn.h"
47 63
48#define MIN_POLL_INTERVAL .02 // how often to poll minimally when the server has data
49#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data 64#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
50#define ACTIVITY_INTERVAL 5. 65#define ACTIVITY_INTERVAL 5.
51 66
52#define INITIAL_TIMEOUT 0.1 // retry timeouts 67#define INITIAL_TIMEOUT 0.1 // retry timeouts
53#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn 68#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
54 69
55#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests
56#define MAX_SEND_INTERVAL 0.5 // optimistic? 70#define MAX_SEND_INTERVAL 2. // optimistic?
57 71
58#define MAX_OUTSTANDING 10 // max. outstanding requests
59#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog 72#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
60#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE 73#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
61 74
62#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well 75#define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well
63// 240 leaves about 4 bytes of server reply data 76// 240 leaves about 4 bytes of server reply data
64// every two request bytes less give room for one reply byte 77// every request byte less give room for two reply bytes
65 78
66#define SEQNO_MASK 0x3fff 79#define SEQNO_MASK 0x3fff
67#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) 80#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
68 81
69#define MAX_LBL_SIZE 63 82#define MAX_LBL_SIZE 63
70#define MAX_PKT_SIZE 512 83#define MAX_PKT_SIZE 512
71 84
72#define RR_TYPE_A 1 85#define RR_TYPE_A 1
73#define RR_TYPE_NULL 10 86#define RR_TYPE_NULL 10
74#define RR_TYPE_TXT 16 87#define RR_TYPE_TXT 16
88#define RR_TYPE_AAAA 28
75#define RR_TYPE_ANY 255 89#define RR_TYPE_ANY 255
76 90
77#define RR_CLASS_IN 1 91#define RR_CLASS_IN 1
78 92
79#define CMD_IP_1 207 93#define CMD_IP_1 207
… …
103 memset (enc, (char) 0, 256); 117 memset (enc, (char) 0, 256);
104 memset (dec, (char)INVALID, 256); 118 memset (dec, (char)INVALID, 256);
105 119
106 for (size = 0; cmap [size]; size++) 120 for (size = 0; cmap [size]; size++)
107 { 121 {
122 char c = cmap [size];
123
108 enc [size] = cmap [size]; 124 enc [size] = c;
109 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;
110 } 130 }
111 131
112 assert (size < 256); 132 assert (size < 256);
113} 133}
114 134
… …
154 enc_len [len] = n; 174 enc_len [len] = n;
155 dec_len [n] = len; 175 dec_len [n] = len;
156 } 176 }
157} 177}
158 178
179unsigned int
159unsigned int basecoder::encode_len (unsigned int len) 180basecoder::encode_len (unsigned int len)
160{ 181{
161 return enc_len [len]; 182 return enc_len [len];
162} 183}
163 184
185unsigned int
164unsigned int basecoder::decode_len (unsigned int len) 186basecoder::decode_len (unsigned int len)
165{ 187{
166 while (len && !dec_len [len]) 188 while (len && !dec_len [len])
167 --len; 189 --len;
168 190
169 return dec_len [len]; 191 return dec_len [len];
170} 192}
171 193
194unsigned int
172unsigned int basecoder::encode (char *dst, u8 *src, unsigned int len) 195basecoder::encode (char *dst, u8 *src, unsigned int len)
173{ 196{
174 if (!len || len > MAX_DEC_LEN) 197 if (!len || len > MAX_DEC_LEN)
175 return 0; 198 return 0;
176 199
177 int elen = encode_len (len); 200 int elen = encode_len (len);
… …
196 *dst++ = cmap.encode [dst_ [i]]; 219 *dst++ = cmap.encode [dst_ [i]];
197 220
198 return elen; 221 return elen;
199} 222}
200 223
224unsigned int
201unsigned int basecoder::decode (u8 *dst, char *src, unsigned int len) 225basecoder::decode (u8 *dst, char *src, unsigned int len)
202{ 226{
203 if (!len || len > MAX_ENC_LEN) 227 if (!len || len > MAX_ENC_LEN)
204 return 0; 228 return 0;
205 229
206 u8 src_ [MAX_ENC_LEN]; 230 u8 src_ [MAX_ENC_LEN];
… …
264static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO"); 288static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
265 289
266///////////////////////////////////////////////////////////////////////////// 290/////////////////////////////////////////////////////////////////////////////
267 291
268#define HDRSIZE 6 292#define HDRSIZE 6
269 293
294inline void
270inline void encode_header (char *data, int clientid, int seqno, int retry = 0) 295encode_header (char *data, int clientid, int seqno, int retry = 0)
271{ 296{
272 seqno &= SEQNO_MASK; 297 seqno &= SEQNO_MASK;
273 298
274 u8 hdr[3] = { 299 u8 hdr[3] = {
275 clientid, 300 clientid,
… …
280 assert (clientid < 256); 305 assert (clientid < 256);
281 306
282 cdc26.encode (data, hdr, 3); 307 cdc26.encode (data, hdr, 3);
283} 308}
284 309
310inline void
285inline void decode_header (char *data, int &clientid, int &seqno) 311decode_header (char *data, int &clientid, int &seqno)
286{ 312{
287 u8 hdr[3]; 313 u8 hdr[3];
288 314
289 cdc26.decode (hdr, data, HDRSIZE); 315 cdc26.decode (hdr, data, HDRSIZE);
290 316
… …
323byte_stream::~byte_stream () 349byte_stream::~byte_stream ()
324{ 350{
325 delete data; 351 delete data;
326} 352}
327 353
354void
328void byte_stream::remove (int count) 355byte_stream::remove (int count)
329{ 356{
330 if (count > fill) 357 if (count > fill)
331 assert (count <= fill); 358 assert (count <= fill);
332 359
333 memmove (data, data + count, fill -= count); 360 memmove (data, data + count, fill -= count);
334} 361}
335 362
363bool
336bool byte_stream::put (u8 *data, unsigned int datalen) 364byte_stream::put (u8 *data, unsigned int datalen)
337{ 365{
338 if (maxsize - fill < datalen) 366 if (maxsize - fill < datalen)
339 return false; 367 return false;
340 368
341 memcpy (this->data + fill, data, datalen); fill += datalen; 369 memcpy (this->data + fill, data, datalen); fill += datalen;
342 370
343 return true; 371 return true;
344} 372}
345 373
374bool
346bool byte_stream::put (vpn_packet *pkt) 375byte_stream::put (vpn_packet *pkt)
347{ 376{
348 if (maxsize - fill < pkt->len + 2) 377 if (maxsize - fill < pkt->len + 2)
349 return false; 378 return false;
350 379
351 data [fill++] = pkt->len >> 8; 380 data [fill++] = pkt->len >> 8;
… …
408struct dns_cfg 437struct dns_cfg
409{ 438{
410 static int next_uid; 439 static int next_uid;
411 440
412 u8 id1, id2, id3, id4; 441 u8 id1, id2, id3, id4;
442
413 u8 version; 443 u8 version;
444 u8 flags;
414 u8 rrtype; 445 u8 rrtype;
415 u8 flags;
416 u8 def_ttl; 446 u8 def_ttl;
417 u8 rcv_cdc; 447
418 u8 snd_cdc;
419 u16 max_size;
420 u16 client; 448 u16 client;
421 u16 uid; // to make request unique 449 u16 uid; // to make request unique
422 450
423 u8 reserved[8]; 451 u16 max_size;
452 u8 seq_cdc;
453 u8 req_cdc;
454
455 u8 rep_cdc;
456 u8 delay; // time in 0.01s units that the server may delay replying packets
457 u8 r3, r4;
458
459 u8 r5, r6, r7, r8;
424 460
425 void reset (int clientid); 461 void reset (int clientid);
426 bool valid (); 462 bool valid ();
427}; 463};
428 464
429int dns_cfg::next_uid; 465int dns_cfg::next_uid;
430 466
467void
431void dns_cfg::reset (int clientid) 468dns_cfg::reset (int clientid)
432{ 469{
433 id1 = 'G'; 470 id1 = 'G';
434 id2 = 'V'; 471 id2 = 'V';
435 id3 = 'P'; 472 id3 = 'P';
436 id4 = 'E'; 473 id4 = 'E';
437 474
438 version = 1; 475 version = 1;
439 476
440 rrtype = RR_TYPE_TXT; 477 rrtype = RR_TYPE_TXT;
441 flags = 0; 478 flags = 0;
442 def_ttl = 1; 479 def_ttl = 0;
480 seq_cdc = 26;
481 req_cdc = 62;
443 rcv_cdc = 0; 482 rep_cdc = 0;
444 snd_cdc = 62;
445 max_size = ntohs (MAX_PKT_SIZE); 483 max_size = htons (MAX_PKT_SIZE);
446 client = ntohs (clientid); 484 client = htons (clientid);
447 uid = next_uid++; 485 uid = next_uid++;
486 delay = 0;
448 487
449 memset (reserved, 0, 8); 488 r3 = r4 = 0;
489 r4 = r5 = r6 = r7 = 0;
450} 490}
451 491
492bool
452bool dns_cfg::valid () 493dns_cfg::valid ()
453{ 494{
495 // although the protocol itself allows for some configurability,
496 // only the following encoding/decoding settings are implemented.
454 return id1 == 'G' 497 return id1 == 'G'
455 && id2 == 'V' 498 && id2 == 'V'
456 && id3 == 'P' 499 && id3 == 'P'
457 && id4 == 'E' 500 && id4 == 'E'
501 && seq_cdc == 26
502 && req_cdc == 62
503 && rep_cdc == 0
458 && version == 1 504 && version == 1;
459 && flags == 0
460 && rcv_cdc == 0
461 && snd_cdc == 62
462 && max_size == ntohs (MAX_PKT_SIZE);
463} 505}
464 506
465struct dns_packet : net_packet 507struct dns_packet : net_packet
466{ 508{
467 u16 id; 509 u16 id;
468 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4 510 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
469 u16 qdcount, ancount, nscount, arcount; 511 u16 qdcount, ancount, nscount, arcount;
470 512
471 u8 data[MAXSIZE - 6 * 2]; 513 u8 data [MAXSIZE - 6 * 2];
472 514
473 int decode_label (char *data, int size, int &offs); 515 int decode_label (char *data, int size, int &offs);
474}; 516};
475 517
518int
476int dns_packet::decode_label (char *data, int size, int &offs) 519dns_packet::decode_label (char *data, int size, int &offs)
477{ 520{
478 char *orig = data; 521 char *orig = data;
479 522
480 memset (data, 0, size); 523 memset (data, 0, size);
481 524
… …
507 return data - orig; 550 return data - orig;
508} 551}
509 552
510///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
511 554
555static
556u16 next_id ()
557{
512static u16 dns_id = 0; // TODO: should be per-vpn 558 static u16 dns_id = 0; // TODO: should be per-vpn
513 559
514static u16 next_id ()
515{
516 if (!dns_id) 560 if (!dns_id)
517 dns_id = time (0); 561 dns_id = time (0);
518 562
519 // the simplest lsfr with periodicity 65535 i could find 563 // the simplest lsfr with periodicity 65535 i could find
520 dns_id = (dns_id << 1) 564 dns_id = (dns_id << 1)
… …
538 582
539 bool established; 583 bool established;
540 584
541 tstamp last_received; 585 tstamp last_received;
542 tstamp last_sent; 586 tstamp last_sent;
543 double last_latency; 587 double min_latency;
544 double poll_interval, send_interval; 588 double poll_interval, send_interval;
545 589
546 vector<dns_rcv *> rcvpq; 590 vector<dns_rcv *> rcvpq;
547 591
548 byte_stream rcvdq; int rcvseq; 592 byte_stream rcvdq; int rcvseq; int repseq;
549 byte_stream snddq; int sndseq; 593 byte_stream snddq; int sndseq;
550 594
551 void time_cb (time_watcher &w); time_watcher tw; 595 inline void time_cb (ev::timer &w, int revents); ev::timer tw;
552 void receive_rep (dns_rcv *r); 596 void receive_rep (dns_rcv *r);
553 597
554 dns_connection (connection *c); 598 dns_connection (connection *c);
555 ~dns_connection (); 599 ~dns_connection ();
556}; 600};
… …
575: dns (dns) 619: dns (dns)
576{ 620{
577 timeout = 0; 621 timeout = 0;
578 retry = 0; 622 retry = 0;
579 seqno = 0; 623 seqno = 0;
580 sent = NOW; 624 sent = ev_now ();
581 stdhdr = false; 625 stdhdr = false;
582 626
583 pkt = new dns_packet; 627 pkt = new dns_packet;
584 628
585 pkt->id = next_id (); 629 pkt->id = next_id ();
… …
588dns_snd::~dns_snd () 632dns_snd::~dns_snd ()
589{ 633{
590 delete pkt; 634 delete pkt;
591} 635}
592 636
637static void
593static void append_domain (dns_packet &pkt, int &offs, const char *domain) 638append_domain (dns_packet &pkt, int &offs, const char *domain)
594{ 639{
595 // add tunnel domain 640 // add tunnel domain
596 for (;;) 641 for (;;)
597 { 642 {
598 const char *end = strchr (domain, '.'); 643 const char *end = strchr (domain, '.');
… …
611 656
612 domain = end + 1; 657 domain = end + 1;
613 } 658 }
614} 659}
615 660
661void
616void dns_snd::gen_stream_req (int seqno, byte_stream &stream) 662dns_snd::gen_stream_req (int seqno, byte_stream &stream)
617{ 663{
618 stdhdr = true; 664 stdhdr = true;
619 this->seqno = seqno; 665 this->seqno = seqno;
620 666
621 timeout = NOW + INITIAL_TIMEOUT; 667 timeout = ev_now () + INITIAL_TIMEOUT;
622 668
623 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 669 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
624 pkt->qdcount = htons (1); 670 pkt->qdcount = htons (1);
625 671
626 int offs = 6*2; 672 int offs = 6*2;
627 int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2); 673 int dlen = MAX_DOMAIN_SIZE - (strlen (dns->c->conf->domain) + 2);
628 // MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well, 674 // MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well,
629 // so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra 675 // so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
630 676
631 char enc[256], *encp = enc; 677 char enc[256], *encp = enc;
632 encode_header (enc, THISNODE->id, seqno); 678 encode_header (enc, THISNODE->id, seqno);
… …
650 encp += lbllen; 696 encp += lbllen;
651 697
652 enclen -= lbllen; 698 enclen -= lbllen;
653 } 699 }
654 700
655 append_domain (*pkt, offs, THISNODE->domain); 701 append_domain (*pkt, offs, dns->c->conf->domain);
656 702
657 (*pkt)[offs++] = 0; 703 (*pkt)[offs++] = 0;
658 (*pkt)[offs++] = RR_TYPE_ANY >> 8; (*pkt)[offs++] = RR_TYPE_ANY; 704 (*pkt)[offs++] = RR_TYPE_ANY >> 8; (*pkt)[offs++] = RR_TYPE_ANY;
659 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; 705 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN;
660 706
661 pkt->len = offs; 707 pkt->len = offs;
662} 708}
663 709
710void
664void dns_snd::gen_syn_req () 711dns_snd::gen_syn_req ()
665{ 712{
666 timeout = NOW + INITIAL_SYN_TIMEOUT; 713 timeout = ev_now () + INITIAL_SYN_TIMEOUT;
667
668 printf ("send syn\n");//D
669 714
670 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 715 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
671 pkt->qdcount = htons (1); 716 pkt->qdcount = htons (1);
672 717
673 int offs = 6 * 2; 718 int offs = 6 * 2;
… …
676 721
677 assert (elen <= MAX_LBL_SIZE); 722 assert (elen <= MAX_LBL_SIZE);
678 723
679 (*pkt)[offs] = elen; 724 (*pkt)[offs] = elen;
680 offs += elen + 1; 725 offs += elen + 1;
681 append_domain (*pkt, offs, THISNODE->domain); 726 append_domain (*pkt, offs, dns->c->conf->domain);
682 727
683 (*pkt)[offs++] = 0; 728 (*pkt)[offs++] = 0;
684 (*pkt)[offs++] = RR_TYPE_A >> 8; (*pkt)[offs++] = RR_TYPE_A; 729 (*pkt)[offs++] = RR_TYPE_A >> 8; (*pkt)[offs++] = RR_TYPE_A;
685 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; 730 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN;
686 731
… …
712///////////////////////////////////////////////////////////////////////////// 757/////////////////////////////////////////////////////////////////////////////
713 758
714dns_connection::dns_connection (connection *c) 759dns_connection::dns_connection (connection *c)
715: c (c) 760: c (c)
716, rcvdq (MAX_BACKLOG * 2) 761, rcvdq (MAX_BACKLOG * 2)
717, snddq (MAX_BACKLOG * 2) 762, snddq (MAX_BACKLOG)
718, tw (this, &dns_connection::time_cb)
719{ 763{
764 tw.set<dns_connection, &dns_connection::time_cb> (this);
765
720 vpn = c->vpn; 766 vpn = c->vpn;
721 767
722 established = false; 768 established = false;
723 769
724 rcvseq = sndseq = 0; 770 rcvseq = repseq = sndseq = 0;
725 771
726 last_sent = last_received = 0; 772 last_sent = last_received = 0;
727 poll_interval = MIN_POLL_INTERVAL; 773 poll_interval = 0.5; // starting here
728 send_interval = 0.5; // starting rate 774 send_interval = 0.5; // starting rate
729 last_latency = INITIAL_TIMEOUT; 775 min_latency = INITIAL_TIMEOUT;
730} 776}
731 777
732dns_connection::~dns_connection () 778dns_connection::~dns_connection ()
733{ 779{
734 for (vector<dns_rcv *>::iterator i = rcvpq.begin (); 780 for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
735 i != rcvpq.end (); 781 i != rcvpq.end ();
736 ++i) 782 ++i)
737 delete *i; 783 delete *i;
738} 784}
739 785
786void
740void dns_connection::receive_rep (dns_rcv *r) 787dns_connection::receive_rep (dns_rcv *r)
741{ 788{
742 if (r->datalen) 789 if (r->datalen)
743 { 790 {
744 last_received = NOW; 791 last_received = ev_now ();
745 tw.trigger (); 792 tw ();
746 793
747 poll_interval = send_interval; 794 poll_interval = send_interval;
748 } 795 }
749 else 796 else
750 { 797 {
751 poll_interval *= 1.5; 798 poll_interval *= 1.5;
799
752 if (poll_interval > MAX_POLL_INTERVAL) 800 if (poll_interval > MAX_POLL_INTERVAL)
753 poll_interval = MAX_POLL_INTERVAL; 801 poll_interval = MAX_POLL_INTERVAL;
754 } 802 }
755 803
756 rcvpq.push_back (r); 804 rcvpq.push_back (r);
… …
759 807
760 // find next packet 808 // find next packet
761 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) 809 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
762 if (SEQNO_EQ (rcvseq, (*i)->seqno)) 810 if (SEQNO_EQ (rcvseq, (*i)->seqno))
763 { 811 {
812 //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
764 // enter the packet into our input stream 813 // enter the packet into our input stream
765 r = *i; 814 r = *i;
766 815
767 // remove the oldest packet, look forward, as it's oldest first 816 // remove the oldest packet, look forward, as it's oldest first
768 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)
769 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) 818 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
770 { 819 {
820 //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
771 delete *j; 821 delete *j;
772 rcvpq.erase (j); 822 rcvpq.erase (j);
773 break; 823 break;
774 } 824 }
775 825
776 rcvseq = (rcvseq + 1) & SEQNO_MASK; 826 rcvseq = (rcvseq + 1) & SEQNO_MASK;
777 827
778 if (!rcvdq.put (r->data, r->datalen)) 828 if (!rcvdq.put (r->data, r->datalen))
779 { 829 {
830 // MUST never overflow, can be caused by data corruption, TODO
780 slog (L_ERR, "DNS: !rcvdq.put (r->data, r->datalen)"); 831 slog (L_CRIT, "DNS: !rcvdq.put (r->data, r->datalen)");
781 abort (); // MUST never overflow, can be caused by data corruption, TODO 832 c->dnsv4_reset_connection ();
833 return;
782 } 834 }
783 835
784 while (vpn_packet *pkt = rcvdq.get ()) 836 while (vpn_packet *pkt = rcvdq.get ())
785 { 837 {
786 sockinfo si; 838 sockinfo si;
787 si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4; 839 si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
788 840
789 vpn->recv_vpn_packet (pkt, si); 841 vpn->recv_vpn_packet (pkt, si);
790
791 delete pkt; 842 delete pkt;
792 } 843 }
793 844
794 // check for further packets 845 // check for further packets
795 goto redo; 846 goto redo;
… …
806 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); 857 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR);
807 858
808 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK)) 859 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK))
809 && pkt.qdcount == htons (1)) 860 && pkt.qdcount == htons (1))
810 { 861 {
811 char qname[MAXSIZE]; 862 char qname [MAXSIZE];
812 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs); 863 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
813 864
814 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++]; 865 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++];
815 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++]; 866 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++];
816 867
… …
823 874
824 int dlen = strlen (THISNODE->domain); 875 int dlen = strlen (THISNODE->domain);
825 876
826 if (qclass == RR_CLASS_IN 877 if (qclass == RR_CLASS_IN
827 && qlen > dlen + 1 878 && qlen > dlen + 1
828 && !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen)) 879 && !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
829 { 880 {
830 // now generate reply 881 // now generate reply
831 pkt.ancount = htons (1); // one answer RR 882 pkt.ancount = htons (1); // one answer RR
832 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK); 883 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK);
833 884
… …
846 if (0 < client && client <= conns.size ()) 897 if (0 < client && client <= conns.size ())
847 { 898 {
848 connection *c = conns [client - 1]; 899 connection *c = conns [client - 1];
849 dns_connection *dns = c->dns; 900 dns_connection *dns = c->dns;
850 dns_rcv *rcv; 901 dns_rcv *rcv;
851 bool in_seq;
852 902
853 if (dns) 903 if (dns)
854 { 904 {
855 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); ) 905 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
856 if (SEQNO_EQ ((*i)->seqno, seqno)) 906 if (SEQNO_EQ ((*i)->seqno, seqno))
… …
867 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len); 917 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
868 918
869 goto duplicate_request; 919 goto duplicate_request;
870 } 920 }
871 921
872 in_seq = dns->rcvseq == seqno;
873
874 // new packet, queue 922 // new packet, queue
875 rcv = new dns_rcv (seqno, data, datalen); 923 rcv = new dns_rcv (seqno, data, datalen);
876 dns->receive_rep (rcv); 924 dns->receive_rep (rcv);
877 } 925 }
878 926
927 {
879 pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section 928 pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
880 929
881 int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A; 930 int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
882 pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type 931 pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type
883 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class 932 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
884 pkt [offs++] = 0; pkt [offs++] = 0; 933 pkt [offs++] = 0; pkt [offs++] = 0;
885 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL 934 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
886 935
887 int rdlen_offs = offs += 2; 936 int rdlen_offs = offs += 2;
888 937
938 if (dns)
939 {
889 int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs; 940 int dlen = ntohs (dns->cfg.max_size) - offs;
941
890 // bind doesn't compress well, so reduce further by one label length 942 // bind doesn't compress well, so reduce further by one label length
891 dlen -= qlen; 943 dlen -= qlen;
892 944
893 if (dns)
894 {
895 // only put data into in-order sequence packets, if 945 // only put data into in-order sequence packets, if
896 // we receive out-of-order packets we generate empty 946 // we receive out-of-order packets we generate empty
897 // replies 947 // replies
898 while (dlen > 1 && !dns->snddq.empty () && in_seq) 948 //printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
949 if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
899 { 950 {
951 dns->repseq = seqno;
952
953 while (dlen > 1 && !dns->snddq.empty ())
954 {
900 int txtlen = dlen <= 255 ? dlen - 1 : 255; 955 int txtlen = dlen <= 255 ? dlen - 1 : 255;
901 956
902 if (txtlen > dns->snddq.size ()) 957 if (txtlen > dns->snddq.size ())
903 txtlen = dns->snddq.size (); 958 txtlen = dns->snddq.size ();
904 959
905 pkt[offs++] = txtlen; 960 pkt[offs++] = txtlen;
906 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen); 961 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
907 offs += txtlen; 962 offs += txtlen;
908 dns->snddq.remove (txtlen); 963 dns->snddq.remove (txtlen);
909 964
910 dlen -= txtlen + 1; 965 dlen -= txtlen + 1;
966 }
911 } 967 }
912 968
913 // avoid empty TXT rdata 969 // avoid completely empty TXT rdata
914 if (offs == rdlen_offs) 970 if (offs == rdlen_offs)
915 pkt[offs++] = 0; 971 pkt[offs++] = 0;
916 972
917 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ()); 973 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
918 } 974 }
919 else 975 else
920 { 976 {
921 // send RST 977 // send RST
922 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3; 978 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
923 pkt [offs++] = CMD_IP_RST; 979 pkt [offs++] = CMD_IP_RST;
924 } 980 }
925 981
926 int rdlen = offs - rdlen_offs; 982 int rdlen = offs - rdlen_offs;
927 983
928 pkt [rdlen_offs - 2] = rdlen >> 8; 984 pkt [rdlen_offs - 2] = rdlen >> 8;
929 pkt [rdlen_offs - 1] = rdlen; 985 pkt [rdlen_offs - 1] = rdlen;
930 986
931 if (dns) 987 if (dns)
932 { 988 {
933 // now update dns_rcv copy 989 // now update dns_rcv copy
934 rcv->pkt->len = offs; 990 rcv->pkt->len = offs;
935 memcpy (rcv->pkt->at (0), pkt.at (0), offs); 991 memcpy (rcv->pkt->at (0), pkt.at (0), offs);
936 } 992 }
993 }
937 994
938 duplicate_request: ; 995 duplicate_request: ;
939 } 996 }
940 else 997 else
941 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); 998 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR);
… …
953 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class 1010 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
954 pkt [offs++] = 0; pkt [offs++] = 0; 1011 pkt [offs++] = 0; pkt [offs++] = 0;
955 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL 1012 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
956 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength 1013 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
957 1014
958 slog (L_INFO, _("DNS: client %d tries to connect"), client); 1015 slog (L_INFO, _("DNS: client %d connects"), client);
959 1016
960 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3; 1017 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
961 pkt [offs++] = CMD_IP_REJ; 1018 pkt [offs++] = CMD_IP_REJ;
962 1019
963 if (0 < client && client <= conns.size ()) 1020 if (0 < client && client <= conns.size ())
… …
997 { 1054 {
998 dns_connection *dns = (*i)->dns; 1055 dns_connection *dns = (*i)->dns;
999 connection *c = dns->c; 1056 connection *c = dns->c;
1000 int seqno = (*i)->seqno; 1057 int seqno = (*i)->seqno;
1001 u8 data[MAXSIZE], *datap = data; 1058 u8 data[MAXSIZE], *datap = data;
1059 //printf ("rcv pkt %x\n", seqno);//D
1002 1060
1003 if ((*i)->retry) 1061 if ((*i)->retry)
1004 { 1062 {
1005 dns->send_interval *= 1.01; 1063 dns->send_interval *= 1.01;
1006 if (dns->send_interval > MAX_SEND_INTERVAL) 1064 if (dns->send_interval > MAX_SEND_INTERVAL)
1007 dns->send_interval = MAX_SEND_INTERVAL; 1065 dns->send_interval = MAX_SEND_INTERVAL;
1008 } 1066 }
1009 else 1067 else
1010 { 1068 {
1011#if 1 1069#if 0
1012 dns->send_interval *= 0.999; 1070 dns->send_interval *= 0.999;
1013#endif 1071#endif
1014 if (dns->send_interval < MIN_SEND_INTERVAL)
1015 dns->send_interval = MIN_SEND_INTERVAL;
1016
1017 // the latency surely puts an upper bound on 1072 // the latency surely puts an upper bound on
1018 // the minimum send interval 1073 // the minimum send interval
1019 double latency = NOW - (*i)->sent; 1074 double latency = ev_now () - (*i)->sent;
1075
1076 if (latency < dns->min_latency)
1020 dns->last_latency = latency; 1077 dns->min_latency = latency;
1021 1078
1022 if (dns->send_interval > latency) 1079 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
1080 dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
1081
1082 if (dns->send_interval < conf.dns_send_interval)
1023 dns->send_interval = latency; 1083 dns->send_interval = conf.dns_send_interval;
1024 } 1084 }
1025 1085
1026 delete *i; 1086 delete *i;
1027 dns_sndpq.erase (i); 1087 dns_sndpq.erase (i);
1028 1088
… …
1084 1144
1085 if (ip [3] == CMD_IP_RST) 1145 if (ip [3] == CMD_IP_RST)
1086 { 1146 {
1087 slog (L_DEBUG, _("DNS: got tunnel RST request")); 1147 slog (L_DEBUG, _("DNS: got tunnel RST request"));
1088 1148
1089 delete dns; c->dns = 0; 1149 c->dnsv4_reset_connection ();
1090
1091 return;
1092 } 1150 }
1093 else if (ip [3] == CMD_IP_SYN) 1151 else if (ip [3] == CMD_IP_SYN)
1094 { 1152 {
1095 slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us.")); 1153 slog (L_DEBUG, _("DNS: got tunnel SYN reply, server likes us."));
1096 dns->established = true; 1154 dns->established = true;
1097 } 1155 }
1098 else if (ip [3] == CMD_IP_REJ) 1156 else if (ip [3] == CMD_IP_REJ)
1099 {
1100 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."));
1101 abort ();
1102 }
1103 else 1158 else
1104 slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]); 1159 slog (L_INFO, _("DNS: got unknown meta command %02x"), ip [3]);
1105 } 1160 }
1106 else 1161 else
1107 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"),
… …
1133 break; 1188 break;
1134 } 1189 }
1135} 1190}
1136 1191
1137void 1192void
1138vpn::dnsv4_ev (io_watcher &w, short revents) 1193vpn::dnsv4_ev (ev::io &w, int revents)
1139{ 1194{
1140 if (revents & EVENT_READ) 1195 if (revents & EV_READ)
1141 { 1196 {
1142 dns_packet *pkt = new dns_packet; 1197 dns_packet *pkt = new dns_packet;
1143 struct sockaddr_in sa; 1198 struct sockaddr_in sa;
1144 socklen_t sa_len = sizeof (sa); 1199 socklen_t sa_len = sizeof (sa);
1145 1200
1146 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 1201 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1147 1202
1148 if (pkt->len > 0) 1203 if (pkt->len > 0)
1149 { 1204 {
1150 if (THISNODE->dns_port) 1205 if (ntohs (pkt->flags) & FLAG_RESPONSE)
1206 dnsv4_client (*pkt);
1207 else
1151 { 1208 {
1152 dnsv4_server (*pkt); 1209 dnsv4_server (*pkt);
1153 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len); 1210 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1154 } 1211 }
1155 else
1156 dnsv4_client (*pkt);
1157 1212
1158 delete pkt; 1213 delete pkt;
1159 } 1214 }
1160 } 1215 }
1161} 1216}
1162 1217
1163bool 1218bool
1164vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 1219vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1165{ 1220{
1166 int client = ntohs (si.port); 1221 int client = ntohl (si.host);
1167 1222
1168 assert (0 < client && client <= conns.size ()); 1223 assert (0 < client && client <= conns.size ());
1169 1224
1170 connection *c = conns [client - 1]; 1225 connection *c = conns [client - 1];
1171 1226
1172 if (!c->dns) 1227 if (!c->dns)
1173 c->dns = new dns_connection (c); 1228 c->dns = new dns_connection (c);
1174 1229
1175 if (!c->dns->snddq.put (pkt)) 1230 if (c->dns->snddq.put (pkt))
1176 return false;
1177
1178 c->dns->tw.trigger (); 1231 c->dns->tw ();
1179 1232
1233 // always return true even if the buffer overflows
1180 return true; 1234 return true;
1181} 1235}
1182 1236
1183void 1237void
1184connection::dnsv4_reset_connection () 1238connection::dnsv4_reset_connection ()
… …
1187} 1241}
1188 1242
1189#define NEXT(w) do { if (next > (w)) next = w; } while (0) 1243#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1190 1244
1191void 1245void
1192dns_connection::time_cb (time_watcher &w) 1246dns_connection::time_cb (ev::timer &w, int revents)
1193{ 1247{
1194 // servers have to be polled 1248 // servers have to be polled
1195 if (THISNODE->dns_port) 1249 if (THISNODE->dns_port)
1196 return; 1250 return;
1197 1251
1198 // check for timeouts and (re)transmit 1252 // check for timeouts and (re)transmit
1199 tstamp next = NOW + poll_interval; 1253 tstamp next = ev::now () + poll_interval;
1200 dns_snd *send = 0; 1254 dns_snd *send = 0;
1201 1255
1202 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); 1256 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1203 i != vpn->dns_sndpq.end (); 1257 i != vpn->dns_sndpq.end ();
1204 ++i) 1258 ++i)
1205 { 1259 {
1206 dns_snd *r = *i; 1260 dns_snd *r = *i;
1207 1261
1208 if (r->timeout <= NOW) 1262 if (r->timeout <= ev_now ())
1209 { 1263 {
1210 if (!send) 1264 if (!send)
1211 { 1265 {
1212 send = r; 1266 send = r;
1213 1267
1214 r->retry++; 1268 r->retry++;
1215 r->timeout = NOW + (r->retry * last_latency * 8.); 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
1216 1271
1217 // the following code changes the query section a bit, forcing 1272 // the following code changes the query section a bit, forcing
1218 // the forwarder to generate a new request 1273 // the forwarder to generate a new request
1219 if (r->stdhdr) 1274 if (r->stdhdr)
1220 {
1221 //printf ("reencoded header for ID %d retry %d:%d:%d\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);printf ("reencoded header for ID %d retry %d:%d:%d\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1222 //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);
1223 }
1224 } 1276 }
1225 } 1277 }
1226 else 1278 else
1227 NEXT (r->timeout); 1279 NEXT (r->timeout);
1228 } 1280 }
1229 1281
1230 if (last_sent + send_interval <= NOW)
1231 {
1232 if (!send) 1282 if (!send)
1283 {
1284 // generate a new packet, if wise
1285
1286 if (!established)
1233 { 1287 {
1234 // generate a new packet, if wise 1288 if (vpn->dns_sndpq.empty ())
1235
1236 if (!established)
1237 { 1289 {
1238 if (vpn->dns_sndpq.empty ())
1239 {
1240 send = new dns_snd (this); 1290 send = new dns_snd (this);
1241 1291
1242 printf ("new conn %p %d\n", this, c->conf->id);//D
1243 cfg.reset (THISNODE->id); 1292 cfg.reset (THISNODE->id);
1244 send->gen_syn_req (); 1293 send->gen_syn_req ();
1245 }
1246 } 1294 }
1247 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING 1295 }
1296 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1248 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1297 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1298 {
1299 if (last_sent + send_interval <= ev_now ())
1249 { 1300 {
1250 //printf ("sending data request etc.\n"); //D 1301 //printf ("sending data request etc.\n"); //D
1251 if (!snddq.empty ()) 1302 if (!snddq.empty () || last_received + 1. > ev_now ())
1252 { 1303 {
1253 poll_interval = send_interval; 1304 poll_interval = send_interval;
1254 NEXT (NOW + send_interval); 1305 NEXT (ev_now () + send_interval);
1255 } 1306 }
1256 1307
1257 send = new dns_snd (this); 1308 send = new dns_snd (this);
1258 send->gen_stream_req (sndseq, snddq); 1309 send->gen_stream_req (sndseq, snddq);
1259 send->timeout = NOW + last_latency * 8.; 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
1260 1312
1261 sndseq = (sndseq + 1) & SEQNO_MASK; 1313 sndseq = (sndseq + 1) & SEQNO_MASK;
1262 } 1314 }
1263 1315 else
1264 if (send) 1316 NEXT (last_sent + send_interval);
1265 vpn->dns_sndpq.push_back (send);
1266 } 1317 }
1267 1318
1268 if (send) 1319 if (send)
1269 { 1320 vpn->dns_sndpq.push_back (send);
1270 last_sent = NOW; 1321 }
1322
1323 if (send)
1324 {
1325 last_sent = ev_now ();
1271 sendto (vpn->dnsv4_fd, 1326 sendto (vpn->dnsv4_fd,
1272 send->pkt->at (0), send->pkt->len, 0, 1327 send->pkt->at (0), send->pkt->len, 0,
1273 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1328 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1274 }
1275 } 1329 }
1276 else
1277 NEXT (last_sent + send_interval);
1278 1330
1279 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d)", 1331 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1280 poll_interval, send_interval, next - NOW, 1332 poll_interval, send_interval, next - ev_now (),
1281 vpn->dns_sndpq.size (), snddq.size ()); 1333 vpn->dns_sndpq.size (), snddq.size (),
1334 rcvpq.size ());
1282 1335
1283 // 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
1337 // doesn't seem to happen anymore
1284 if (next < NOW + 0.0001) 1338 if (next < ev_now () + 0.001)
1285 next = NOW + 0.1; 1339 next = ev_now () + 0.1;
1286 1340
1287 w.start (next); 1341 w.start (next - ev_now ());
1288} 1342}
1289 1343
1290#endif 1344#endif
1291 1345

Diff Legend

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