From 58ea9e4be84be03e6d31df2470b6e97f2628a1b2 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 7 Nov 2008 05:37:59 +0000 Subject: [PATCH] (libT) revise r7065 --- libtransmission/peer-mgr.c | 4 ++-- libtransmission/peer-msgs.c | 4 ++-- libtransmission/torrent.c | 5 +++-- libtransmission/torrent.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index dfff58279..6571207b4 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -1891,7 +1891,7 @@ rechoke( Torrent * t ) int i, peerCount, size, unchokedInterested; tr_peer ** peers = getConnectedPeers( t, &peerCount ); struct ChokeData * choke = tr_new0( struct ChokeData, peerCount ); - const int chokeAll = !tr_torrentPieceTransferIsAllowed( t->tor, TR_CLIENT_TO_PEER ); + const int chokeAll = !tr_torrentIsPieceTransferAllowed( t->tor, TR_CLIENT_TO_PEER ); assert( torrentIsLocked( t ) ); @@ -2519,7 +2519,7 @@ allocateBandwidth( tr_peerMgr * mgr, /* if piece data is disallowed, don't bother limiting bandwidth -- * we won't be asking for, or sending out, any pieces */ - if( !tr_torrentPieceTransferIsAllowed( t->tor, direction ) ) + if( !tr_torrentIsPieceTransferAllowed( t->tor, direction ) ) speedMode = TR_SPEEDLIMIT_UNLIMITED; else speedMode = tr_torrentGetSpeedMode( t->tor, direction ); diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c index ed55faa9d..fc783940b 100644 --- a/libtransmission/peer-msgs.c +++ b/libtransmission/peer-msgs.c @@ -542,7 +542,7 @@ isPeerInteresting( const tr_peermsgs * msgs ) if( clientIsSeed ) return FALSE; - if( !tr_torrentPieceTransferIsAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) ) + if( !tr_torrentIsPieceTransferAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) ) return FALSE; torrent = msgs->torrent; @@ -813,7 +813,7 @@ pumpRequestQueue( tr_peermsgs * msgs, const time_t now ) return; if( msgs->info->clientIsChoked ) return; - if( !tr_torrentPieceTransferIsAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) ) + if( !tr_torrentIsPieceTransferAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) ) return; while( ( count < max ) && reqListPop( &msgs->clientWillAskFor, &req ) ) diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index bf8f63225..bbb9abf72 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -195,7 +195,7 @@ tr_torrentGetSpeedLimit( const tr_torrent * tor, } int -tr_torrentPieceTransferIsAllowed( const tr_torrent * tor, +tr_torrentIsPieceTransferAllowed( const tr_torrent * tor, tr_direction direction ) { int isEnabled = FALSE; @@ -203,7 +203,8 @@ tr_torrentPieceTransferIsAllowed( const tr_torrent * tor, switch( tr_torrentGetSpeedMode( tor, direction ) ) { case TR_SPEEDLIMIT_GLOBAL: - isEnabled = tr_sessionGetSpeedLimit( tor->session, direction ) > 0; + isEnabled = !tr_sessionIsSpeedLimitEnabled( tor->session, direction ) + || tr_sessionGetSpeedLimit( tor->session, direction ) > 0; break; case TR_SPEEDLIMIT_SINGLE: diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index 678d1b126..c06d8264a 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -81,7 +81,7 @@ tr_torrent* tr_torrentFindFromObfuscatedHash( tr_session * session, int tr_torrentAllowsPex( const tr_torrent * ); -int tr_torrentPieceTransferIsAllowed( const tr_torrent * torrent, +int tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent, tr_direction direction ); /* get the index of this piece's first block */ -- 2.40.0