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.28 by pcg, Sun Mar 13 12:33:34 2005 UTC vs.
Revision 1.36 by pcg, Thu Mar 17 22:24:31 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
52#define TIMEOUT_FACTOR 8.
53
53#define INITIAL_TIMEOUT 0.1 // retry timeouts 54#define INITIAL_TIMEOUT 0.1 // retry timeouts
54#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn 55#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
55 56
56#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests 57#define MIN_SEND_INTERVAL 0.001 // wait at least this time between sending requests
57#define MAX_SEND_INTERVAL 2. // optimistic? 58#define MAX_SEND_INTERVAL 2. // optimistic?
58 59
59#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate 60#define LATENCY_FACTOR 0.5 // RTT * LATENCY_FACTOR == sending rate
60#define MAX_OUTSTANDING 100 // max. outstanding requests 61#define MAX_OUTSTANDING 100 // max. outstanding requests
61#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog 62#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
62#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
63 64
64#define MAX_DOMAIN_SIZE 240 // 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
65// 240 leaves about 4 bytes of server reply data 66// 240 leaves about 4 bytes of server reply data
66// every two request bytes less give room for one reply byte 67// every request byte less give room for two reply bytes
67 68
68#define SEQNO_MASK 0x3fff 69#define SEQNO_MASK 0x3fff
69#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) 70#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
70 71
71#define MAX_LBL_SIZE 63 72#define MAX_LBL_SIZE 63
… …
424 u16 max_size; 425 u16 max_size;
425 u8 seq_cdc; 426 u8 seq_cdc;
426 u8 req_cdc; 427 u8 req_cdc;
427 428
428 u8 rep_cdc; 429 u8 rep_cdc;
430 u8 delay; // time in 0.01s units that the server may delay replying packets
429 u8 r2, r3, r4; 431 u8 r3, r4;
430 432
431 u8 r5, r6, r7, r8; 433 u8 r5, r6, r7, r8;
432 434
433 void reset (int clientid); 435 void reset (int clientid);
434 bool valid (); 436 bool valid ();
… …
452 req_cdc = 62; 454 req_cdc = 62;
453 rep_cdc = 0; 455 rep_cdc = 0;
454 max_size = htons (MAX_PKT_SIZE); 456 max_size = htons (MAX_PKT_SIZE);
455 client = htons (clientid); 457 client = htons (clientid);
456 uid = next_uid++; 458 uid = next_uid++;
459 delay = 0;
457 460
458 r2 = r3 = r4 = 0; 461 r3 = r4 = 0;
459 r4 = r5 = r6 = r7 = 0; 462 r4 = r5 = r6 = r7 = 0;
460} 463}
461 464
462bool dns_cfg::valid () 465bool dns_cfg::valid ()
463{ 466{
… …
552 double min_latency; 555 double min_latency;
553 double poll_interval, send_interval; 556 double poll_interval, send_interval;
554 557
555 vector<dns_rcv *> rcvpq; 558 vector<dns_rcv *> rcvpq;
556 559
557 byte_stream rcvdq; int rcvseq; 560 byte_stream rcvdq; int rcvseq; int repseq;
558 byte_stream snddq; int sndseq; 561 byte_stream snddq; int sndseq;
559 562
560 void time_cb (time_watcher &w); time_watcher tw; 563 void time_cb (time_watcher &w); time_watcher tw;
561 void receive_rep (dns_rcv *r); 564 void receive_rep (dns_rcv *r);
562 565
… …
719///////////////////////////////////////////////////////////////////////////// 722/////////////////////////////////////////////////////////////////////////////
720 723
721dns_connection::dns_connection (connection *c) 724dns_connection::dns_connection (connection *c)
722: c (c) 725: c (c)
723, rcvdq (MAX_BACKLOG * 2) 726, rcvdq (MAX_BACKLOG * 2)
724, snddq (MAX_BACKLOG * 2) 727, snddq (MAX_BACKLOG)
725, tw (this, &dns_connection::time_cb) 728, tw (this, &dns_connection::time_cb)
726{ 729{
727 vpn = c->vpn; 730 vpn = c->vpn;
728 731
729 established = false; 732 established = false;
730 733
731 rcvseq = sndseq = 0; 734 rcvseq = repseq = sndseq = 0;
732 735
733 last_sent = last_received = 0; 736 last_sent = last_received = 0;
734 poll_interval = MIN_POLL_INTERVAL; 737 poll_interval = 0.5; // starting here
735 send_interval = 0.5; // starting rate 738 send_interval = 0.5; // starting rate
736 min_latency = INITIAL_TIMEOUT; 739 min_latency = INITIAL_TIMEOUT;
737} 740}
738 741
739dns_connection::~dns_connection () 742dns_connection::~dns_connection ()
… …
790 } 793 }
791 794
792 while (vpn_packet *pkt = rcvdq.get ()) 795 while (vpn_packet *pkt = rcvdq.get ())
793 { 796 {
794 sockinfo si; 797 sockinfo si;
795 si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4; 798 si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
796 799
797 vpn->recv_vpn_packet (pkt, si); 800 vpn->recv_vpn_packet (pkt, si);
798 801
799 delete pkt; 802 delete pkt;
800 } 803 }
… …
854 if (0 < client && client <= conns.size ()) 857 if (0 < client && client <= conns.size ())
855 { 858 {
856 connection *c = conns [client - 1]; 859 connection *c = conns [client - 1];
857 dns_connection *dns = c->dns; 860 dns_connection *dns = c->dns;
858 dns_rcv *rcv; 861 dns_rcv *rcv;
859 bool in_seq;
860 862
861 if (dns) 863 if (dns)
862 { 864 {
863 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); ) 865 for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
864 if (SEQNO_EQ ((*i)->seqno, seqno)) 866 if (SEQNO_EQ ((*i)->seqno, seqno))
… …
875 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len); 877 memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
876 878
877 goto duplicate_request; 879 goto duplicate_request;
878 } 880 }
879 881
880 in_seq = dns->rcvseq == seqno;
881
882 // new packet, queue 882 // new packet, queue
883 rcv = new dns_rcv (seqno, data, datalen); 883 rcv = new dns_rcv (seqno, data, datalen);
884 dns->receive_rep (rcv); 884 dns->receive_rep (rcv);
885 } 885 }
886 886
… …
903 dlen -= qlen; 903 dlen -= qlen;
904 904
905 // only put data into in-order sequence packets, if 905 // only put data into in-order sequence packets, if
906 // we receive out-of-order packets we generate empty 906 // we receive out-of-order packets we generate empty
907 // replies 907 // replies
908 while (dlen > 1 && !dns->snddq.empty () && in_seq) 908 //printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
909 if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
909 { 910 {
911 dns->repseq = seqno;
912
913 while (dlen > 1 && !dns->snddq.empty ())
914 {
910 int txtlen = dlen <= 255 ? dlen - 1 : 255; 915 int txtlen = dlen <= 255 ? dlen - 1 : 255;
911 916
912 if (txtlen > dns->snddq.size ()) 917 if (txtlen > dns->snddq.size ())
913 txtlen = dns->snddq.size (); 918 txtlen = dns->snddq.size ();
914 919
915 pkt[offs++] = txtlen; 920 pkt[offs++] = txtlen;
916 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen); 921 memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
917 offs += txtlen; 922 offs += txtlen;
918 dns->snddq.remove (txtlen); 923 dns->snddq.remove (txtlen);
919 924
920 dlen -= txtlen + 1; 925 dlen -= txtlen + 1;
926 }
921 } 927 }
922 928
923 // avoid empty TXT rdata 929 // avoid completely empty TXT rdata
924 if (offs == rdlen_offs) 930 if (offs == rdlen_offs)
925 pkt[offs++] = 0; 931 pkt[offs++] = 0;
926 932
927 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ()); 933 slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
928 } 934 }
… …
1174} 1180}
1175 1181
1176bool 1182bool
1177vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 1183vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1178{ 1184{
1179 int client = ntohs (si.port); 1185 int client = ntohl (si.host);
1180 1186
1181 assert (0 < client && client <= conns.size ()); 1187 assert (0 < client && client <= conns.size ());
1182 1188
1183 connection *c = conns [client - 1]; 1189 connection *c = conns [client - 1];
1184 1190
1185 if (!c->dns) 1191 if (!c->dns)
1186 c->dns = new dns_connection (c); 1192 c->dns = new dns_connection (c);
1187 1193
1188 if (!c->dns->snddq.put (pkt)) 1194 if (c->dns->snddq.put (pkt))
1189 return false;
1190
1191 c->dns->tw.trigger (); 1195 c->dns->tw.trigger ();
1192 1196
1197 // always return true even if the buffer overflows
1193 return true; 1198 return true;
1194} 1199}
1195 1200
1196void 1201void
1197connection::dnsv4_reset_connection () 1202connection::dnsv4_reset_connection ()
… …
1223 if (!send) 1228 if (!send)
1224 { 1229 {
1225 send = r; 1230 send = r;
1226 1231
1227 r->retry++; 1232 r->retry++;
1228 r->timeout = NOW + (r->retry * min_latency * 8.); 1233 r->timeout = NOW + (r->retry * min_latency * TIMEOUT_FACTOR);
1229 1234
1230 // the following code changes the query section a bit, forcing 1235 // the following code changes the query section a bit, forcing
1231 // the forwarder to generate a new request 1236 // the forwarder to generate a new request
1232 if (r->stdhdr) 1237 if (r->stdhdr)
1233 { 1238 {
… …
1240 NEXT (r->timeout); 1245 NEXT (r->timeout);
1241 } 1246 }
1242 1247
1243 if (!send) 1248 if (!send)
1244 { 1249 {
1245 if (last_sent + send_interval <= NOW) 1250 // generate a new packet, if wise
1251
1252 if (!established)
1246 { 1253 {
1247 // generate a new packet, if wise 1254 if (vpn->dns_sndpq.empty ())
1248
1249 if (!established)
1250 { 1255 {
1251 if (vpn->dns_sndpq.empty ())
1252 {
1253 send = new dns_snd (this); 1256 send = new dns_snd (this);
1254 1257
1255 cfg.reset (THISNODE->id); 1258 cfg.reset (THISNODE->id);
1256 send->gen_syn_req (); 1259 send->gen_syn_req ();
1257 }
1258 } 1260 }
1261 }
1259 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING 1262 else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
1260 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1263 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1264 {
1265 if (last_sent + send_interval <= NOW)
1261 { 1266 {
1262 //printf ("sending data request etc.\n"); //D 1267 //printf ("sending data request etc.\n"); //D
1263 if (!snddq.empty () || last_received + 1. > NOW) 1268 if (!snddq.empty () || last_received + 1. > NOW)
1264 { 1269 {
1265 poll_interval = send_interval; 1270 poll_interval = send_interval;
1266 NEXT (NOW + send_interval); 1271 NEXT (NOW + send_interval);
1267 } 1272 }
1268 1273
1269 send = new dns_snd (this); 1274 send = new dns_snd (this);
1270 send->gen_stream_req (sndseq, snddq); 1275 send->gen_stream_req (sndseq, snddq);
1271 send->timeout = NOW + min_latency * 8.; 1276 send->timeout = NOW + min_latency * TIMEOUT_FACTOR;
1272 1277
1273 sndseq = (sndseq + 1) & SEQNO_MASK; 1278 sndseq = (sndseq + 1) & SEQNO_MASK;
1274 } 1279 }
1275 1280 else
1276 if (send) 1281 NEXT (last_sent + send_interval);
1277 vpn->dns_sndpq.push_back (send);
1278 } 1282 }
1279 else 1283
1280 NEXT (last_sent + send_interval); 1284 if (send)
1285 vpn->dns_sndpq.push_back (send);
1281 } 1286 }
1282 1287
1283 if (send) 1288 if (send)
1284 { 1289 {
1285 last_sent = NOW; 1290 last_sent = NOW;
… …
1292 poll_interval, send_interval, next - NOW, 1297 poll_interval, send_interval, next - NOW,
1293 vpn->dns_sndpq.size (), snddq.size (), 1298 vpn->dns_sndpq.size (), snddq.size (),
1294 rcvpq.size ()); 1299 rcvpq.size ());
1295 1300
1296 // TODO: no idea when this happens, but when next < NOW, we have a problem 1301 // TODO: no idea when this happens, but when next < NOW, we have a problem
1297 if (next < NOW + 0.0001) 1302 if (next < NOW + 0.001)
1298 next = NOW + 0.1; 1303 next = NOW + 0.1;
1299 1304
1300 w.start (next); 1305 w.start (next);
1301} 1306}
1302 1307

Diff Legend

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