--- gvpe/src/vpn_dns.C 2005/04/26 00:55:56 1.39 +++ gvpe/src/vpn_dns.C 2007/12/06 00:35:29 1.46 @@ -44,6 +44,7 @@ #include +#include /* bug in libgmp: gmp.h relies on cstdio being included */ #include #include "netcompat.h" @@ -463,6 +464,8 @@ bool dns_cfg::valid () { + // although the protocol itself allows for some configurability, + // only the following encoding/decoding settings are implemented. return id1 == 'G' && id2 == 'V' && id3 == 'P' @@ -559,7 +562,7 @@ byte_stream rcvdq; int rcvseq; int repseq; byte_stream snddq; int sndseq; - void time_cb (time_watcher &w); time_watcher tw; + inline void time_cb (ev::timer &w, int revents); ev::timer tw; void receive_rep (dns_rcv *r); dns_connection (connection *c); @@ -588,7 +591,7 @@ timeout = 0; retry = 0; seqno = 0; - sent = NOW; + sent = ev_now (); stdhdr = false; pkt = new dns_packet; @@ -629,7 +632,7 @@ stdhdr = true; this->seqno = seqno; - timeout = NOW + INITIAL_TIMEOUT; + timeout = ev_now () + INITIAL_TIMEOUT; pkt->flags = htons (DEFAULT_CLIENT_FLAGS); pkt->qdcount = htons (1); @@ -674,7 +677,7 @@ void dns_snd::gen_syn_req () { - timeout = NOW + INITIAL_SYN_TIMEOUT; + timeout = ev_now () + INITIAL_SYN_TIMEOUT; pkt->flags = htons (DEFAULT_CLIENT_FLAGS); pkt->qdcount = htons (1); @@ -724,8 +727,9 @@ : c (c) , rcvdq (MAX_BACKLOG * 2) , snddq (MAX_BACKLOG) -, tw (this, &dns_connection::time_cb) { + tw.set (this); + vpn = c->vpn; established = false; @@ -750,8 +754,8 @@ { if (r->datalen) { - last_received = NOW; - tw.trigger (); + last_received = ev_now (); + tw (); poll_interval = send_interval; } @@ -771,6 +775,7 @@ for (vector::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) if (SEQNO_EQ (rcvseq, (*i)->seqno)) { + //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D // enter the packet into our input stream r = *i; @@ -778,6 +783,7 @@ for (vector::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) { + //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D delete *j; rcvpq.erase (j); break; @@ -1015,6 +1021,7 @@ connection *c = dns->c; int seqno = (*i)->seqno; u8 data[MAXSIZE], *datap = data; + //printf ("rcv pkt %x\n", seqno);//D if ((*i)->retry) { @@ -1029,7 +1036,7 @@ #endif // the latency surely puts an upper bound on // the minimum send interval - double latency = NOW - (*i)->sent; + double latency = ev_now () - (*i)->sent; if (latency < dns->min_latency) dns->min_latency = latency; @@ -1153,9 +1160,9 @@ } void -vpn::dnsv4_ev (io_watcher &w, short revents) +vpn::dnsv4_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { dns_packet *pkt = new dns_packet; struct sockaddr_in sa; @@ -1191,7 +1198,7 @@ c->dns = new dns_connection (c); if (c->dns->snddq.put (pkt)) - c->dns->tw.trigger (); + c->dns->tw (); // always return true even if the buffer overflows return true; @@ -1206,14 +1213,14 @@ #define NEXT(w) do { if (next > (w)) next = w; } while (0) void -dns_connection::time_cb (time_watcher &w) +dns_connection::time_cb (ev::timer &w, int revents) { // servers have to be polled if (THISNODE->dns_port) return; // check for timeouts and (re)transmit - tstamp next = NOW + poll_interval; + tstamp next = ev::now () + poll_interval; dns_snd *send = 0; for (vector::iterator i = vpn->dns_sndpq.begin (); @@ -1222,22 +1229,20 @@ { dns_snd *r = *i; - if (r->timeout <= NOW) + if (r->timeout <= ev_now ()) { if (!send) { send = r; r->retry++; - r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor); + r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor); + //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D // the following code changes the query section a bit, forcing // the forwarder to generate a new request if (r->stdhdr) - { - //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry); - //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); - } + encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); } } else @@ -1261,18 +1266,19 @@ else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) { - if (last_sent + send_interval <= NOW) + if (last_sent + send_interval <= ev_now ()) { //printf ("sending data request etc.\n"); //D - if (!snddq.empty () || last_received + 1. > NOW) + if (!snddq.empty () || last_received + 1. > ev_now ()) { poll_interval = send_interval; - NEXT (NOW + send_interval); + NEXT (ev_now () + send_interval); } send = new dns_snd (this); send->gen_stream_req (sndseq, snddq); - send->timeout = NOW + min_latency * conf.dns_timeout_factor; + send->timeout = ev_now () + min_latency * conf.dns_timeout_factor; + //printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D sndseq = (sndseq + 1) & SEQNO_MASK; } @@ -1286,23 +1292,23 @@ if (send) { - last_sent = NOW; + last_sent = ev_now (); sendto (vpn->dnsv4_fd, send->pkt->at (0), send->pkt->len, 0, vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); } slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)", - poll_interval, send_interval, next - NOW, + poll_interval, send_interval, next - ev_now (), vpn->dns_sndpq.size (), snddq.size (), rcvpq.size ()); - // TODO: no idea when this happens, but when next < NOW, we have a problem + // TODO: no idea when this happens, but when next < ev_now (), we have a problem // doesn't seem to happen anymore - if (next < NOW + 0.001) - next = NOW + 0.1; + if (next < ev_now () + 0.001) + next = ev_now () + 0.1; - w.start (next); + w.start (next - ev_now ()); } #endif