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.39 by pcg, Tue Apr 26 00:55:56 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"
… …
461 r4 = r5 = r6 = r7 = 0; 462 r4 = r5 = r6 = r7 = 0;
462} 463}
463 464
464bool dns_cfg::valid () 465bool dns_cfg::valid ()
465{ 466{
467 // although the protocol itself allows for some configurability,
468 // only the following encoding/decoding settings are implemented.
466 return id1 == 'G' 469 return id1 == 'G'
467 && id2 == 'V' 470 && id2 == 'V'
468 && id3 == 'P' 471 && id3 == 'P'
469 && id4 == 'E' 472 && id4 == 'E'
470 && seq_cdc == 26 473 && seq_cdc == 26
… …
557 vector<dns_rcv *> rcvpq; 560 vector<dns_rcv *> rcvpq;
558 561
559 byte_stream rcvdq; int rcvseq; int repseq; 562 byte_stream rcvdq; int rcvseq; int repseq;
560 byte_stream snddq; int sndseq; 563 byte_stream snddq; int sndseq;
561 564
562 void time_cb (time_watcher &w); time_watcher tw; 565 inline void time_cb (ev::timer &w, int revents); ev::timer tw;
563 void receive_rep (dns_rcv *r); 566 void receive_rep (dns_rcv *r);
564 567
565 dns_connection (connection *c); 568 dns_connection (connection *c);
566 ~dns_connection (); 569 ~dns_connection ();
567}; 570};
… …
586: dns (dns) 589: dns (dns)
587{ 590{
588 timeout = 0; 591 timeout = 0;
589 retry = 0; 592 retry = 0;
590 seqno = 0; 593 seqno = 0;
591 sent = NOW; 594 sent = ev_now ();
592 stdhdr = false; 595 stdhdr = false;
593 596
594 pkt = new dns_packet; 597 pkt = new dns_packet;
595 598
596 pkt->id = next_id (); 599 pkt->id = next_id ();
… …
627void dns_snd::gen_stream_req (int seqno, byte_stream &stream) 630void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
628{ 631{
629 stdhdr = true; 632 stdhdr = true;
630 this->seqno = seqno; 633 this->seqno = seqno;
631 634
632 timeout = NOW + INITIAL_TIMEOUT; 635 timeout = ev_now () + INITIAL_TIMEOUT;
633 636
634 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 637 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
635 pkt->qdcount = htons (1); 638 pkt->qdcount = htons (1);
636 639
637 int offs = 6*2; 640 int offs = 6*2;
… …
672 pkt->len = offs; 675 pkt->len = offs;
673} 676}
674 677
675void dns_snd::gen_syn_req () 678void dns_snd::gen_syn_req ()
676{ 679{
677 timeout = NOW + INITIAL_SYN_TIMEOUT; 680 timeout = ev_now () + INITIAL_SYN_TIMEOUT;
678 681
679 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 682 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
680 pkt->qdcount = htons (1); 683 pkt->qdcount = htons (1);
681 684
682 int offs = 6 * 2; 685 int offs = 6 * 2;
… …
722 725
723dns_connection::dns_connection (connection *c) 726dns_connection::dns_connection (connection *c)
724: c (c) 727: c (c)
725, rcvdq (MAX_BACKLOG * 2) 728, rcvdq (MAX_BACKLOG * 2)
726, snddq (MAX_BACKLOG) 729, snddq (MAX_BACKLOG)
727, tw (this, &dns_connection::time_cb)
728{ 730{
731 tw.set<dns_connection, &dns_connection::time_cb> (this);
732
729 vpn = c->vpn; 733 vpn = c->vpn;
730 734
731 established = false; 735 established = false;
732 736
733 rcvseq = repseq = sndseq = 0; 737 rcvseq = repseq = sndseq = 0;
… …
748 752
749void dns_connection::receive_rep (dns_rcv *r) 753void dns_connection::receive_rep (dns_rcv *r)
750{ 754{
751 if (r->datalen) 755 if (r->datalen)
752 { 756 {
753 last_received = NOW; 757 last_received = ev_now ();
754 tw.trigger (); 758 tw ();
755 759
756 poll_interval = send_interval; 760 poll_interval = send_interval;
757 } 761 }
758 else 762 else
759 { 763 {
… …
769 773
770 // find next packet 774 // find next packet
771 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) 775 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
772 if (SEQNO_EQ (rcvseq, (*i)->seqno)) 776 if (SEQNO_EQ (rcvseq, (*i)->seqno))
773 { 777 {
778 //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
774 // enter the packet into our input stream 779 // enter the packet into our input stream
775 r = *i; 780 r = *i;
776 781
777 // remove the oldest packet, look forward, as it's oldest first 782 // remove the oldest packet, look forward, as it's oldest first
778 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)
779 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) 784 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
780 { 785 {
786 //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
781 delete *j; 787 delete *j;
782 rcvpq.erase (j); 788 rcvpq.erase (j);
783 break; 789 break;
784 } 790 }
785 791
… …
1013 { 1019 {
1014 dns_connection *dns = (*i)->dns; 1020 dns_connection *dns = (*i)->dns;
1015 connection *c = dns->c; 1021 connection *c = dns->c;
1016 int seqno = (*i)->seqno; 1022 int seqno = (*i)->seqno;
1017 u8 data[MAXSIZE], *datap = data; 1023 u8 data[MAXSIZE], *datap = data;
1024 //printf ("rcv pkt %x\n", seqno);//D
1018 1025
1019 if ((*i)->retry) 1026 if ((*i)->retry)
1020 { 1027 {
1021 dns->send_interval *= 1.01; 1028 dns->send_interval *= 1.01;
1022 if (dns->send_interval > MAX_SEND_INTERVAL) 1029 if (dns->send_interval > MAX_SEND_INTERVAL)
… …
1027#if 0 1034#if 0
1028 dns->send_interval *= 0.999; 1035 dns->send_interval *= 0.999;
1029#endif 1036#endif
1030 // the latency surely puts an upper bound on 1037 // the latency surely puts an upper bound on
1031 // the minimum send interval 1038 // the minimum send interval
1032 double latency = NOW - (*i)->sent; 1039 double latency = ev_now () - (*i)->sent;
1033 1040
1034 if (latency < dns->min_latency) 1041 if (latency < dns->min_latency)
1035 dns->min_latency = latency; 1042 dns->min_latency = latency;
1036 1043
1037 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor) 1044 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
… …
1151 break; 1158 break;
1152 } 1159 }
1153} 1160}
1154 1161
1155void 1162void
1156vpn::dnsv4_ev (io_watcher &w, short revents) 1163vpn::dnsv4_ev (ev::io &w, int revents)
1157{ 1164{
1158 if (revents & EVENT_READ) 1165 if (revents & EV_READ)
1159 { 1166 {
1160 dns_packet *pkt = new dns_packet; 1167 dns_packet *pkt = new dns_packet;
1161 struct sockaddr_in sa; 1168 struct sockaddr_in sa;
1162 socklen_t sa_len = sizeof (sa); 1169 socklen_t sa_len = sizeof (sa);
1163 1170
… …
1189 1196
1190 if (!c->dns) 1197 if (!c->dns)
1191 c->dns = new dns_connection (c); 1198 c->dns = new dns_connection (c);
1192 1199
1193 if (c->dns->snddq.put (pkt)) 1200 if (c->dns->snddq.put (pkt))
1194 c->dns->tw.trigger (); 1201 c->dns->tw ();
1195 1202
1196 // always return true even if the buffer overflows 1203 // always return true even if the buffer overflows
1197 return true; 1204 return true;
1198} 1205}
1199 1206
… …
1204} 1211}
1205 1212
1206#define NEXT(w) do { if (next > (w)) next = w; } while (0) 1213#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1207 1214
1208void 1215void
1209dns_connection::time_cb (time_watcher &w) 1216dns_connection::time_cb (ev::timer &w, int revents)
1210{ 1217{
1211 // servers have to be polled 1218 // servers have to be polled
1212 if (THISNODE->dns_port) 1219 if (THISNODE->dns_port)
1213 return; 1220 return;
1214 1221
1215 // check for timeouts and (re)transmit 1222 // check for timeouts and (re)transmit
1216 tstamp next = NOW + poll_interval; 1223 tstamp next = ev::now () + poll_interval;
1217 dns_snd *send = 0; 1224 dns_snd *send = 0;
1218 1225
1219 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); 1226 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1220 i != vpn->dns_sndpq.end (); 1227 i != vpn->dns_sndpq.end ();
1221 ++i) 1228 ++i)
1222 { 1229 {
1223 dns_snd *r = *i; 1230 dns_snd *r = *i;
1224 1231
1225 if (r->timeout <= NOW) 1232 if (r->timeout <= ev_now ())
1226 { 1233 {
1227 if (!send) 1234 if (!send)
1228 { 1235 {
1229 send = r; 1236 send = r;
1230 1237
1231 r->retry++; 1238 r->retry++;
1232 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
1233 1241
1234 // the following code changes the query section a bit, forcing 1242 // the following code changes the query section a bit, forcing
1235 // the forwarder to generate a new request 1243 // the forwarder to generate a new request
1236 if (r->stdhdr) 1244 if (r->stdhdr)
1237 {
1238 //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1239 //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);
1240 }
1241 } 1246 }
1242 } 1247 }
1243 else 1248 else
1244 NEXT (r->timeout); 1249 NEXT (r->timeout);
1245 } 1250 }
… …
1259 } 1264 }
1260 } 1265 }
1261 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding 1266 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1262 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1267 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1263 { 1268 {
1264 if (last_sent + send_interval <= NOW) 1269 if (last_sent + send_interval <= ev_now ())
1265 { 1270 {
1266 //printf ("sending data request etc.\n"); //D 1271 //printf ("sending data request etc.\n"); //D
1267 if (!snddq.empty () || last_received + 1. > NOW) 1272 if (!snddq.empty () || last_received + 1. > ev_now ())
1268 { 1273 {
1269 poll_interval = send_interval; 1274 poll_interval = send_interval;
1270 NEXT (NOW + send_interval); 1275 NEXT (ev_now () + send_interval);
1271 } 1276 }
1272 1277
1273 send = new dns_snd (this); 1278 send = new dns_snd (this);
1274 send->gen_stream_req (sndseq, snddq); 1279 send->gen_stream_req (sndseq, snddq);
1275 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
1276 1282
1277 sndseq = (sndseq + 1) & SEQNO_MASK; 1283 sndseq = (sndseq + 1) & SEQNO_MASK;
1278 } 1284 }
1279 else 1285 else
1280 NEXT (last_sent + send_interval); 1286 NEXT (last_sent + send_interval);
… …
1284 vpn->dns_sndpq.push_back (send); 1290 vpn->dns_sndpq.push_back (send);
1285 } 1291 }
1286 1292
1287 if (send) 1293 if (send)
1288 { 1294 {
1289 last_sent = NOW; 1295 last_sent = ev_now ();
1290 sendto (vpn->dnsv4_fd, 1296 sendto (vpn->dnsv4_fd,
1291 send->pkt->at (0), send->pkt->len, 0, 1297 send->pkt->at (0), send->pkt->len, 0,
1292 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1298 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1293 } 1299 }
1294 1300
1295 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)",
1296 poll_interval, send_interval, next - NOW, 1302 poll_interval, send_interval, next - ev_now (),
1297 vpn->dns_sndpq.size (), snddq.size (), 1303 vpn->dns_sndpq.size (), snddq.size (),
1298 rcvpq.size ()); 1304 rcvpq.size ());
1299 1305
1300 // 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
1301 // doesn't seem to happen anymore 1307 // doesn't seem to happen anymore
1302 if (next < NOW + 0.001) 1308 if (next < ev_now () + 0.001)
1303 next = NOW + 0.1; 1309 next = ev_now () + 0.1;
1304 1310
1305 w.start (next); 1311 w.start (next - ev_now ());
1306} 1312}
1307 1313
1308#endif 1314#endif
1309 1315

Diff Legend

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