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

(trunk libT) #3372 "What happened with closing idle peers?" -- fixed.

This commit is contained in:
Jordan Lee 2011-02-19 12:32:41 +00:00
parent 7a8ab0ddbe
commit 05ff024dd8
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libtransmission/peer-mgr.c
View File

@ -3086,15 +3086,7 @@ rechokePulse( int foo UNUSED, short bar UNUSED, void * vmgr )
**** ****
***/ ***/
typedef enum static tr_bool
{
TR_CAN_KEEP,
TR_CAN_CLOSE,
TR_MUST_CLOSE,
}
tr_close_type_t;
static tr_close_type_t
shouldPeerBeClosed( const Torrent * t, shouldPeerBeClosed( const Torrent * t,
const tr_peer * peer, const tr_peer * peer,
int peerCount, int peerCount,
@ -3108,7 +3100,7 @@ shouldPeerBeClosed( const Torrent * t,
{ {
tordbg( t, "purging peer %s because its doPurge flag is set", tordbg( t, "purging peer %s because its doPurge flag is set",
tr_atomAddrStr( atom ) ); tr_atomAddrStr( atom ) );
return TR_MUST_CLOSE; return TRUE;
} }
/* if we're seeding and the peer has everything we have, /* if we're seeding and the peer has everything we have,
@ -3133,7 +3125,7 @@ shouldPeerBeClosed( const Torrent * t,
{ {
tordbg( t, "purging peer %s because we're both seeds", tordbg( t, "purging peer %s because we're both seeds",
tr_atomAddrStr( atom ) ); tr_atomAddrStr( atom ) );
return TR_MUST_CLOSE; return TRUE;
} }
} }
@ -3154,17 +3146,15 @@ shouldPeerBeClosed( const Torrent * t,
if( idleTime > limit ) { if( idleTime > limit ) {
tordbg( t, "purging peer %s because it's been %d secs since we shared anything", tordbg( t, "purging peer %s because it's been %d secs since we shared anything",
tr_atomAddrStr( atom ), idleTime ); tr_atomAddrStr( atom ), idleTime );
return TR_CAN_CLOSE; return TRUE;
} }
} }
return TR_CAN_KEEP; return FALSE;
} }
static tr_peer ** static tr_peer **
getPeersToClose( Torrent * t, tr_close_type_t closeType, getPeersToClose( Torrent * t, const time_t now_sec, int * setmeSize )
const time_t now_sec,
int * setmeSize )
{ {
int i, peerCount, outsize; int i, peerCount, outsize;
tr_peer ** peers = (tr_peer**) tr_ptrArrayPeek( &t->peers, &peerCount ); tr_peer ** peers = (tr_peer**) tr_ptrArrayPeek( &t->peers, &peerCount );
@ -3173,7 +3163,7 @@ getPeersToClose( Torrent * t, tr_close_type_t closeType,
assert( torrentIsLocked( t ) ); assert( torrentIsLocked( t ) );
for( i = outsize = 0; i < peerCount; ++i ) for( i = outsize = 0; i < peerCount; ++i )
if( shouldPeerBeClosed( t, peers[i], peerCount, now_sec ) == closeType ) if( shouldPeerBeClosed( t, peers[i], peerCount, now_sec ) )
ret[outsize++] = peers[i]; ret[outsize++] = peers[i];
*setmeSize = outsize; *setmeSize = outsize;
@ -3271,11 +3261,11 @@ static void
closeBadPeers( Torrent * t, const time_t now_sec ) closeBadPeers( Torrent * t, const time_t now_sec )
{ {
int i; int i;
int mustCloseCount; int peerCount;
struct tr_peer ** mustClose = getPeersToClose( t, TR_MUST_CLOSE, now_sec, &mustCloseCount ); struct tr_peer ** peers = getPeersToClose( t, now_sec, &peerCount );
for( i=0; i<mustCloseCount; ++i ) for( i=0; i<peerCount; ++i )
closePeer( t, mustClose[i] ); closePeer( t, peers[i] );
tr_free( mustClose ); tr_free( peers );
} }
struct peer_liveliness struct peer_liveliness