Changeset 7284

Timestamp:

Dec 5, 2008, 4:04:07 PM (14 years ago)

Author:

charles

Message:

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

File:

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

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

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