--- gvpe/src/vpn_dns.C	2005/03/15 18:15:39	1.32
+++ gvpe/src/vpn_dns.C	2005/03/23 17:03:58	1.37
@@ -49,22 +49,17 @@
 #define MAX_POLL_INTERVAL 5.  // how often to poll minimally when the server has no data
 #define ACTIVITY_INTERVAL 5.
 
-#define TIMEOUT_FACTOR 4.
-
 #define INITIAL_TIMEOUT     0.1 // retry timeouts
-#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn
+#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
 
-#define MIN_SEND_INTERVAL 0.001 // wait at least this time between sending requests
 #define MAX_SEND_INTERVAL 2. // optimistic?
 
-#define LATENCY_FACTOR   0.5 // RTT * LATENCY_FACTOR == sending rate
-#define MAX_OUTSTANDING  100 // max. outstanding requests
 #define MAX_WINDOW      1000 // max. for MAX_OUTSTANDING, and backlog
-#define MAX_BACKLOG     (32*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
+#define MAX_BACKLOG     (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
 
 #define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well
 // 240 leaves about 4 bytes of server reply data
-// every two request bytes less give room for one reply byte
+// every request byte less give room for two reply bytes
 
 #define SEQNO_MASK 0x3fff
 #define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
@@ -795,7 +790,7 @@
         while (vpn_packet *pkt = rcvdq.get ())
           {
             sockinfo si;
-            si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;
+            si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
 
             vpn->recv_vpn_packet (pkt, si);
 
@@ -1035,11 +1030,11 @@
             if (latency < dns->min_latency)
               dns->min_latency = latency;
 
-            if (dns->send_interval > dns->min_latency * LATENCY_FACTOR)
-              dns->send_interval = dns->min_latency * LATENCY_FACTOR;
+            if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
+              dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
 
-            if (dns->send_interval < MIN_SEND_INTERVAL)
-              dns->send_interval = MIN_SEND_INTERVAL;
+            if (dns->send_interval < conf.dns_send_interval)
+              dns->send_interval = conf.dns_send_interval;
           }
 
         delete *i;
@@ -1182,7 +1177,7 @@
 bool
 vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
-  int client = ntohs (si.port);
+  int client = ntohl (si.host);
 
   assert (0 < client && client <= conns.size ());
 
@@ -1230,7 +1225,7 @@
               send = r;
 
               r->retry++;
-              r->timeout = NOW + (r->retry * min_latency * TIMEOUT_FACTOR);
+              r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor);
 
               // the following code changes the query section a bit, forcing
               // the forwarder to generate a new request
@@ -1259,7 +1254,7 @@
               send->gen_syn_req ();
             }
         }
-      else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
+      else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
                && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
         {
           if (last_sent + send_interval <= NOW)
@@ -1273,7 +1268,7 @@
 
               send = new dns_snd (this);
               send->gen_stream_req (sndseq, snddq);
-              send->timeout = NOW + min_latency * TIMEOUT_FACTOR;
+              send->timeout = NOW + min_latency * conf.dns_timeout_factor;
 
               sndseq = (sndseq + 1) & SEQNO_MASK;
             }
@@ -1288,7 +1283,6 @@
   if (send)
     {
       last_sent = NOW;
-      if (rand () & 15 != 0)//D
       sendto (vpn->dnsv4_fd,
               send->pkt->at (0), send->pkt->len, 0,
               vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
@@ -1300,6 +1294,7 @@
         rcvpq.size ());
 
   // TODO: no idea when this happens, but when next < NOW, we have a problem
+  // doesn't seem to happen anymore
   if (next < NOW + 0.001)
     next = NOW + 0.1;