Changeset 1666

Timestamp:

Apr 5, 2007, 4:23:00 PM (16 years ago)

Author:

titer

Message:

Don't assume that peers send us blocks in the same order we sent the requests (another cause of overdownloading)

File:

• trunk/libtransmission/peerparse.h (modified) (3 diffs)

trunk/libtransmission/peerparse.h

@@ -254 +254 @@
 }
 
-static inline void updateRequests( tr_torrent_t * tor, tr_peer_t * peer,
-                                   int index, int begin )
+static inline void updateRequests( tr_peer_t * peer, int index, int begin )
 {
     tr_request_t * r;
-    int i, j;
+    int i;
 
     /* Find this block in the requests list */
@@ -270 +269 @@
     }
 
-    /* Usually i should be 0, but some clients don't handle multiple
-       request well and drop previous requests */
+    /* Usually 'i' would be 0, but some clients don't handle multiple
+       requests and drop previous requests, some other clients don't
+       send blocks in the same order we sent the requests */
     if( i < peer->inRequestCount )
     {
-        if( i > 0 )
-        {
-            peer_dbg( "not expecting this block yet (%d requests dropped)", i );
-        }
-        i++;
-        for( j = 0; j < i; j++ )
-        {
-            r = &peer->inRequests[j];
-            tr_cpDownloaderRem( tor->completion,
-                                tr_block( r->index, r->begin ) );
-        }
-        peer->inRequestCount -= i;
-        memmove( &peer->inRequests[0], &peer->inRequests[i],
-                 peer->inRequestCount * sizeof( tr_request_t ) );
+        peer->inRequestCount--;
+        memmove( &peer->inRequests[i], &peer->inRequests[i+1],
+                 ( peer->inRequestCount - i ) * sizeof( tr_request_t ) );
     }
     else
@@ -328 +317 @@
               index, begin, len - 8 );
 
-    updateRequests( tor, peer, index, begin );
+    updateRequests( peer, index, begin );
     tor->downloadedCur += len - 8;