redundant hinting

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@533 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/BUGS b/BUGS
index 92c7fdf7bf8a4a1ce64567ca732dbc49bb0a4974..6815beeac853d05918bddaa997fdd7a8b334e5cd 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -22,3 +22,4 @@
     * RecoverProgress fails sometime
     * leecher can't see file is done already
     * why leecher waits 1sec?
+    * hint queue buildup

diff --git a/sendrecv.cpp b/sendrecv.cpp
index 07ee8e11f6e428679515bdda56d25c14eaba6254..7610ed8ab524db8fc347885b3eeb38da5c4791dc 100644 (file)
--- a/sendrecv.cpp
+++ b/sendrecv.cpp
@@ -143,11 +143,12 @@ void      Channel::AddHint (Datagram& dgram) {
         tintbin f = hint_out_.front();
         if (f.time<NOW-rtt_avg_*8) {
             hint_out_.pop_front();
+            dprintf("%s #%i !hint (%i,%lli)\n",
+                    tintstr(),id,(int)f.bin.layer(),f.bin.offset());
             transfer().picker().Expired(f.bin);
         } else {
             int status = file().ack_out().get(f.bin);
             if (status==bins::EMPTY) {
-                transfer().picker().Expired(f.bin);
                 break;
             } else if (status==bins::FILLED) {
                 hint_out_.pop_front();
@@ -156,7 +157,7 @@ void        Channel::AddHint (Datagram& dgram) {
                 hint_out_.front().bin = f.bin.right();
                 f.bin = f.bin.left();
                 hint_out_.push_front(f);
-            }
+            } // FIXME: simplify this mess
         }
     }
     /*while (!hint_out_.empty() &&