Changeset 54

Timestamp:

Jan 28, 2006, 4:05:20 AM (16 years ago)

Author:

titer

Message:

Ignore requests for blocks we don't have, fixes the "readOrWrite ..." error

Location:

trunk/libtransmission

Files:

• inout.c (modified) (1 diff)
• peermessages.h (modified) (1 diff)

trunk/libtransmission/inout.c

@@ -391 +391 @@
     {
         /* Should not happen */
-        tr_err( "readOrWriteBytes: offset out of range" );
+        tr_err( "readOrWriteBytes: offset out of range (%lld, %d, %d)",
+                offset, size, write );
         goto fail;
     }

trunk/libtransmission/peermessages.h

@@ -60 +60 @@
         /* We need to load the block for the next request */
         r = &peer->outRequests[0];
+
+        /* Sanity check */
+        if( !tr_cpPieceIsComplete( tor->completion, r->index ) )
+        {
+            /* We have been asked for something we don't have, buggy client?
+               Let's just drop this request */
+            tr_inf( "Block %d/%d/%d was requested but we don't have it",
+                    r->index, r->begin, r->length );
+            (peer->outRequestCount)--;
+            memmove( &peer->outRequests[0], &peer->outRequests[1],
+                     peer->outRequestCount * sizeof( tr_request_t ) );
+            return NULL;
+        }
+        
         p = (uint8_t *) peer->outBlock;