Changeset 3169

Timestamp:

Sep 25, 2007, 10:30:41 PM (15 years ago)

Author:

charles

Message:

fix peer-msgs.c assertion failure. (tbo)

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• bsdqueue.h (deleted)
• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (6 diffs)

trunk/libtransmission/Makefile.am

@@ -45 +45 @@
 noinst_HEADERS = \
     bencode.h \
-    bsdqueue.h \
     bsdtree.h \
     clients.h \

trunk/libtransmission/peer-mgr.c

@@ -1237 +1237 @@
         }
     }
- 
+
+#if 0 
     /* maybe connect to some new peers */ 
     if( t->isRunning && (liveCount<MAX_CONNECTED_PEERS_PER_TORRENT) )
@@ -1282 +1283 @@
         tr_free( pool );
     }
+#endif
 
     return TRUE;

trunk/libtransmission/peer-msgs.c

@@ -381 +381 @@
 pulse( void * vmsgs );
 
+static int
+reqIsValid( const tr_peermsgs * msgs, uint32_t index, uint32_t offset, uint32_t length )
+{
+    const tr_torrent * tor = msgs->torrent;
+
+    if( index >= (uint32_t) tor->info.pieceCount )
+        return FALSE;
+    if ( (int)offset >= tr_torPieceCountBytes( tor, (int)index ) )
+        return FALSE;
+    if( length > MAX_REQUEST_BYTE_COUNT )
+        return FALSE;
+    if( tr_pieceOffset( tor, index, offset, length ) > tor->info.totalSize )
+        return FALSE;
+
+    return TRUE;
+}
+
+static int
+requestIsValid( const tr_peermsgs * msgs, struct peer_request * req )
+{
+    return reqIsValid( msgs, req->index, req->offset, req->length );
+}
+
 int
 tr_peerMsgsAddRequest( tr_peermsgs * msgs,
@@ -394 +417 @@
     assert( msgs != NULL );
     assert( msgs->torrent != NULL );
-    assert( index < ((uint32_t)msgs->torrent->info.pieceCount) );
-    assert( offset < (uint32_t)tr_torPieceCountBytes( msgs->torrent, (int)index ) );
-    assert( (offset + length) <= (uint32_t)tr_torPieceCountBytes( msgs->torrent, (int)index ) );
+    assert( reqIsValid( msgs, index, offset, length ) );
 
     if( msgs->info->clientIsChoked )
@@ -608 +629 @@
         msgs->state = AWAITING_BT_MESSAGE;
     } return READ_AGAIN;
-}
-
-static int
-requestIsValid( const tr_peermsgs * msgs, struct peer_request * req )
-{
-    const tr_torrent * tor = msgs->torrent;
-    assert( req != NULL );
-
-    if( req->index >= (uint32_t) tor->info.pieceCount )
-        return FALSE;
-    if ( (int)req->offset >= tr_torPieceCountBytes( tor, (int)req->index ) )
-        return FALSE;
-    if( req->length > MAX_REQUEST_BYTE_COUNT )
-        return FALSE;
-    if( tr_pieceOffset( tor, req->index, req->offset, req->length ) > tor->info.totalSize )
-        return FALSE;
-
-    return TRUE;
 }
 
@@ -727 +730 @@
             dbgmsg( msgs, "peer sent us a BT_PIECE" );
             assert( msgs->blockToUs.length == 0 );
-            msgs->state = READING_BT_PIECE;
             tr_peerIoReadUint32( msgs->io, inbuf, &msgs->blockToUs.index );
             tr_peerIoReadUint32( msgs->io, inbuf, &msgs->blockToUs.offset );
             msgs->blockToUs.length = msglen - 8;
-            assert( msgs->blockToUs.length > 0 );
             assert( EVBUFFER_LENGTH(msgs->inBlock) == 0 );
             //evbuffer_drain( msgs->inBlock, ~0 );
+            msgs->state = msgs->blockToUs.length ? READING_BT_PIECE : AWAITING_BT_LENGTH;
             return READ_AGAIN;
             break;
@@ -1011 +1013 @@
 {
     /* don't let our outbuffer get too large */
-    if( tr_peerIoWriteBytesWaiting( msgs->io ) > 1024 )
+    if( tr_peerIoWriteBytesWaiting( msgs->io ) > 2048 )
         return FALSE;
 
@@ -1056 +1058 @@
         while ( len && canUpload( msgs ) )
         {
-            const size_t outlen = MIN( len, 1024 );
+            const size_t outlen = MIN( len, 2048 );
             tr_peerIoWrite( msgs->io, EVBUFFER_DATA(msgs->outBlock), outlen );
             evbuffer_drain( msgs->outBlock, outlen );