Changeset 7273

Timestamp:

Dec 5, 2008, 1:12:54 AM (14 years ago)

Author:

charles

Message:

(1.4x libT) #1562: 1.40 sends unnecessary `cancel' messages when choked

File:

• branches/1.4x/libtransmission/peer-msgs.c (modified) (3 diffs)

branches/1.4x/libtransmission/peer-msgs.c

@@ -922 +922 @@
 
 static void
-cancelAllRequestsToPeer( tr_peermsgs * msgs )
+cancelAllRequestsToPeer( tr_peermsgs * msgs, tr_bool sendCancel )
 {
     int                 i;
@@ -937 +937 @@
     for( i = 0; i < b.count; ++i ) {
         fireCancelledReq( msgs, &b.requests[i] );
-        protocolSendCancel( msgs, &b.requests[i] );
+        if( sendCancel )
+            protocolSendCancel( msgs, &b.requests[i] );
     }
 
@@ -1409 +1410 @@
             dbgmsg( msgs, "got Choke" );
             msgs->info->clientIsChoked = 1;
-            cancelAllRequestsToPeer( msgs );
-            cancelAllRequestsToClientExceptFast( msgs );
+            cancelAllRequestsToPeer( msgs, FALSE );
             break;