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.24 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.44 by pcg, Tue Dec 4 14:55:59 2007 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20*/ 20*/
21
22// TODO: EDNS0 option to increase dns mtu?
23// TODO: re-write dns packet parsing/creation using a safe mem-buffer
24// to ensure no buffer overflows or similar problems.
21 25
22#include "config.h" 26#include "config.h"
23 27
24#if ENABLE_DNS 28#if ENABLE_DNS
25 29
… …
38#include <unistd.h> 42#include <unistd.h>
39#include <fcntl.h> 43#include <fcntl.h>
40 44
41#include <map> 45#include <map>
42 46
47#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
43#include <gmp.h> 48#include <gmp.h>
44 49
45#include "netcompat.h" 50#include "netcompat.h"
46 51
47#include "vpn.h" 52#include "vpn.h"
48 53
49#define MIN_POLL_INTERVAL .02 // how often to poll minimally when the server has data
50#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data 54#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
51#define ACTIVITY_INTERVAL 5. 55#define ACTIVITY_INTERVAL 5.
52 56
53#define INITIAL_TIMEOUT 0.1 // retry timeouts 57#define INITIAL_TIMEOUT 0.1 // retry timeouts
54#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn 58#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
55 59
56#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests
57#define MAX_SEND_INTERVAL 0.5 // optimistic? 60#define MAX_SEND_INTERVAL 2. // optimistic?
58 61
59#define MAX_OUTSTANDING 10 // max. outstanding requests
60#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog 62#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
61#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE 63#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62 64
63#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well 65#define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well
64// 240 leaves about 4 bytes of server reply data 66// 240 leaves about 4 bytes of server reply data
65// every two request bytes less give room for one reply byte 67// every request byte less give room for two reply bytes
66 68
67#define SEQNO_MASK 0x3fff 69#define SEQNO_MASK 0x3fff
68#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) 70#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69 71
70#define MAX_LBL_SIZE 63 72#define MAX_LBL_SIZE 63
… …
423 u16 max_size; 425 u16 max_size;
424 u8 seq_cdc; 426 u8 seq_cdc;
425 u8 req_cdc; 427 u8 req_cdc;
426 428
427 u8 rep_cdc; 429 u8 rep_cdc;
430 u8 delay; // time in 0.01s units that the server may delay replying packets
428 u8 r2, r3, r4; 431 u8 r3, r4;
429 432
430 u8 r5, r6, r7, r8; 433 u8 r5, r6, r7, r8;
431 434
432 void reset (int clientid); 435 void reset (int clientid);
433 bool valid (); 436 bool valid ();
… …
448 flags = 0; 451 flags = 0;
449 def_ttl = 0; 452 def_ttl = 0;
450 seq_cdc = 26; 453 seq_cdc = 26;
451 req_cdc = 62; 454 req_cdc = 62;
452 rep_cdc = 0; 455 rep_cdc = 0;
453 max_size = ntohs (MAX_PKT_SIZE); 456 max_size = htons (MAX_PKT_SIZE);
454 client = ntohs (clientid); 457 client = htons (clientid);
455 uid = next_uid++; 458 uid = next_uid++;
459 delay = 0;
456 460
457 r2 = r3 = r4 = 0; 461 r3 = r4 = 0;
458 r4 = r5 = r6 = r7 = 0; 462 r4 = r5 = r6 = r7 = 0;
459} 463}
460 464
461bool dns_cfg::valid () 465bool dns_cfg::valid ()
462{ 466{
467 // although the protocol itself allows for some configurability,
468 // only the following encoding/decoding settings are implemented.
463 return id1 == 'G' 469 return id1 == 'G'
464 && id2 == 'V' 470 && id2 == 'V'
465 && id3 == 'P' 471 && id3 == 'P'
466 && id4 == 'E' 472 && id4 == 'E'
467 && seq_cdc == 26 473 && seq_cdc == 26
468 && req_cdc == 62 474 && req_cdc == 62
469 && rep_cdc == 0 475 && rep_cdc == 0
470 && version == 1 476 && version == 1;
471 && max_size == ntohs (MAX_PKT_SIZE);
472} 477}
473 478
474struct dns_packet : net_packet 479struct dns_packet : net_packet
475{ 480{
476 u16 id; 481 u16 id;
… …
547 552
548 bool established; 553 bool established;
549 554
550 tstamp last_received; 555 tstamp last_received;
551 tstamp last_sent; 556 tstamp last_sent;
552 double last_latency; 557 double min_latency;
553 double poll_interval, send_interval; 558 double poll_interval, send_interval;
554 559
555 vector<dns_rcv *> rcvpq; 560 vector<dns_rcv *> rcvpq;
556 561
557 byte_stream rcvdq; int rcvseq; 562 byte_stream rcvdq; int rcvseq; int repseq;
558 byte_stream snddq; int sndseq; 563 byte_stream snddq; int sndseq;
559 564
560 void time_cb (time_watcher &w); time_watcher tw; 565 void time_cb (ev::timer &w, int revents); ev::timer tw;
561 void receive_rep (dns_rcv *r); 566 void receive_rep (dns_rcv *r);
562 567
563 dns_connection (connection *c); 568 dns_connection (connection *c);
564 ~dns_connection (); 569 ~dns_connection ();
565}; 570};
… …
584: dns (dns) 589: dns (dns)
585{ 590{
586 timeout = 0; 591 timeout = 0;
587 retry = 0; 592 retry = 0;
588 seqno = 0; 593 seqno = 0;
589 sent = NOW; 594 sent = ev_now ();
590 stdhdr = false; 595 stdhdr = false;
591 596
592 pkt = new dns_packet; 597 pkt = new dns_packet;
593 598
594 pkt->id = next_id (); 599 pkt->id = next_id ();
… …
625void dns_snd::gen_stream_req (int seqno, byte_stream &stream) 630void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
626{ 631{
627 stdhdr = true; 632 stdhdr = true;
628 this->seqno = seqno; 633 this->seqno = seqno;
629 634
630 timeout = NOW + INITIAL_TIMEOUT; 635 timeout = ev_now () + INITIAL_TIMEOUT;
631 636
632 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 637 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
633 pkt->qdcount = htons (1); 638 pkt->qdcount = htons (1);
634 639
635 int offs = 6*2; 640 int offs = 6*2;
… …
670 pkt->len = offs; 675 pkt->len = offs;
671} 676}
672 677
673void dns_snd::gen_syn_req () 678void dns_snd::gen_syn_req ()
674{ 679{
675 timeout = NOW + INITIAL_SYN_TIMEOUT; 680 timeout = ev_now () + INITIAL_SYN_TIMEOUT;
676 681
677 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 682 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
678 pkt->qdcount = htons (1); 683 pkt->qdcount = htons (1);
679 684
680 int offs = 6 * 2; 685 int offs = 6 * 2;
… …
719///////////////////////////////////////////////////////////////////////////// 724/////////////////////////////////////////////////////////////////////////////
720 725
721dns_connection::dns_connection (connection *c) 726dns_connection::dns_connection (connection *c)
722: c (c) 727: c (c)
723, rcvdq (MAX_BACKLOG * 2) 728, rcvdq (MAX_BACKLOG * 2)
724, snddq (MAX_BACKLOG * 2) 729, snddq (MAX_BACKLOG)
725, tw (this, &dns_connection::time_cb) 730, tw (this, &dns_connection::time_cb)
726{ 731{
727 vpn = c->vpn; 732 vpn = c->vpn;
728 733
729 established = false; 734 established = false;
730 735
731 rcvseq = sndseq = 0; 736 rcvseq = repseq = sndseq = 0;
732 737
733 last_sent = last_received = 0; 738 last_sent = last_received = 0;
734 poll_interval = MIN_POLL_INTERVAL; 739 poll_interval = 0.5; // starting here
735 send_interval = 0.5; // starting rate 740 send_interval = 0.5; // starting rate
736 last_latency = INITIAL_TIMEOUT; 741 min_latency = INITIAL_TIMEOUT;
737} 742}
738 743
739dns_connection::~dns_connection () 744dns_connection::~dns_connection ()
740{ 745{
741 for (vector<dns_rcv *>::iterator i = rcvpq.begin (); 746 for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
… …
746 751
747void dns_connection::receive_rep (dns_rcv *r) 752void dns_connection::receive_rep (dns_rcv *r)
748{ 753{
749 if (r->datalen) 754 if (r->datalen)
750 { 755 {
751 last_received = NOW; 756 last_received = ev_now ();
752 tw.trigger (); 757 tw ();
753 758
754 poll_interval = send_interval; 759 poll_interval = send_interval;
755 } 760 }
756 else 761 else
757 { 762 {
758 poll_interval *= 1.5; 763 poll_interval *= 1.5;
764
759 if (poll_interval > MAX_POLL_INTERVAL) 765 if (poll_interval > MAX_POLL_INTERVAL)
760 poll_interval = MAX_POLL_INTERVAL; 766 poll_interval = MAX_POLL_INTERVAL;
761 } 767 }
762 768
763 rcvpq.push_back (r); 769 rcvpq.push_back (r);
… …
766 772
767 // find next packet 773 // find next packet
768 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) 774 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
769 if (SEQNO_EQ (rcvseq, (*i)->seqno)) 775 if (SEQNO_EQ (rcvseq, (*i)->seqno))
770 { 776 {
777 //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
771 // enter the packet into our input stream 778 // enter the packet into our input stream
772 r = *i; 779 r = *i;
773 780
774 // remove the oldest packet, look forward, as it's oldest first 781 // remove the oldest packet, look forward, as it's oldest first
775 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) 782 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
776 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) 783 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
777 { 784 {
785 //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
778 delete *j; 786 delete *j;
779 rcvpq.erase (j); 787 rcvpq.erase (j);
780 break; 788 break;
781 } 789 }
782 790
… …
789 } 797 }
790 798
791 while (vpn_packet *pkt = rcvdq.get ()) 799 while (vpn_packet *pkt = rcvdq.get ())
792 { 800 {
793 sockinfo si; 801 sockinfo si;
794 si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4; 802 si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
795 803
796 vpn->recv_vpn_packet (pkt, si); 804 vpn->recv_vpn_packet (pkt, si);
797 805
798 delete pkt; 806 delete pkt;
799 } 807 }
… …
853 if (0 < client && client <= conns.size ()) 861 if (0 < client && client <= conns.size ())
854 { 862 {
855 connection *c = conns [client - 1]; 863 connection *c = conns [client - 1];
856 dns_connection *dns = c->dns; 864 dns_connection *dns = c->dns;
857 dns_rcv *rcv; 865 dns_rcv *rcv;
858 bool in_seq;
859 866
860 if (dns) 867 if (dns)
861 { 868 {
862 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); ) 869 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
863 if (SEQNO_EQ ((*i)->seqno, seqno)) 870 if (SEQNO_EQ ((*i)->seqno, seqno))
… …
874 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len); 881 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
875 882
876 goto duplicate_request; 883 goto duplicate_request;
877 } 884 }
878 885
879 in_seq = dns->rcvseq == seqno;
880
881 // new packet, queue 886 // new packet, queue
882 rcv = new dns_rcv (seqno, data, datalen); 887 rcv = new dns_rcv (seqno, data, datalen);
883 dns->receive_rep (rcv); 888 dns->receive_rep (rcv);
884 } 889 }
885 890
… …
892 pkt [offs++] = 0; pkt [offs++] = 0; 897 pkt [offs++] = 0; pkt [offs++] = 0;
893 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL 898 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
894 899
895 int rdlen_offs = offs += 2; 900 int rdlen_offs = offs += 2;
896 901
897 int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;
898 // bind doesn't compress well, so reduce further by one label length
899 dlen -= qlen;
900
901 if (dns) 902 if (dns)
902 { 903 {
904 int dlen = ntohs (dns->cfg.max_size) - offs;
905
906 // bind doesn't compress well, so reduce further by one label length
907 dlen -= qlen;
908
903 // only put data into in-order sequence packets, if 909 // only put data into in-order sequence packets, if
904 // we receive out-of-order packets we generate empty 910 // we receive out-of-order packets we generate empty
905 // replies 911 // replies
906 while (dlen > 1 && !dns->snddq.empty () && in_seq) 912 //printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
913 if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
907 { 914 {
915 dns->repseq = seqno;
916
917 while (dlen > 1 && !dns->snddq.empty ())
918 {
908 int txtlen = dlen <= 255 ? dlen - 1 : 255; 919 int txtlen = dlen <= 255 ? dlen - 1 : 255;
909 920
910 if (txtlen > dns->snddq.size ()) 921 if (txtlen > dns->snddq.size ())
911 txtlen = dns->snddq.size (); 922 txtlen = dns->snddq.size ();
912 923
913 pkt[offs++] = txtlen; 924 pkt[offs++] = txtlen;
914 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen); 925 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
915 offs += txtlen; 926 offs += txtlen;
916 dns->snddq.remove (txtlen); 927 dns->snddq.remove (txtlen);
917 928
918 dlen -= txtlen + 1; 929 dlen -= txtlen + 1;
930 }
919 } 931 }
920 932
921 // avoid empty TXT rdata 933 // avoid completely empty TXT rdata
922 if (offs == rdlen_offs) 934 if (offs == rdlen_offs)
923 pkt[offs++] = 0; 935 pkt[offs++] = 0;
924 936
925 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ()); 937 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
926 } 938 }
… …
1006 { 1018 {
1007 dns_connection *dns = (*i)->dns; 1019 dns_connection *dns = (*i)->dns;
1008 connection *c = dns->c; 1020 connection *c = dns->c;
1009 int seqno = (*i)->seqno; 1021 int seqno = (*i)->seqno;
1010 u8 data[MAXSIZE], *datap = data; 1022 u8 data[MAXSIZE], *datap = data;
1023 //printf ("rcv pkt %x\n", seqno);//D
1011 1024
1012 if ((*i)->retry) 1025 if ((*i)->retry)
1013 { 1026 {
1014 dns->send_interval *= 1.01; 1027 dns->send_interval *= 1.01;
1015 if (dns->send_interval > MAX_SEND_INTERVAL) 1028 if (dns->send_interval > MAX_SEND_INTERVAL)
1016 dns->send_interval = MAX_SEND_INTERVAL; 1029 dns->send_interval = MAX_SEND_INTERVAL;
1017 } 1030 }
1018 else 1031 else
1019 { 1032 {
1020#if 1 1033#if 0
1021 dns->send_interval *= 0.999; 1034 dns->send_interval *= 0.999;
1022#endif 1035#endif
1023 if (dns->send_interval < MIN_SEND_INTERVAL)
1024 dns->send_interval = MIN_SEND_INTERVAL;
1025
1026 // the latency surely puts an upper bound on 1036 // the latency surely puts an upper bound on
1027 // the minimum send interval 1037 // the minimum send interval
1028 double latency = NOW - (*i)->sent; 1038 double latency = ev_now () - (*i)->sent;
1039
1040 if (latency < dns->min_latency)
1029 dns->last_latency = latency; 1041 dns->min_latency = latency;
1030 1042
1031 if (dns->send_interval > latency) 1043 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
1044 dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
1045
1046 if (dns->send_interval < conf.dns_send_interval)
1032 dns->send_interval = latency; 1047 dns->send_interval = conf.dns_send_interval;
1033 } 1048 }
1034 1049
1035 delete *i; 1050 delete *i;
1036 dns_sndpq.erase (i); 1051 dns_sndpq.erase (i);
1037 1052
… …
1142 break; 1157 break;
1143 } 1158 }
1144} 1159}
1145 1160
1146void 1161void
1147vpn::dnsv4_ev (io_watcher &w, short revents) 1162vpn::dnsv4_ev (ev::io &w, int revents)
1148{ 1163{
1149 if (revents & EVENT_READ) 1164 if (revents & EV_READ)
1150 { 1165 {
1151 dns_packet *pkt = new dns_packet; 1166 dns_packet *pkt = new dns_packet;
1152 struct sockaddr_in sa; 1167 struct sockaddr_in sa;
1153 socklen_t sa_len = sizeof (sa); 1168 socklen_t sa_len = sizeof (sa);
1154 1169
… …
1170} 1185}
1171 1186
1172bool 1187bool
1173vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 1188vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1174{ 1189{
1175 int client = ntohs (si.port); 1190 int client = ntohl (si.host);
1176 1191
1177 assert (0 < client && client <= conns.size ()); 1192 assert (0 < client && client <= conns.size ());
1178 1193
1179 connection *c = conns [client - 1]; 1194 connection *c = conns [client - 1];
1180 1195
1181 if (!c->dns) 1196 if (!c->dns)
1182 c->dns = new dns_connection (c); 1197 c->dns = new dns_connection (c);
1183 1198
1184 if (!c->dns->snddq.put (pkt)) 1199 if (c->dns->snddq.put (pkt))
1185 return false;
1186
1187 c->dns->tw.trigger (); 1200 c->dns->tw ();
1188 1201
1202 // always return true even if the buffer overflows
1189 return true; 1203 return true;
1190} 1204}
1191 1205
1192void 1206void
1193connection::dnsv4_reset_connection () 1207connection::dnsv4_reset_connection ()
… …
1196} 1210}
1197 1211
1198#define NEXT(w) do { if (next > (w)) next = w; } while (0) 1212#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1199 1213
1200void 1214void
1201dns_connection::time_cb (time_watcher &w) 1215dns_connection::time_cb (ev::timer &w, int revents)
1202{ 1216{
1203 // servers have to be polled 1217 // servers have to be polled
1204 if (THISNODE->dns_port) 1218 if (THISNODE->dns_port)
1205 return; 1219 return;
1206 1220
1207 // check for timeouts and (re)transmit 1221 // check for timeouts and (re)transmit
1208 tstamp next = NOW + poll_interval; 1222 tstamp next = ev::now () + poll_interval;
1209 dns_snd *send = 0; 1223 dns_snd *send = 0;
1210 1224
1211 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); 1225 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1212 i != vpn->dns_sndpq.end (); 1226 i != vpn->dns_sndpq.end ();
1213 ++i) 1227 ++i)
1214 { 1228 {
1215 dns_snd *r = *i; 1229 dns_snd *r = *i;
1216 1230
1217 if (r->timeout <= NOW) 1231 if (r->timeout <= ev_now ())
1218 { 1232 {
1219 if (!send) 1233 if (!send)
1220 { 1234 {
1221 send = r; 1235 send = r;
1222 1236
1223 r->retry++; 1237 r->retry++;
1224 r->timeout = NOW + (r->retry * last_latency * 8.); 1238 r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor);
1239 //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D
1225 1240
1226 // the following code changes the query section a bit, forcing 1241 // the following code changes the query section a bit, forcing
1227 // the forwarder to generate a new request 1242 // the forwarder to generate a new request
1228 if (r->stdhdr) 1243 if (r->stdhdr)
1229 {
1230 //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);
1231 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); 1244 encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry);
1232 }
1233 } 1245 }
1234 } 1246 }
1235 else 1247 else
1236 NEXT (r->timeout); 1248 NEXT (r->timeout);
1237 } 1249 }
1238 1250
1239 if (last_sent + send_interval <= NOW)
1240 {
1241 if (!send) 1251 if (!send)
1252 {
1253 // generate a new packet, if wise
1254
1255 if (!established)
1242 { 1256 {
1243 // generate a new packet, if wise 1257 if (vpn->dns_sndpq.empty ())
1244
1245 if (!established)
1246 { 1258 {
1247 if (vpn->dns_sndpq.empty ())
1248 {
1249 send = new dns_snd (this); 1259 send = new dns_snd (this);
1250 1260
1251 cfg.reset (THISNODE->id); 1261 cfg.reset (THISNODE->id);
1252 send->gen_syn_req (); 1262 send->gen_syn_req ();
1253 }
1254 } 1263 }
1255 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING 1264 }
1265 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1256 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1266 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1267 {
1268 if (last_sent + send_interval <= ev_now ())
1257 { 1269 {
1258 //printf ("sending data request etc.\n"); //D 1270 //printf ("sending data request etc.\n"); //D
1259 if (!snddq.empty ()) 1271 if (!snddq.empty () || last_received + 1. > ev_now ())
1260 { 1272 {
1261 poll_interval = send_interval; 1273 poll_interval = send_interval;
1262 NEXT (NOW + send_interval); 1274 NEXT (ev_now () + send_interval);
1263 } 1275 }
1264 1276
1265 send = new dns_snd (this); 1277 send = new dns_snd (this);
1266 send->gen_stream_req (sndseq, snddq); 1278 send->gen_stream_req (sndseq, snddq);
1267 send->timeout = NOW + last_latency * 8.; 1279 send->timeout = ev_now () + min_latency * conf.dns_timeout_factor;
1280 //printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D
1268 1281
1269 sndseq = (sndseq + 1) & SEQNO_MASK; 1282 sndseq = (sndseq + 1) & SEQNO_MASK;
1270 } 1283 }
1271 1284 else
1272 if (send) 1285 NEXT (last_sent + send_interval);
1273 vpn->dns_sndpq.push_back (send);
1274 } 1286 }
1275 1287
1276 if (send) 1288 if (send)
1277 { 1289 vpn->dns_sndpq.push_back (send);
1278 last_sent = NOW; 1290 }
1291
1292 if (send)
1293 {
1294 last_sent = ev_now ();
1279 sendto (vpn->dnsv4_fd, 1295 sendto (vpn->dnsv4_fd,
1280 send->pkt->at (0), send->pkt->len, 0, 1296 send->pkt->at (0), send->pkt->len, 0,
1281 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1297 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1282 }
1283 } 1298 }
1284 else
1285 NEXT (last_sent + send_interval);
1286 1299
1287 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d)", 1300 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1288 poll_interval, send_interval, next - NOW, 1301 poll_interval, send_interval, next - ev_now (),
1289 vpn->dns_sndpq.size (), snddq.size ()); 1302 vpn->dns_sndpq.size (), snddq.size (),
1303 rcvpq.size ());
1290 1304
1291 // TODO: no idea when this happens, but when next < NOW, we have a problem 1305 // TODO: no idea when this happens, but when next < ev_now (), we have a problem
1306 // doesn't seem to happen anymore
1292 if (next < NOW + 0.0001) 1307 if (next < ev_now () + 0.001)
1293 next = NOW + 0.1; 1308 next = ev_now () + 0.1;
1294 1309
1295 w.start (next); 1310 w.start (next - ev_now ());
1296} 1311}
1297 1312
1298#endif 1313#endif
1299 1314

Diff Legend

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