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.28 by pcg, Sun Mar 13 12:33:34 2005 UTC

… …
25 25
26// dns processing is EXTREMELY ugly. For obvious(?) reasons. 26// dns processing is EXTREMELY ugly. For obvious(?) reasons.
27// it's a hack, use only in emergency situations please. 27// it's a hack, use only in emergency situations please.
28 28
29#include <cstring> 29#include <cstring>
30#include <cassert>
30 31
31#include <sys/types.h> 32#include <sys/types.h>
32#include <sys/socket.h> 33#include <sys/socket.h>
33#include <sys/wait.h> 34#include <sys/wait.h>
34#include <sys/uio.h> 35#include <sys/uio.h>
… …
51 52
52#define INITIAL_TIMEOUT 0.1 // retry timeouts 53#define INITIAL_TIMEOUT 0.1 // retry timeouts
53#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn 54#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn
54 55
55#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests 56#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests
56#define MAX_SEND_INTERVAL 0.5 // optimistic? 57#define MAX_SEND_INTERVAL 2. // optimistic?
57 58
59#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate
58#define MAX_OUTSTANDING 10 // max. outstanding requests 60#define MAX_OUTSTANDING 100 // max. outstanding requests
59#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog 61#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 62#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
61 63
62#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well 64#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 65// 240 leaves about 4 bytes of server reply data
64// every two request bytes less give room for one reply byte 66// every two request bytes less give room for one reply byte
65 67
66#define SEQNO_MASK 0x3fff 68#define SEQNO_MASK 0x3fff
67#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) 69#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
… …
264static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO"); 266static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
265 267
266///////////////////////////////////////////////////////////////////////////// 268/////////////////////////////////////////////////////////////////////////////
267 269
268#define HDRSIZE 6 270#define HDRSIZE 6
269 271
270inline void encode_header (char *data, int clientid, int seqno, int retry = 0) 272inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
271{ 273{
272 seqno &= SEQNO_MASK; 274 seqno &= SEQNO_MASK;
273 275
274 u8 hdr[3] = { 276 u8 hdr[3] = {
… …
408struct dns_cfg 410struct dns_cfg
409{ 411{
410 static int next_uid; 412 static int next_uid;
411 413
412 u8 id1, id2, id3, id4; 414 u8 id1, id2, id3, id4;
415
413 u8 version; 416 u8 version;
417 u8 flags;
414 u8 rrtype; 418 u8 rrtype;
415 u8 flags;
416 u8 def_ttl; 419 u8 def_ttl;
417 u8 rcv_cdc; 420
418 u8 snd_cdc;
419 u16 max_size;
420 u16 client; 421 u16 client;
421 u16 uid; // to make request unique 422 u16 uid; // to make request unique
422 423
423 u8 reserved[8]; 424 u16 max_size;
425 u8 seq_cdc;
426 u8 req_cdc;
427
428 u8 rep_cdc;
429 u8 r2, r3, r4;
430
431 u8 r5, r6, r7, r8;
424 432
425 void reset (int clientid); 433 void reset (int clientid);
426 bool valid (); 434 bool valid ();
427}; 435};
428 436
… …
437 445
438 version = 1; 446 version = 1;
439 447
440 rrtype = RR_TYPE_TXT; 448 rrtype = RR_TYPE_TXT;
441 flags = 0; 449 flags = 0;
442 def_ttl = 1; 450 def_ttl = 0;
451 seq_cdc = 26;
452 req_cdc = 62;
443 rcv_cdc = 0; 453 rep_cdc = 0;
444 snd_cdc = 62;
445 max_size = ntohs (MAX_PKT_SIZE); 454 max_size = htons (MAX_PKT_SIZE);
446 client = ntohs (clientid); 455 client = htons (clientid);
447 uid = next_uid++; 456 uid = next_uid++;
448 457
449 memset (reserved, 0, 8); 458 r2 = r3 = r4 = 0;
459 r4 = r5 = r6 = r7 = 0;
450} 460}
451 461
452bool dns_cfg::valid () 462bool dns_cfg::valid ()
453{ 463{
454 return id1 == 'G' 464 return id1 == 'G'
455 && id2 == 'V' 465 && id2 == 'V'
456 && id3 == 'P' 466 && id3 == 'P'
457 && id4 == 'E' 467 && id4 == 'E'
468 && seq_cdc == 26
469 && req_cdc == 62
470 && rep_cdc == 0
458 && version == 1 471 && version == 1;
459 && flags == 0
460 && rcv_cdc == 0
461 && snd_cdc == 62
462 && max_size == ntohs (MAX_PKT_SIZE);
463} 472}
464 473
465struct dns_packet : net_packet 474struct dns_packet : net_packet
466{ 475{
467 u16 id; 476 u16 id;
468 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4 477 u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
469 u16 qdcount, ancount, nscount, arcount; 478 u16 qdcount, ancount, nscount, arcount;
470 479
471 u8 data[MAXSIZE - 6 * 2]; 480 u8 data [MAXSIZE - 6 * 2];
472 481
473 int decode_label (char *data, int size, int &offs); 482 int decode_label (char *data, int size, int &offs);
474}; 483};
475 484
476int dns_packet::decode_label (char *data, int size, int &offs) 485int dns_packet::decode_label (char *data, int size, int &offs)
… …
538 547
539 bool established; 548 bool established;
540 549
541 tstamp last_received; 550 tstamp last_received;
542 tstamp last_sent; 551 tstamp last_sent;
543 double last_latency; 552 double min_latency;
544 double poll_interval, send_interval; 553 double poll_interval, send_interval;
545 554
546 vector<dns_rcv *> rcvpq; 555 vector<dns_rcv *> rcvpq;
547 556
548 byte_stream rcvdq; int rcvseq; 557 byte_stream rcvdq; int rcvseq;
… …
622 631
623 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 632 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
624 pkt->qdcount = htons (1); 633 pkt->qdcount = htons (1);
625 634
626 int offs = 6*2; 635 int offs = 6*2;
627 int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2); 636 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, 637 // 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 638 // so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra
630 639
631 char enc[256], *encp = enc; 640 char enc[256], *encp = enc;
632 encode_header (enc, THISNODE->id, seqno); 641 encode_header (enc, THISNODE->id, seqno);
… …
650 encp += lbllen; 659 encp += lbllen;
651 660
652 enclen -= lbllen; 661 enclen -= lbllen;
653 } 662 }
654 663
655 append_domain (*pkt, offs, THISNODE->domain); 664 append_domain (*pkt, offs, dns->c->conf->domain);
656 665
657 (*pkt)[offs++] = 0; 666 (*pkt)[offs++] = 0;
658 (*pkt)[offs++] = RR_TYPE_ANY >> 8; (*pkt)[offs++] = RR_TYPE_ANY; 667 (*pkt)[offs++] = RR_TYPE_ANY >> 8; (*pkt)[offs++] = RR_TYPE_ANY;
659 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; 668 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN;
660 669
… …
663 672
664void dns_snd::gen_syn_req () 673void dns_snd::gen_syn_req ()
665{ 674{
666 timeout = NOW + INITIAL_SYN_TIMEOUT; 675 timeout = NOW + INITIAL_SYN_TIMEOUT;
667 676
668 printf ("send syn\n");//D
669
670 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 677 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
671 pkt->qdcount = htons (1); 678 pkt->qdcount = htons (1);
672 679
673 int offs = 6 * 2; 680 int offs = 6 * 2;
674 681
… …
676 683
677 assert (elen <= MAX_LBL_SIZE); 684 assert (elen <= MAX_LBL_SIZE);
678 685
679 (*pkt)[offs] = elen; 686 (*pkt)[offs] = elen;
680 offs += elen + 1; 687 offs += elen + 1;
681 append_domain (*pkt, offs, THISNODE->domain); 688 append_domain (*pkt, offs, dns->c->conf->domain);
682 689
683 (*pkt)[offs++] = 0; 690 (*pkt)[offs++] = 0;
684 (*pkt)[offs++] = RR_TYPE_A >> 8; (*pkt)[offs++] = RR_TYPE_A; 691 (*pkt)[offs++] = RR_TYPE_A >> 8; (*pkt)[offs++] = RR_TYPE_A;
685 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; 692 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN;
686 693
… …
724 rcvseq = sndseq = 0; 731 rcvseq = sndseq = 0;
725 732
726 last_sent = last_received = 0; 733 last_sent = last_received = 0;
727 poll_interval = MIN_POLL_INTERVAL; 734 poll_interval = MIN_POLL_INTERVAL;
728 send_interval = 0.5; // starting rate 735 send_interval = 0.5; // starting rate
729 last_latency = INITIAL_TIMEOUT; 736 min_latency = INITIAL_TIMEOUT;
730} 737}
731 738
732dns_connection::~dns_connection () 739dns_connection::~dns_connection ()
733{ 740{
734 for (vector<dns_rcv *>::iterator i = rcvpq.begin (); 741 for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
… …
747 poll_interval = send_interval; 754 poll_interval = send_interval;
748 } 755 }
749 else 756 else
750 { 757 {
751 poll_interval *= 1.5; 758 poll_interval *= 1.5;
759
752 if (poll_interval > MAX_POLL_INTERVAL) 760 if (poll_interval > MAX_POLL_INTERVAL)
753 poll_interval = MAX_POLL_INTERVAL; 761 poll_interval = MAX_POLL_INTERVAL;
754 } 762 }
755 763
756 rcvpq.push_back (r); 764 rcvpq.push_back (r);
… …
806 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); 814 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR);
807 815
808 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK)) 816 if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK))
809 && pkt.qdcount == htons (1)) 817 && pkt.qdcount == htons (1))
810 { 818 {
811 char qname[MAXSIZE]; 819 char qname [MAXSIZE];
812 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs); 820 int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
813 821
814 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++]; 822 u16 qtype = pkt [offs++] << 8; qtype |= pkt [offs++];
815 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++]; 823 u16 qclass = pkt [offs++] << 8; qclass |= pkt [offs++];
816 824
… …
823 831
824 int dlen = strlen (THISNODE->domain); 832 int dlen = strlen (THISNODE->domain);
825 833
826 if (qclass == RR_CLASS_IN 834 if (qclass == RR_CLASS_IN
827 && qlen > dlen + 1 835 && qlen > dlen + 1
828 && !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen)) 836 && !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
829 { 837 {
830 // now generate reply 838 // now generate reply
831 pkt.ancount = htons (1); // one answer RR 839 pkt.ancount = htons (1); // one answer RR
832 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK); 840 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK);
833 841
… …
874 // new packet, queue 882 // new packet, queue
875 rcv = new dns_rcv (seqno, data, datalen); 883 rcv = new dns_rcv (seqno, data, datalen);
876 dns->receive_rep (rcv); 884 dns->receive_rep (rcv);
877 } 885 }
878 886
887 {
879 pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section 888 pkt [offs++] = 0xc0; pkt [offs++] = 6 * 2; // refer to name in query section
880 889
881 int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A; 890 int rtype = dns ? dns->cfg.rrtype : RR_TYPE_A;
882 pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type 891 pkt [offs++] = rtype >> 8; pkt [offs++] = rtype; // type
883 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class 892 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
884 pkt [offs++] = 0; pkt [offs++] = 0; 893 pkt [offs++] = 0; pkt [offs++] = 0;
885 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL 894 pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
886 895
887 int rdlen_offs = offs += 2; 896 int rdlen_offs = offs += 2;
888 897
898 if (dns)
899 {
889 int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs; 900 int dlen = ntohs (dns->cfg.max_size) - offs;
901
890 // bind doesn't compress well, so reduce further by one label length 902 // bind doesn't compress well, so reduce further by one label length
891 dlen -= qlen; 903 dlen -= qlen;
892 904
893 if (dns)
894 {
895 // only put data into in-order sequence packets, if 905 // only put data into in-order sequence packets, if
896 // we receive out-of-order packets we generate empty 906 // we receive out-of-order packets we generate empty
897 // replies 907 // replies
898 while (dlen > 1 && !dns->snddq.empty () && in_seq) 908 while (dlen > 1 && !dns->snddq.empty () && in_seq)
899 { 909 {
900 int txtlen = dlen <= 255 ? dlen - 1 : 255; 910 int txtlen = dlen <= 255 ? dlen - 1 : 255;
901 911
902 if (txtlen > dns->snddq.size ()) 912 if (txtlen > dns->snddq.size ())
903 txtlen = dns->snddq.size (); 913 txtlen = dns->snddq.size ();
904 914
905 pkt[offs++] = txtlen; 915 pkt[offs++] = txtlen;
906 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen); 916 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
907 offs += txtlen; 917 offs += txtlen;
908 dns->snddq.remove (txtlen); 918 dns->snddq.remove (txtlen);
909 919
910 dlen -= txtlen + 1; 920 dlen -= txtlen + 1;
911 } 921 }
912 922
913 // avoid empty TXT rdata 923 // avoid empty TXT rdata
914 if (offs == rdlen_offs) 924 if (offs == rdlen_offs)
915 pkt[offs++] = 0; 925 pkt[offs++] = 0;
916 926
917 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ()); 927 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
918 } 928 }
919 else 929 else
920 { 930 {
921 // send RST 931 // send RST
922 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3; 932 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
923 pkt [offs++] = CMD_IP_RST; 933 pkt [offs++] = CMD_IP_RST;
924 } 934 }
925 935
926 int rdlen = offs - rdlen_offs; 936 int rdlen = offs - rdlen_offs;
927 937
928 pkt [rdlen_offs - 2] = rdlen >> 8; 938 pkt [rdlen_offs - 2] = rdlen >> 8;
929 pkt [rdlen_offs - 1] = rdlen; 939 pkt [rdlen_offs - 1] = rdlen;
930 940
931 if (dns) 941 if (dns)
932 { 942 {
933 // now update dns_rcv copy 943 // now update dns_rcv copy
934 rcv->pkt->len = offs; 944 rcv->pkt->len = offs;
935 memcpy (rcv->pkt->at (0), pkt.at (0), offs); 945 memcpy (rcv->pkt->at (0), pkt.at (0), offs);
936 } 946 }
947 }
937 948
938 duplicate_request: ; 949 duplicate_request: ;
939 } 950 }
940 else 951 else
941 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); 952 pkt.flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR);
… …
953 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class 964 pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
954 pkt [offs++] = 0; pkt [offs++] = 0; 965 pkt [offs++] = 0; pkt [offs++] = 0;
955 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL 966 pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
956 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength 967 pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
957 968
958 slog (L_INFO, _("DNS: client %d tries to connect"), client); 969 slog (L_INFO, _("DNS: client %d connects"), client);
959 970
960 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3; 971 pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
961 pkt [offs++] = CMD_IP_REJ; 972 pkt [offs++] = CMD_IP_REJ;
962 973
963 if (0 < client && client <= conns.size ()) 974 if (0 < client && client <= conns.size ())
… …
1006 if (dns->send_interval > MAX_SEND_INTERVAL) 1017 if (dns->send_interval > MAX_SEND_INTERVAL)
1007 dns->send_interval = MAX_SEND_INTERVAL; 1018 dns->send_interval = MAX_SEND_INTERVAL;
1008 } 1019 }
1009 else 1020 else
1010 { 1021 {
1011#if 1 1022#if 0
1012 dns->send_interval *= 0.999; 1023 dns->send_interval *= 0.999;
1013#endif 1024#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 1025 // the latency surely puts an upper bound on
1018 // the minimum send interval 1026 // the minimum send interval
1019 double latency = NOW - (*i)->sent; 1027 double latency = NOW - (*i)->sent;
1028
1029 if (latency < dns->min_latency)
1020 dns->last_latency = latency; 1030 dns->min_latency = latency;
1021 1031
1022 if (dns->send_interval > latency) 1032 if (dns->send_interval > dns->min_latency * LATENCY_FACTOR)
1023 dns->send_interval = latency; 1033 dns->send_interval = dns->min_latency * LATENCY_FACTOR;
1034
1035 if (dns->send_interval < MIN_SEND_INTERVAL)
1036 dns->send_interval = MIN_SEND_INTERVAL;
1024 } 1037 }
1025 1038
1026 delete *i; 1039 delete *i;
1027 dns_sndpq.erase (i); 1040 dns_sndpq.erase (i);
1028 1041
… …
1145 1158
1146 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 1159 pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1147 1160
1148 if (pkt->len > 0) 1161 if (pkt->len > 0)
1149 { 1162 {
1150 if (THISNODE->dns_port) 1163 if (ntohs (pkt->flags) & FLAG_RESPONSE)
1164 dnsv4_client (*pkt);
1165 else
1151 { 1166 {
1152 dnsv4_server (*pkt); 1167 dnsv4_server (*pkt);
1153 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len); 1168 sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1154 } 1169 }
1155 else
1156 dnsv4_client (*pkt);
1157 1170
1158 delete pkt; 1171 delete pkt;
1159 } 1172 }
1160 } 1173 }
1161} 1174}
… …
1210 if (!send) 1223 if (!send)
1211 { 1224 {
1212 send = r; 1225 send = r;
1213 1226
1214 r->retry++; 1227 r->retry++;
1215 r->timeout = NOW + (r->retry * last_latency * 8.); 1228 r->timeout = NOW + (r->retry * min_latency * 8.);
1216 1229
1217 // the following code changes the query section a bit, forcing 1230 // the following code changes the query section a bit, forcing
1218 // the forwarder to generate a new request 1231 // the forwarder to generate a new request
1219 if (r->stdhdr) 1232 if (r->stdhdr)
1220 { 1233 {
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); 1234 //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\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); 1235 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry);
1223 } 1236 }
1224 } 1237 }
1225 } 1238 }
1226 else 1239 else
1227 NEXT (r->timeout); 1240 NEXT (r->timeout);
1228 } 1241 }
1229 1242
1243 if (!send)
1244 {
1230 if (last_sent + send_interval <= NOW) 1245 if (last_sent + send_interval <= NOW)
1231 {
1232 if (!send)
1233 { 1246 {
1234 // generate a new packet, if wise 1247 // generate a new packet, if wise
1235 1248
1236 if (!established) 1249 if (!established)
1237 { 1250 {
1238 if (vpn->dns_sndpq.empty ()) 1251 if (vpn->dns_sndpq.empty ())
1239 { 1252 {
1240 send = new dns_snd (this); 1253 send = new dns_snd (this);
1241 1254
1242 printf ("new conn %p %d\n", this, c->conf->id);//D
1243 cfg.reset (THISNODE->id); 1255 cfg.reset (THISNODE->id);
1244 send->gen_syn_req (); 1256 send->gen_syn_req ();
1245 } 1257 }
1246 } 1258 }
1247 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING 1259 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
1248 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1260 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1249 { 1261 {
1250 //printf ("sending data request etc.\n"); //D 1262 //printf ("sending data request etc.\n"); //D
1251 if (!snddq.empty ()) 1263 if (!snddq.empty () || last_received + 1. > NOW)
1252 { 1264 {
1253 poll_interval = send_interval; 1265 poll_interval = send_interval;
1254 NEXT (NOW + send_interval); 1266 NEXT (NOW + send_interval);
1255 } 1267 }
1256 1268
1257 send = new dns_snd (this); 1269 send = new dns_snd (this);
1258 send->gen_stream_req (sndseq, snddq); 1270 send->gen_stream_req (sndseq, snddq);
1259 send->timeout = NOW + last_latency * 8.; 1271 send->timeout = NOW + min_latency * 8.;
1260 1272
1261 sndseq = (sndseq + 1) & SEQNO_MASK; 1273 sndseq = (sndseq + 1) & SEQNO_MASK;
1262 } 1274 }
1263 1275
1264 if (send) 1276 if (send)
1265 vpn->dns_sndpq.push_back (send); 1277 vpn->dns_sndpq.push_back (send);
1266 } 1278 }
1279 else
1280 NEXT (last_sent + send_interval);
1281 }
1267 1282
1268 if (send) 1283 if (send)
1269 { 1284 {
1270 last_sent = NOW; 1285 last_sent = NOW;
1271 sendto (vpn->dnsv4_fd, 1286 sendto (vpn->dnsv4_fd,
1272 send->pkt->at (0), send->pkt->len, 0, 1287 send->pkt->at (0), send->pkt->len, 0,
1273 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1288 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1274 }
1275 } 1289 }
1276 else
1277 NEXT (last_sent + send_interval);
1278 1290
1279 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)",
1280 poll_interval, send_interval, next - NOW, 1292 poll_interval, send_interval, next - NOW,
1281 vpn->dns_sndpq.size (), snddq.size ()); 1293 vpn->dns_sndpq.size (), snddq.size (),
1294 rcvpq.size ());
1282 1295
1283 // 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
1284 if (next < NOW + 0.0001) 1297 if (next < NOW + 0.0001)
1285 next = NOW + 0.1; 1298 next = NOW + 0.1;
1286 1299

Diff Legend

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