Changeset 3163

Timestamp:

Sep 25, 2007, 12:04:29 AM (15 years ago)

Author:

charles

Message:

• follow the BT spec more closely by disallowing peers to request blocks of more than 16KiB from us.
• don't register the choke and connection timers for torrents that aren't running. It doesn't hurt anything but does waste a few cycles.

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (5 diffs)
• peer-msgs.c (modified) (2 diffs)

trunk/libtransmission/peer-mgr.c

@@ -560 +560 @@
 
 static void
+restartReconnectTimer( Torrent * t )
+{
+    tr_timerFree( &t->reconnectTimer );
+    if( t->isRunning )
+        t->reconnectTimer = tr_timerNew( t->manager->handle, reconnectPulse, t, RECONNECT_PERIOD_MSEC );
+}
+
+static void
 reconnectNow( Torrent * t )
 {
     reconnectPulse( t );
-    tr_timerFree( &t->reconnectTimer );
-    t->reconnectTimer = tr_timerNew( t->manager->handle, reconnectPulse, t, RECONNECT_PERIOD_MSEC );
+    restartReconnectTimer( t );
 }
 
@@ -591 +598 @@
 
 static void
+restartChokeTimer( Torrent * t )
+{
+    tr_timerFree( &t->rechokeTimer );
+    if( t->isRunning )
+        t->rechokeTimer = tr_timerNew( t->manager->handle, rechokePulse, t, RECHOKE_PERIOD_MSEC );
+}
+
+static void
 rechokeNow( Torrent * t )
 {
     rechokePulse( t );
-    tr_timerFree( &t->rechokeTimer );
-    t->rechokeTimer = tr_timerNew( t->manager->handle, rechokePulse, t, RECHOKE_PERIOD_MSEC );
+    restartChokeTimer( t );
 }
 
@@ -877 +891 @@
     Torrent * t = getExistingTorrent( manager, torrentHash );
     t->isRunning = 1;
+    restartChokeTimer( t );
     reconnectNow( t );
 }
@@ -886 +901 @@
     Torrent * t = getExistingTorrent( manager, torrentHash );
     t->isRunning = 0;
-    reconnectNow( t );
+    tr_timerFree( &t->rechokeTimer );
+    tr_timerFree( &t->reconnectTimer );
+    reconnectPulse( t );
 }
 
@@ -903 +920 @@
     t->peers = tr_ptrArrayNew( );
     t->requested = tr_bitfieldNew( tor->blockCount );
-    t->rechokeTimer = tr_timerNew( manager->handle, rechokePulse, t, RECHOKE_PERIOD_MSEC );
-    t->reconnectTimer = tr_timerNew( manager->handle, reconnectPulse, t, RECONNECT_PERIOD_MSEC );
+    restartChokeTimer( t );
+    restartReconnectTimer( t );
 
     memcpy( t->hash, tor->info.hash, SHA_DIGEST_LENGTH );

trunk/libtransmission/peer-msgs.c

@@ -45 +45 @@
 enum
 {
-    BT_CHOKE           = 0,
-    BT_UNCHOKE         = 1,
-    BT_INTERESTED      = 2,
-    BT_NOT_INTERESTED  = 3,
-    BT_HAVE            = 4,
-    BT_BITFIELD        = 5,
-    BT_REQUEST         = 6,
-    BT_PIECE           = 7,
-    BT_CANCEL          = 8,
-    BT_PORT            = 9,
-    BT_SUGGEST         = 13,
-    BT_HAVE_ALL        = 14,
-    BT_HAVE_NONE       = 15,
-    BT_REJECT          = 16,
-    BT_ALLOWED_FAST    = 17,
-    BT_LTEP            = 20,
-
-    LTEP_HANDSHAKE     = 0,
-
-    OUR_LTEP_PEX       = 1
+    BT_CHOKE                  = 0,
+    BT_UNCHOKE                = 1,
+    BT_INTERESTED             = 2,
+    BT_NOT_INTERESTED         = 3,
+    BT_HAVE                   = 4,
+    BT_BITFIELD               = 5,
+    BT_REQUEST                = 6,
+    BT_PIECE                  = 7,
+    BT_CANCEL                 = 8,
+    BT_PORT                   = 9,
+    BT_SUGGEST                = 13,
+    BT_HAVE_ALL               = 14,
+    BT_HAVE_NONE              = 15,
+    BT_REJECT                 = 16,
+    BT_ALLOWED_FAST           = 17,
+    BT_LTEP                   = 20,
+
+    LTEP_HANDSHAKE            = 0,
+
+    OUR_LTEP_PEX              = 1,
+
+    /* disregard requests that want more than this many bytes.
+       it's common practice in for BT clients to use a 16K threshold */
+    MAX_REQUEST_BYTE_COUNT    = (16 * 1024)
 };
 
@@ -612 +616 @@
     const tr_torrent * tor = msgs->torrent;
     assert( req != NULL );
-    assert( req->index < (uint32_t)tor->info.pieceCount );
-    assert( (int)req->offset < tr_torPieceCountBytes( tor, (int)req->index ) );
-    assert( tr_pieceOffset( tor, req->index, req->offset, req->length ) <= tor->info.totalSize );
+
+    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;
 }