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.21 by pcg, Sun Mar 6 21:33:40 2005 UTC vs.
Revision 1.37 by pcg, Wed Mar 23 17:03:58 2005 UTC

… …
44 44
45#include "netcompat.h" 45#include "netcompat.h"
46 46
47#include "vpn.h" 47#include "vpn.h"
48 48
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 49#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
51#define ACTIVITY_INTERVAL 5. 50#define ACTIVITY_INTERVAL 5.
52 51
53#define INITIAL_TIMEOUT 0.1 // retry timeouts 52#define INITIAL_TIMEOUT 0.1 // retry timeouts
54#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn 53#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
55 54
56#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests
57#define MAX_SEND_INTERVAL 0.5 // optimistic? 55#define MAX_SEND_INTERVAL 2. // optimistic?
58 56
59#define MAX_OUTSTANDING 10 // max. outstanding requests
60#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog 57#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 58#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62 59
63#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well 60#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 61// 240 leaves about 4 bytes of server reply data
65// every two request bytes less give room for one reply byte 62// every request byte less give room for two reply bytes
66 63
67#define SEQNO_MASK 0x3fff 64#define SEQNO_MASK 0x3fff
68#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) 65#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69 66
70#define MAX_LBL_SIZE 63 67#define MAX_LBL_SIZE 63
… …
265static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO"); 262static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
266 263
267///////////////////////////////////////////////////////////////////////////// 264/////////////////////////////////////////////////////////////////////////////
268 265
269#define HDRSIZE 6 266#define HDRSIZE 6
270 267
271inline void encode_header (char *data, int clientid, int seqno, int retry = 0) 268inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
272{ 269{
273 seqno &= SEQNO_MASK; 270 seqno &= SEQNO_MASK;
274 271
275 u8 hdr[3] = { 272 u8 hdr[3] = {
… …
409struct dns_cfg 406struct dns_cfg
410{ 407{
411 static int next_uid; 408 static int next_uid;
412 409
413 u8 id1, id2, id3, id4; 410 u8 id1, id2, id3, id4;
411
414 u8 version; 412 u8 version;
413 u8 flags;
415 u8 rrtype; 414 u8 rrtype;
416 u8 flags;
417 u8 def_ttl; 415 u8 def_ttl;
418 u8 rcv_cdc; 416
419 u8 snd_cdc;
420 u16 max_size;
421 u16 client; 417 u16 client;
422 u16 uid; // to make request unique 418 u16 uid; // to make request unique
423 419
424 u8 reserved[8]; 420 u16 max_size;
421 u8 seq_cdc;
422 u8 req_cdc;
423
424 u8 rep_cdc;
425 u8 delay; // time in 0.01s units that the server may delay replying packets
426 u8 r3, r4;
427
428 u8 r5, r6, r7, r8;
425 429
426 void reset (int clientid); 430 void reset (int clientid);
427 bool valid (); 431 bool valid ();
428}; 432};
429 433
… …
438 442
439 version = 1; 443 version = 1;
440 444
441 rrtype = RR_TYPE_TXT; 445 rrtype = RR_TYPE_TXT;
442 flags = 0; 446 flags = 0;
443 def_ttl = 1; 447 def_ttl = 0;
448 seq_cdc = 26;
449 req_cdc = 62;
444 rcv_cdc = 0; 450 rep_cdc = 0;
445 snd_cdc = 62;
446 max_size = ntohs (MAX_PKT_SIZE); 451 max_size = htons (MAX_PKT_SIZE);
447 client = ntohs (clientid); 452 client = htons (clientid);
448 uid = next_uid++; 453 uid = next_uid++;
454 delay = 0;
449 455
450 memset (reserved, 0, 8); 456 r3 = r4 = 0;
457 r4 = r5 = r6 = r7 = 0;
451} 458}
452 459
453bool dns_cfg::valid () 460bool dns_cfg::valid ()
454{ 461{
455 return id1 == 'G' 462 return id1 == 'G'
456 && id2 == 'V' 463 && id2 == 'V'
457 && id3 == 'P' 464 && id3 == 'P'
458 && id4 == 'E' 465 && id4 == 'E'
466 && seq_cdc == 26
467 && req_cdc == 62
468 && rep_cdc == 0
459 && version == 1 469 && version == 1;
460 && flags == 0
461 && rcv_cdc == 0
462 && snd_cdc == 62
463 && max_size == ntohs (MAX_PKT_SIZE);
464} 470}
465 471
466struct dns_packet : net_packet 472struct dns_packet : net_packet
467{ 473{
468 u16 id; 474 u16 id;
469 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4 475 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
470 u16 qdcount, ancount, nscount, arcount; 476 u16 qdcount, ancount, nscount, arcount;
471 477
472 u8 data[MAXSIZE - 6 * 2]; 478 u8 data [MAXSIZE - 6 * 2];
473 479
474 int decode_label (char *data, int size, int &offs); 480 int decode_label (char *data, int size, int &offs);
475}; 481};
476 482
477int dns_packet::decode_label (char *data, int size, int &offs) 483int dns_packet::decode_label (char *data, int size, int &offs)
… …
539 545
540 bool established; 546 bool established;
541 547
542 tstamp last_received; 548 tstamp last_received;
543 tstamp last_sent; 549 tstamp last_sent;
544 double last_latency; 550 double min_latency;
545 double poll_interval, send_interval; 551 double poll_interval, send_interval;
546 552
547 vector<dns_rcv *> rcvpq; 553 vector<dns_rcv *> rcvpq;
548 554
549 byte_stream rcvdq; int rcvseq; 555 byte_stream rcvdq; int rcvseq; int repseq;
550 byte_stream snddq; int sndseq; 556 byte_stream snddq; int sndseq;
551 557
552 void time_cb (time_watcher &w); time_watcher tw; 558 void time_cb (time_watcher &w); time_watcher tw;
553 void receive_rep (dns_rcv *r); 559 void receive_rep (dns_rcv *r);
554 560
… …
664 670
665void dns_snd::gen_syn_req () 671void dns_snd::gen_syn_req ()
666{ 672{
667 timeout = NOW + INITIAL_SYN_TIMEOUT; 673 timeout = NOW + INITIAL_SYN_TIMEOUT;
668 674
669 printf ("send syn\n");//D
670
671 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 675 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
672 pkt->qdcount = htons (1); 676 pkt->qdcount = htons (1);
673 677
674 int offs = 6 * 2; 678 int offs = 6 * 2;
675 679
… …
713///////////////////////////////////////////////////////////////////////////// 717/////////////////////////////////////////////////////////////////////////////
714 718
715dns_connection::dns_connection (connection *c) 719dns_connection::dns_connection (connection *c)
716: c (c) 720: c (c)
717, rcvdq (MAX_BACKLOG * 2) 721, rcvdq (MAX_BACKLOG * 2)
718, snddq (MAX_BACKLOG * 2) 722, snddq (MAX_BACKLOG)
719, tw (this, &dns_connection::time_cb) 723, tw (this, &dns_connection::time_cb)
720{ 724{
721 vpn = c->vpn; 725 vpn = c->vpn;
722 726
723 established = false; 727 established = false;
724 728
725 rcvseq = sndseq = 0; 729 rcvseq = repseq = sndseq = 0;
726 730
727 last_sent = last_received = 0; 731 last_sent = last_received = 0;
728 poll_interval = MIN_POLL_INTERVAL; 732 poll_interval = 0.5; // starting here
729 send_interval = 0.5; // starting rate 733 send_interval = 0.5; // starting rate
730 last_latency = INITIAL_TIMEOUT; 734 min_latency = INITIAL_TIMEOUT;
731} 735}
732 736
733dns_connection::~dns_connection () 737dns_connection::~dns_connection ()
734{ 738{
735 for (vector<dns_rcv *>::iterator i = rcvpq.begin (); 739 for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
… …
748 poll_interval = send_interval; 752 poll_interval = send_interval;
749 } 753 }
750 else 754 else
751 { 755 {
752 poll_interval *= 1.5; 756 poll_interval *= 1.5;
757
753 if (poll_interval > MAX_POLL_INTERVAL) 758 if (poll_interval > MAX_POLL_INTERVAL)
754 poll_interval = MAX_POLL_INTERVAL; 759 poll_interval = MAX_POLL_INTERVAL;
755 } 760 }
756 761
757 rcvpq.push_back (r); 762 rcvpq.push_back (r);
… …
783 } 788 }
784 789
785 while (vpn_packet *pkt = rcvdq.get ()) 790 while (vpn_packet *pkt = rcvdq.get ())
786 { 791 {
787 sockinfo si; 792 sockinfo si;
788 si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4; 793 si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
789 794
790 vpn->recv_vpn_packet (pkt, si); 795 vpn->recv_vpn_packet (pkt, si);
791 796
792 delete pkt; 797 delete pkt;
793 } 798 }
… …
807 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); 812 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR);
808 813
809 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK)) 814 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK))
810 && pkt.qdcount == htons (1)) 815 && pkt.qdcount == htons (1))
811 { 816 {
812 char qname[MAXSIZE]; 817 char qname [MAXSIZE];
813 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs); 818 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
814 819
815 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++]; 820 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++];
816 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++]; 821 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++];
817 822
… …
824 829
825 int dlen = strlen (THISNODE->domain); 830 int dlen = strlen (THISNODE->domain);
826 831
827 if (qclass == RR_CLASS_IN 832 if (qclass == RR_CLASS_IN
828 && qlen > dlen + 1 833 && qlen > dlen + 1
829 && !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen)) 834 && !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
830 { 835 {
831 // now generate reply 836 // now generate reply
832 pkt.ancount = htons (1); // one answer RR 837 pkt.ancount = htons (1); // one answer RR
833 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK); 838 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK);
834 839
… …
847 if (0 < client && client <= conns.size ()) 852 if (0 < client && client <= conns.size ())
848 { 853 {
849 connection *c = conns [client - 1]; 854 connection *c = conns [client - 1];
850 dns_connection *dns = c->dns; 855 dns_connection *dns = c->dns;
851 dns_rcv *rcv; 856 dns_rcv *rcv;
852 bool in_seq;
853 857
854 if (dns) 858 if (dns)
855 { 859 {
856 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); ) 860 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
857 if (SEQNO_EQ ((*i)->seqno, seqno)) 861 if (SEQNO_EQ ((*i)->seqno, seqno))
… …
868 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len); 872 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
869 873
870 goto duplicate_request; 874 goto duplicate_request;
871 } 875 }
872 876
873 in_seq = dns->rcvseq == seqno;
874
875 // new packet, queue 877 // new packet, queue
876 rcv = new dns_rcv (seqno, data, datalen); 878 rcv = new dns_rcv (seqno, data, datalen);
877 dns->receive_rep (rcv); 879 dns->receive_rep (rcv);
878 } 880 }
879 881
… …
886 pkt [offs++] = 0; pkt [offs++] = 0; 888 pkt [offs++] = 0; pkt [offs++] = 0;
887 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL 889 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
888 890
889 int rdlen_offs = offs += 2; 891 int rdlen_offs = offs += 2;
890 892
891 int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;
892 // bind doesn't compress well, so reduce further by one label length
893 dlen -= qlen;
894
895 if (dns) 893 if (dns)
896 { 894 {
895 int dlen = ntohs (dns->cfg.max_size) - offs;
896
897 // bind doesn't compress well, so reduce further by one label length
898 dlen -= qlen;
899
897 // only put data into in-order sequence packets, if 900 // only put data into in-order sequence packets, if
898 // we receive out-of-order packets we generate empty 901 // we receive out-of-order packets we generate empty
899 // replies 902 // replies
900 while (dlen > 1 && !dns->snddq.empty () && in_seq) 903 //printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
904 if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
901 { 905 {
906 dns->repseq = seqno;
907
908 while (dlen > 1 && !dns->snddq.empty ())
909 {
902 int txtlen = dlen <= 255 ? dlen - 1 : 255; 910 int txtlen = dlen <= 255 ? dlen - 1 : 255;
903 911
904 if (txtlen > dns->snddq.size ()) 912 if (txtlen > dns->snddq.size ())
905 txtlen = dns->snddq.size (); 913 txtlen = dns->snddq.size ();
906 914
907 pkt[offs++] = txtlen; 915 pkt[offs++] = txtlen;
908 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen); 916 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
909 offs += txtlen; 917 offs += txtlen;
910 dns->snddq.remove (txtlen); 918 dns->snddq.remove (txtlen);
911 919
912 dlen -= txtlen + 1; 920 dlen -= txtlen + 1;
921 }
913 } 922 }
914 923
915 // avoid empty TXT rdata 924 // avoid completely empty TXT rdata
916 if (offs == rdlen_offs) 925 if (offs == rdlen_offs)
917 pkt[offs++] = 0; 926 pkt[offs++] = 0;
918 927
919 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ()); 928 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
920 } 929 }
… …
956 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class 965 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
957 pkt [offs++] = 0; pkt [offs++] = 0; 966 pkt [offs++] = 0; pkt [offs++] = 0;
958 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL 967 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
959 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength 968 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
960 969
961 slog (L_INFO, _("DNS: client %d tries to connect"), client); 970 slog (L_INFO, _("DNS: client %d connects"), client);
962 971
963 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3; 972 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
964 pkt [offs++] = CMD_IP_REJ; 973 pkt [offs++] = CMD_IP_REJ;
965 974
966 if (0 < client && client <= conns.size ()) 975 if (0 < client && client <= conns.size ())
… …
1009 if (dns->send_interval > MAX_SEND_INTERVAL) 1018 if (dns->send_interval > MAX_SEND_INTERVAL)
1010 dns->send_interval = MAX_SEND_INTERVAL; 1019 dns->send_interval = MAX_SEND_INTERVAL;
1011 } 1020 }
1012 else 1021 else
1013 { 1022 {
1014#if 1 1023#if 0
1015 dns->send_interval *= 0.999; 1024 dns->send_interval *= 0.999;
1016#endif 1025#endif
1017 if (dns->send_interval < MIN_SEND_INTERVAL)
1018 dns->send_interval = MIN_SEND_INTERVAL;
1019
1020 // the latency surely puts an upper bound on 1026 // the latency surely puts an upper bound on
1021 // the minimum send interval 1027 // the minimum send interval
1022 double latency = NOW - (*i)->sent; 1028 double latency = NOW - (*i)->sent;
1029
1030 if (latency < dns->min_latency)
1023 dns->last_latency = latency; 1031 dns->min_latency = latency;
1024 1032
1025 if (dns->send_interval > latency) 1033 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
1034 dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
1035
1036 if (dns->send_interval < conf.dns_send_interval)
1026 dns->send_interval = latency; 1037 dns->send_interval = conf.dns_send_interval;
1027 } 1038 }
1028 1039
1029 delete *i; 1040 delete *i;
1030 dns_sndpq.erase (i); 1041 dns_sndpq.erase (i);
1031 1042
… …
1148 1159
1149 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 1160 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1150 1161
1151 if (pkt->len > 0) 1162 if (pkt->len > 0)
1152 { 1163 {
1153 if (THISNODE->dns_port) 1164 if (ntohs (pkt->flags) & FLAG_RESPONSE)
1165 dnsv4_client (*pkt);
1166 else
1154 { 1167 {
1155 dnsv4_server (*pkt); 1168 dnsv4_server (*pkt);
1156 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len); 1169 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1157 } 1170 }
1158 else
1159 dnsv4_client (*pkt);
1160 1171
1161 delete pkt; 1172 delete pkt;
1162 } 1173 }
1163 } 1174 }
1164} 1175}
1165 1176
1166bool 1177bool
1167vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 1178vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1168{ 1179{
1169 int client = ntohs (si.port); 1180 int client = ntohl (si.host);
1170 1181
1171 assert (0 < client && client <= conns.size ()); 1182 assert (0 < client && client <= conns.size ());
1172 1183
1173 connection *c = conns [client - 1]; 1184 connection *c = conns [client - 1];
1174 1185
1175 if (!c->dns) 1186 if (!c->dns)
1176 c->dns = new dns_connection (c); 1187 c->dns = new dns_connection (c);
1177 1188
1178 if (!c->dns->snddq.put (pkt)) 1189 if (c->dns->snddq.put (pkt))
1179 return false;
1180
1181 c->dns->tw.trigger (); 1190 c->dns->tw.trigger ();
1182 1191
1192 // always return true even if the buffer overflows
1183 return true; 1193 return true;
1184} 1194}
1185 1195
1186void 1196void
1187connection::dnsv4_reset_connection () 1197connection::dnsv4_reset_connection ()
… …
1213 if (!send) 1223 if (!send)
1214 { 1224 {
1215 send = r; 1225 send = r;
1216 1226
1217 r->retry++; 1227 r->retry++;
1218 r->timeout = NOW + (r->retry * last_latency * 8.); 1228 r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor);
1219 1229
1220 // the following code changes the query section a bit, forcing 1230 // the following code changes the query section a bit, forcing
1221 // the forwarder to generate a new request 1231 // the forwarder to generate a new request
1222 if (r->stdhdr) 1232 if (r->stdhdr)
1223 { 1233 {
1224 //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); 1234 //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1225 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); 1235 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry);
1226 } 1236 }
1227 } 1237 }
1228 } 1238 }
1229 else 1239 else
1230 NEXT (r->timeout); 1240 NEXT (r->timeout);
1231 } 1241 }
1232 1242
1233 if (last_sent + send_interval <= NOW)
1234 {
1235 if (!send) 1243 if (!send)
1244 {
1245 // generate a new packet, if wise
1246
1247 if (!established)
1236 { 1248 {
1237 // generate a new packet, if wise 1249 if (vpn->dns_sndpq.empty ())
1238
1239 if (!established)
1240 { 1250 {
1241 if (vpn->dns_sndpq.empty ())
1242 {
1243 send = new dns_snd (this); 1251 send = new dns_snd (this);
1244 1252
1245 printf ("new conn %p %d\n", this, c->conf->id);//D
1246 cfg.reset (THISNODE->id); 1253 cfg.reset (THISNODE->id);
1247 send->gen_syn_req (); 1254 send->gen_syn_req ();
1248 }
1249 } 1255 }
1250 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING 1256 }
1257 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1251 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1258 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1259 {
1260 if (last_sent + send_interval <= NOW)
1252 { 1261 {
1253 //printf ("sending data request etc.\n"); //D 1262 //printf ("sending data request etc.\n"); //D
1254 if (!snddq.empty ()) 1263 if (!snddq.empty () || last_received + 1. > NOW)
1255 { 1264 {
1256 poll_interval = send_interval; 1265 poll_interval = send_interval;
1257 NEXT (NOW + send_interval); 1266 NEXT (NOW + send_interval);
1258 } 1267 }
1259 1268
1260 send = new dns_snd (this); 1269 send = new dns_snd (this);
1261 send->gen_stream_req (sndseq, snddq); 1270 send->gen_stream_req (sndseq, snddq);
1262 send->timeout = NOW + last_latency * 8.; 1271 send->timeout = NOW + min_latency * conf.dns_timeout_factor;
1263 1272
1264 sndseq = (sndseq + 1) & SEQNO_MASK; 1273 sndseq = (sndseq + 1) & SEQNO_MASK;
1265 } 1274 }
1266 1275 else
1267 if (send) 1276 NEXT (last_sent + send_interval);
1268 vpn->dns_sndpq.push_back (send);
1269 } 1277 }
1270 1278
1271 if (send) 1279 if (send)
1272 { 1280 vpn->dns_sndpq.push_back (send);
1281 }
1282
1283 if (send)
1284 {
1273 last_sent = NOW; 1285 last_sent = NOW;
1274 sendto (vpn->dnsv4_fd, 1286 sendto (vpn->dnsv4_fd,
1275 send->pkt->at (0), send->pkt->len, 0, 1287 send->pkt->at (0), send->pkt->len, 0,
1276 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1288 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1277 }
1278 } 1289 }
1279 else
1280 NEXT (last_sent + send_interval);
1281 1290
1282 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d)", 1291 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1283 poll_interval, send_interval, next - NOW, 1292 poll_interval, send_interval, next - NOW,
1284 vpn->dns_sndpq.size (), snddq.size ()); 1293 vpn->dns_sndpq.size (), snddq.size (),
1294 rcvpq.size ());
1285 1295
1286 // TODO: no idea when this happens, but when next < NOW, we have a problem 1296 // TODO: no idea when this happens, but when next < NOW, we have a problem
1297 // doesn't seem to happen anymore
1287 if (next < NOW + 0.0001) 1298 if (next < NOW + 0.001)
1288 next = NOW + 0.1; 1299 next = NOW + 0.1;
1289 1300
1290 w.start (next); 1301 w.start (next);
1291} 1302}
1292 1303

Diff Legend

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