mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) simpler implementation of the idea behind the code removed in r12108 and r12109.

This commit is contained in:
Jordan Lee 2011-03-07 04:48:46 +00:00
parent 6b4d500c36
commit d2270852af
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtransmission/peer-mgr.c
View File

@ -2626,6 +2626,17 @@ tr_peerGetPieceSpeed_Bps( const tr_peer * peer, uint64_t now, tr_direction direc
return peer->io ? tr_peerIoGetPieceSpeed_Bps( peer->io, now, direction ) : 0.0;
}
static tr_bool
peerIsSeed( const tr_peer * peer )
{
if( peer->progress >= 1.0 )
return TRUE;
if( peer->atom && ( peer->atom->uploadOnly == UPLOAD_ONLY_YES ) )
return TRUE;
return FALSE;
}
struct tr_peer_stat *
tr_peerMgrPeerStats( const tr_torrent * tor, int * setmeCount )
@ -2666,7 +2677,7 @@ tr_peerMgrPeerStats( const tr_torrent * tor, int * setmeCount )
stat->isIncoming = tr_peerIoIsIncoming( peer->io );
stat->isDownloadingFrom = clientIsDownloadingFrom( tor, peer );
stat->isUploadingTo = clientIsUploadingTo( peer );
stat->isSeed = ( atom->uploadOnly == UPLOAD_ONLY_YES ) || ( peer->progress >= 1.0 );
stat->isSeed = peerIsSeed( peer );
stat->blocksToPeer = tr_historyGet( &peer->blocksSentToPeer, now, CANCEL_HISTORY_SEC );
stat->blocksToClient = tr_historyGet( &peer->blocksSentToClient, now, CANCEL_HISTORY_SEC );
@ -3135,7 +3146,7 @@ shouldPeerBeClosed( const Torrent * t,
}
/* disconnect if we're both seeds and enough time has passed for PEX */
if( tr_torrentIsSeed( tor ) && ( peer->progress >= 1.0f ) )
if( tr_torrentIsSeed( tor ) && peerIsSeed( peer ) )
return !tr_torrentAllowsPex(tor) || (now-atom->time>=30);
/* disconnect if it's been too long since piece data has been transferred.