--- gvpe/src/vpn_dns.C	2005/04/19 04:23:38	1.38
+++ gvpe/src/vpn_dns.C	2006/11/22 21:26:41	1.41
@@ -16,7 +16,7 @@
  
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // TODO: EDNS0 option to increase dns mtu?
@@ -463,6 +463,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'
@@ -771,6 +773,7 @@
   for (vector<dns_rcv *>::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 +781,7 @@
         for (vector<dns_rcv *>::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 +1019,7 @@
         connection *c = dns->c;
         int seqno = (*i)->seqno;
         u8 data[MAXSIZE], *datap = data;
+        //printf ("rcv pkt %x\n", seqno);//D
 
         if ((*i)->retry)
           {
@@ -1230,14 +1235,12 @@
 
               r->retry++;
               r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor);
+              //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - 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
@@ -1273,6 +1276,7 @@
               send = new dns_snd (this);
               send->gen_stream_req (sndseq, snddq);
               send->timeout = NOW + min_latency * conf.dns_timeout_factor;
+              //printf ("SEND %x (%f)\n", send->seqno, send->timeout - NOW, min_latency, conf.dns_timeout_factor);//D
 
               sndseq = (sndseq + 1) & SEQNO_MASK;
             }