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.40 by pcg, Sat Jul 9 20:29:29 2005 UTC vs.
Revision 1.46 by pcg, Thu Dec 6 00:35:29 2007 UTC

… …
42#include <unistd.h> 42#include <unistd.h>
43#include <fcntl.h> 43#include <fcntl.h>
44 44
45#include <map> 45#include <map>
46 46
47#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
47#include <gmp.h> 48#include <gmp.h>
48 49
49#include "netcompat.h" 50#include "netcompat.h"
50 51
51#include "vpn.h" 52#include "vpn.h"
… …
559 vector<dns_rcv *> rcvpq; 560 vector<dns_rcv *> rcvpq;
560 561
561 byte_stream rcvdq; int rcvseq; int repseq; 562 byte_stream rcvdq; int rcvseq; int repseq;
562 byte_stream snddq; int sndseq; 563 byte_stream snddq; int sndseq;
563 564
564 void time_cb (time_watcher &w); time_watcher tw; 565 inline void time_cb (ev::timer &w, int revents); ev::timer tw;
565 void receive_rep (dns_rcv *r); 566 void receive_rep (dns_rcv *r);
566 567
567 dns_connection (connection *c); 568 dns_connection (connection *c);
568 ~dns_connection (); 569 ~dns_connection ();
569}; 570};
… …
588: dns (dns) 589: dns (dns)
589{ 590{
590 timeout = 0; 591 timeout = 0;
591 retry = 0; 592 retry = 0;
592 seqno = 0; 593 seqno = 0;
593 sent = NOW; 594 sent = ev_now ();
594 stdhdr = false; 595 stdhdr = false;
595 596
596 pkt = new dns_packet; 597 pkt = new dns_packet;
597 598
598 pkt->id = next_id (); 599 pkt->id = next_id ();
… …
629void dns_snd::gen_stream_req (int seqno, byte_stream &stream) 630void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
630{ 631{
631 stdhdr = true; 632 stdhdr = true;
632 this->seqno = seqno; 633 this->seqno = seqno;
633 634
634 timeout = NOW + INITIAL_TIMEOUT; 635 timeout = ev_now () + INITIAL_TIMEOUT;
635 636
636 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 637 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
637 pkt->qdcount = htons (1); 638 pkt->qdcount = htons (1);
638 639
639 int offs = 6*2; 640 int offs = 6*2;
… …
674 pkt->len = offs; 675 pkt->len = offs;
675} 676}
676 677
677void dns_snd::gen_syn_req () 678void dns_snd::gen_syn_req ()
678{ 679{
679 timeout = NOW + INITIAL_SYN_TIMEOUT; 680 timeout = ev_now () + INITIAL_SYN_TIMEOUT;
680 681
681 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 682 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
682 pkt->qdcount = htons (1); 683 pkt->qdcount = htons (1);
683 684
684 int offs = 6 * 2; 685 int offs = 6 * 2;
… …
724 725
725dns_connection::dns_connection (connection *c) 726dns_connection::dns_connection (connection *c)
726: c (c) 727: c (c)
727, rcvdq (MAX_BACKLOG * 2) 728, rcvdq (MAX_BACKLOG * 2)
728, snddq (MAX_BACKLOG) 729, snddq (MAX_BACKLOG)
729, tw (this, &dns_connection::time_cb)
730{ 730{
731 tw.set<dns_connection, &dns_connection::time_cb> (this);
732
731 vpn = c->vpn; 733 vpn = c->vpn;
732 734
733 established = false; 735 established = false;
734 736
735 rcvseq = repseq = sndseq = 0; 737 rcvseq = repseq = sndseq = 0;
… …
750 752
751void dns_connection::receive_rep (dns_rcv *r) 753void dns_connection::receive_rep (dns_rcv *r)
752{ 754{
753 if (r->datalen) 755 if (r->datalen)
754 { 756 {
755 last_received = NOW; 757 last_received = ev_now ();
756 tw.trigger (); 758 tw ();
757 759
758 poll_interval = send_interval; 760 poll_interval = send_interval;
759 } 761 }
760 else 762 else
761 { 763 {
… …
771 773
772 // find next packet 774 // find next packet
773 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) 775 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
774 if (SEQNO_EQ (rcvseq, (*i)->seqno)) 776 if (SEQNO_EQ (rcvseq, (*i)->seqno))
775 { 777 {
778 //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
776 // enter the packet into our input stream 779 // enter the packet into our input stream
777 r = *i; 780 r = *i;
778 781
779 // remove the oldest packet, look forward, as it's oldest first 782 // remove the oldest packet, look forward, as it's oldest first
780 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) 783 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
781 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) 784 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
782 { 785 {
786 //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
783 delete *j; 787 delete *j;
784 rcvpq.erase (j); 788 rcvpq.erase (j);
785 break; 789 break;
786 } 790 }
787 791
… …
1015 { 1019 {
1016 dns_connection *dns = (*i)->dns; 1020 dns_connection *dns = (*i)->dns;
1017 connection *c = dns->c; 1021 connection *c = dns->c;
1018 int seqno = (*i)->seqno; 1022 int seqno = (*i)->seqno;
1019 u8 data[MAXSIZE], *datap = data; 1023 u8 data[MAXSIZE], *datap = data;
1024 //printf ("rcv pkt %x\n", seqno);//D
1020 1025
1021 if ((*i)->retry) 1026 if ((*i)->retry)
1022 { 1027 {
1023 dns->send_interval *= 1.01; 1028 dns->send_interval *= 1.01;
1024 if (dns->send_interval > MAX_SEND_INTERVAL) 1029 if (dns->send_interval > MAX_SEND_INTERVAL)
… …
1029#if 0 1034#if 0
1030 dns->send_interval *= 0.999; 1035 dns->send_interval *= 0.999;
1031#endif 1036#endif
1032 // the latency surely puts an upper bound on 1037 // the latency surely puts an upper bound on
1033 // the minimum send interval 1038 // the minimum send interval
1034 double latency = NOW - (*i)->sent; 1039 double latency = ev_now () - (*i)->sent;
1035 1040
1036 if (latency < dns->min_latency) 1041 if (latency < dns->min_latency)
1037 dns->min_latency = latency; 1042 dns->min_latency = latency;
1038 1043
1039 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor) 1044 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
… …
1153 break; 1158 break;
1154 } 1159 }
1155} 1160}
1156 1161
1157void 1162void
1158vpn::dnsv4_ev (io_watcher &w, short revents) 1163vpn::dnsv4_ev (ev::io &w, int revents)
1159{ 1164{
1160 if (revents & EVENT_READ) 1165 if (revents & EV_READ)
1161 { 1166 {
1162 dns_packet *pkt = new dns_packet; 1167 dns_packet *pkt = new dns_packet;
1163 struct sockaddr_in sa; 1168 struct sockaddr_in sa;
1164 socklen_t sa_len = sizeof (sa); 1169 socklen_t sa_len = sizeof (sa);
1165 1170
… …
1191 1196
1192 if (!c->dns) 1197 if (!c->dns)
1193 c->dns = new dns_connection (c); 1198 c->dns = new dns_connection (c);
1194 1199
1195 if (c->dns->snddq.put (pkt)) 1200 if (c->dns->snddq.put (pkt))
1196 c->dns->tw.trigger (); 1201 c->dns->tw ();
1197 1202
1198 // always return true even if the buffer overflows 1203 // always return true even if the buffer overflows
1199 return true; 1204 return true;
1200} 1205}
1201 1206
… …
1206} 1211}
1207 1212
1208#define NEXT(w) do { if (next > (w)) next = w; } while (0) 1213#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1209 1214
1210void 1215void
1211dns_connection::time_cb (time_watcher &w) 1216dns_connection::time_cb (ev::timer &w, int revents)
1212{ 1217{
1213 // servers have to be polled 1218 // servers have to be polled
1214 if (THISNODE->dns_port) 1219 if (THISNODE->dns_port)
1215 return; 1220 return;
1216 1221
1217 // check for timeouts and (re)transmit 1222 // check for timeouts and (re)transmit
1218 tstamp next = NOW + poll_interval; 1223 tstamp next = ev::now () + poll_interval;
1219 dns_snd *send = 0; 1224 dns_snd *send = 0;
1220 1225
1221 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); 1226 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1222 i != vpn->dns_sndpq.end (); 1227 i != vpn->dns_sndpq.end ();
1223 ++i) 1228 ++i)
1224 { 1229 {
1225 dns_snd *r = *i; 1230 dns_snd *r = *i;
1226 1231
1227 if (r->timeout <= NOW) 1232 if (r->timeout <= ev_now ())
1228 { 1233 {
1229 if (!send) 1234 if (!send)
1230 { 1235 {
1231 send = r; 1236 send = r;
1232 1237
1233 r->retry++; 1238 r->retry++;
1234 r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor); 1239 r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor);
1240 //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D
1235 1241
1236 // the following code changes the query section a bit, forcing 1242 // the following code changes the query section a bit, forcing
1237 // the forwarder to generate a new request 1243 // the forwarder to generate a new request
1238 if (r->stdhdr) 1244 if (r->stdhdr)
1239 {
1240 //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1241 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); 1245 encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry);
1242 }
1243 } 1246 }
1244 } 1247 }
1245 else 1248 else
1246 NEXT (r->timeout); 1249 NEXT (r->timeout);
1247 } 1250 }
… …
1261 } 1264 }
1262 } 1265 }
1263 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding 1266 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1264 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1267 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1265 { 1268 {
1266 if (last_sent + send_interval <= NOW) 1269 if (last_sent + send_interval <= ev_now ())
1267 { 1270 {
1268 //printf ("sending data request etc.\n"); //D 1271 //printf ("sending data request etc.\n"); //D
1269 if (!snddq.empty () || last_received + 1. > NOW) 1272 if (!snddq.empty () || last_received + 1. > ev_now ())
1270 { 1273 {
1271 poll_interval = send_interval; 1274 poll_interval = send_interval;
1272 NEXT (NOW + send_interval); 1275 NEXT (ev_now () + send_interval);
1273 } 1276 }
1274 1277
1275 send = new dns_snd (this); 1278 send = new dns_snd (this);
1276 send->gen_stream_req (sndseq, snddq); 1279 send->gen_stream_req (sndseq, snddq);
1277 send->timeout = NOW + min_latency * conf.dns_timeout_factor; 1280 send->timeout = ev_now () + min_latency * conf.dns_timeout_factor;
1281 //printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D
1278 1282
1279 sndseq = (sndseq + 1) & SEQNO_MASK; 1283 sndseq = (sndseq + 1) & SEQNO_MASK;
1280 } 1284 }
1281 else 1285 else
1282 NEXT (last_sent + send_interval); 1286 NEXT (last_sent + send_interval);
… …
1286 vpn->dns_sndpq.push_back (send); 1290 vpn->dns_sndpq.push_back (send);
1287 } 1291 }
1288 1292
1289 if (send) 1293 if (send)
1290 { 1294 {
1291 last_sent = NOW; 1295 last_sent = ev_now ();
1292 sendto (vpn->dnsv4_fd, 1296 sendto (vpn->dnsv4_fd,
1293 send->pkt->at (0), send->pkt->len, 0, 1297 send->pkt->at (0), send->pkt->len, 0,
1294 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1298 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1295 } 1299 }
1296 1300
1297 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)", 1301 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1298 poll_interval, send_interval, next - NOW, 1302 poll_interval, send_interval, next - ev_now (),
1299 vpn->dns_sndpq.size (), snddq.size (), 1303 vpn->dns_sndpq.size (), snddq.size (),
1300 rcvpq.size ()); 1304 rcvpq.size ());
1301 1305
1302 // TODO: no idea when this happens, but when next < NOW, we have a problem 1306 // TODO: no idea when this happens, but when next < ev_now (), we have a problem
1303 // doesn't seem to happen anymore 1307 // doesn't seem to happen anymore
1304 if (next < NOW + 0.001) 1308 if (next < ev_now () + 0.001)
1305 next = NOW + 0.1; 1309 next = ev_now () + 0.1;
1306 1310
1307 w.start (next); 1311 w.start (next - ev_now ());
1308} 1312}
1309 1313
1310#endif 1314#endif
1311 1315

Diff Legend

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