Changeset 1320 for trunk/libtransmission/peer.c

Timestamp:

Jan 8, 2007, 9:53:55 PM (16 years ago)

Author:

livings124

Message:

global bandwidth limits only apply to transfers that are not set to overide them

File:

• trunk/libtransmission/peer.c (modified) (4 diffs)

trunk/libtransmission/peer.c

@@ -267 +267 @@
     for( ;; )
     {
-        if( tor && (!tr_rcCanTransfer( tor->globalDownload )
-                    || !tr_rcCanTransfer( tor->download ) ) )
+        if( tor && ( ( !tor->customSpeedLimit && !tr_rcCanGlobalTransfer( tor->handle, 0 ) )
+            || ( tor->customSpeedLimit && !tr_rcCanTransfer( tor->download ) ) ) )
         {
             break;
@@ -302 +302 @@
             tr_rcTransferred( peer->download, ret );
             tr_rcTransferred( tor->download, ret );
-            tr_rcTransferred( tor->globalDownload, ret );
             if( parseBuf( tor, peer ) )
             {
@@ -438 +437 @@
         while( ( p = blockPending( tor, peer, &size ) ) )
         {
-            if( !tr_rcCanTransfer( tor->globalUpload )
-                || !tr_rcCanTransfer( tor->upload ) )
+            if( ( !tor->customSpeedLimit && !tr_rcCanGlobalTransfer( tor->handle, 1 ) )
+                    || ( tor->customSpeedLimit && !tr_rcCanTransfer( tor->upload ) ) )
             {
                 break;
@@ -457 +456 @@
             tr_rcTransferred( peer->upload, ret );
             tr_rcTransferred( tor->upload, ret );
-            tr_rcTransferred( tor->globalUpload, ret );
 
             tor->uploadedCur += ret;