mirror of
https://github.com/transmission/transmission
synced 2024-12-24 08:43:27 +00:00
minor source code cleanup...
This commit is contained in:
Charles Kerr
parent
3d2e3cfdfb
commit
a3d1a254d1
3 changed files with 74 additions and 102 deletions
|
|
@ -45,7 +45,7 @@ enum
|
|||
RECONNECT_PERIOD_MSEC = (5 * 1000),
|
||||
|
||||
/* how frequently to refill peers' request lists */
|
||||
REFILL_PERIOD_MSEC = 1000,
|
||||
REFILL_PERIOD_MSEC = 2000,
|
||||
|
||||
/* how many peers to unchoke per-torrent. */
|
||||
/* FIXME: make this user-configurable? */
|
||||
|
|
@ -232,8 +232,8 @@ torrentCompare( const void * va, const void * vb )
|
|||
static int
|
||||
torrentCompareToHash( const void * va, const void * vb )
|
||||
{
|
||||
const Torrent * a = (const Torrent*) va;
|
||||
const uint8_t * b_hash = (const uint8_t*) vb;
|
||||
const Torrent * a = va;
|
||||
const uint8_t * b_hash = vb;
|
||||
return memcmp( a->hash, b_hash, SHA_DIGEST_LENGTH );
|
||||
}
|
||||
|
||||
|
|
@ -248,15 +248,15 @@ getExistingTorrent( tr_peerMgr * manager, const uint8_t * hash )
|
|||
static int
|
||||
peerCompare( const void * va, const void * vb )
|
||||
{
|
||||
const tr_peer * a = (const tr_peer *) va;
|
||||
const tr_peer * b = (const tr_peer *) vb;
|
||||
const tr_peer * a = va;
|
||||
const tr_peer * b = vb;
|
||||
return compareAddresses( &a->in_addr, &b->in_addr );
|
||||
}
|
||||
|
||||
static int
|
||||
peerCompareToAddr( const void * va, const void * vb )
|
||||
{
|
||||
const tr_peer * a = (const tr_peer *) va;
|
||||
const tr_peer * a = va;
|
||||
return compareAddresses( &a->in_addr, vb );
|
||||
}
|
||||
|
||||
|
|
@ -291,9 +291,20 @@ peerIsInUse( const Torrent * ct, const struct in_addr * addr )
|
|||
|
||||
assert( torrentIsLocked ( t ) );
|
||||
|
||||
return ( getExistingPeer( t, addr ) != NULL )
|
||||
|| ( getExistingHandshake( t->outgoingHandshakes, addr ) != NULL )
|
||||
|| ( getExistingHandshake( t->manager->incomingHandshakes, addr ) != NULL );
|
||||
return getExistingPeer( t, addr )
|
||||
|| getExistingHandshake( t->outgoingHandshakes, addr )
|
||||
|| getExistingHandshake( t->manager->incomingHandshakes, addr );
|
||||
}
|
||||
|
||||
static tr_peer*
|
||||
peerConstructor( const struct in_addr * in_addr )
|
||||
{
|
||||
tr_peer * p;
|
||||
p = tr_new0( tr_peer, 1 );
|
||||
p->rateToClient = tr_rcInit( );
|
||||
p->rateToPeer = tr_rcInit( );
|
||||
memcpy( &p->in_addr, in_addr, sizeof(struct in_addr) );
|
||||
return p;
|
||||
}
|
||||
|
||||
static tr_peer*
|
||||
|
|
@ -305,12 +316,8 @@ getPeer( Torrent * torrent, const struct in_addr * in_addr )
|
|||
|
||||
peer = getExistingPeer( torrent, in_addr );
|
||||
|
||||
if( peer == NULL )
|
||||
{
|
||||
peer = tr_new0( tr_peer, 1 );
|
||||
peer->rateToClient = tr_rcInit( );
|
||||
peer->rateToPeer = tr_rcInit( );
|
||||
memcpy( &peer->in_addr, in_addr, sizeof(struct in_addr) );
|
||||
if( peer == NULL ) {
|
||||
peer = peerConstructor( in_addr );
|
||||
tr_ptrArrayInsertSorted( torrent->peers, peer, peerCompare );
|
||||
}
|
||||
|
||||
|
|
@ -343,7 +350,7 @@ disconnectPeer( tr_peer * peer )
|
|||
}
|
||||
|
||||
static void
|
||||
freePeer( tr_peer * peer )
|
||||
peerDestructor( tr_peer * peer )
|
||||
{
|
||||
disconnectPeer( peer );
|
||||
tr_rcClose( peer->rateToClient );
|
||||
|
|
@ -366,7 +373,7 @@ removePeer( Torrent * t, tr_peer * peer )
|
|||
|
||||
removed = tr_ptrArrayRemoveSorted ( t->peers, peer, peerCompare );
|
||||
assert( removed == peer );
|
||||
freePeer( removed );
|
||||
peerDestructor( removed );
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -376,7 +383,6 @@ removeAllPeers( Torrent * t )
|
|||
removePeer( t, tr_ptrArrayNth( t->peers, 0 ) );
|
||||
}
|
||||
|
||||
/* torrent must have already been removed from manager->torrents */
|
||||
static void
|
||||
torrentDestructor( Torrent * t )
|
||||
{
|
||||
|
|
@ -573,7 +579,7 @@ isPieceInteresting( const tr_torrent * tor,
|
|||
if( tor->info.pieces[piece].dnd ) /* we don't want it */
|
||||
return 0;
|
||||
|
||||
if( tr_cpPieceIsComplete( tor->completion, piece ) ) /* we already have it */
|
||||
if( tr_cpPieceIsComplete( tor->completion, piece ) ) /* we have it */
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
|
|
@ -1111,7 +1117,7 @@ stopTorrent( Torrent * t )
|
|||
tr_timerFree( &t->reconnectTimer );
|
||||
|
||||
/* disconnect the peers. */
|
||||
tr_ptrArrayForeach( t->peers, (PtrArrayForeachFunc)freePeer );
|
||||
tr_ptrArrayForeach( t->peers, (PtrArrayForeachFunc)peerDestructor );
|
||||
tr_ptrArrayClear( t->peers );
|
||||
|
||||
/* disconnect the handshakes. handshakeAbort calls handshakeDoneCB(),
|
||||
|
|
@ -1320,21 +1326,20 @@ tr_peerMgrPeerStats( const tr_peerMgr * manager,
|
|||
***
|
||||
**/
|
||||
|
||||
typedef struct
|
||||
struct ChokeData
|
||||
{
|
||||
tr_peer * peer;
|
||||
float rate;
|
||||
int randomKey;
|
||||
int preferred;
|
||||
int doUnchoke;
|
||||
}
|
||||
ChokeData;
|
||||
};
|
||||
|
||||
static int
|
||||
compareChoke( const void * va, const void * vb )
|
||||
{
|
||||
const ChokeData * a = va;
|
||||
const ChokeData * b = vb;
|
||||
const struct ChokeData * a = va;
|
||||
const struct ChokeData * b = vb;
|
||||
|
||||
if( a->preferred != b->preferred )
|
||||
return a->preferred ? -1 : 1;
|
||||
|
|
@ -1364,12 +1369,12 @@ clientIsSnubbedBy( const tr_peer * peer )
|
|||
**/
|
||||
|
||||
static void
|
||||
rechokeLeech( Torrent * t )
|
||||
rechoke( Torrent * t )
|
||||
{
|
||||
int i, peerCount, size=0, unchoked=0;
|
||||
const time_t ignorePeersNewerThan = time(NULL) - MIN_CHOKE_PERIOD_SEC;
|
||||
tr_peer ** peers = getConnectedPeers( t, &peerCount );
|
||||
ChokeData * choke = tr_new0( ChokeData, peerCount );
|
||||
struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
|
||||
|
||||
assert( torrentIsLocked( t ) );
|
||||
|
||||
|
|
@ -1377,7 +1382,7 @@ rechokeLeech( Torrent * t )
|
|||
for( i=0; i<peerCount; ++i )
|
||||
{
|
||||
tr_peer * peer = peers[i];
|
||||
ChokeData * node;
|
||||
struct ChokeData * node;
|
||||
if( peer->chokeChangedAt > ignorePeersNewerThan )
|
||||
continue;
|
||||
|
||||
|
|
@ -1389,7 +1394,7 @@ rechokeLeech( Torrent * t )
|
|||
+ (1*tr_rcRate(peer->rateToClient));
|
||||
}
|
||||
|
||||
qsort( choke, size, sizeof(ChokeData), compareChoke );
|
||||
qsort( choke, size, sizeof(struct ChokeData), compareChoke );
|
||||
|
||||
for( i=0; i<size && i<NUM_UNCHOKED_PEERS_PER_TORRENT; ++i ) {
|
||||
choke[i].doUnchoke = 1;
|
||||
|
|
@ -1411,35 +1416,12 @@ rechokeLeech( Torrent * t )
|
|||
tr_free( peers );
|
||||
}
|
||||
|
||||
static void
|
||||
rechokeSeed( Torrent * t )
|
||||
{
|
||||
int i, size;
|
||||
tr_peer ** peers;
|
||||
|
||||
assert( torrentIsLocked( t ) );
|
||||
|
||||
peers = getConnectedPeers( t, &size );
|
||||
|
||||
/* FIXME */
|
||||
for( i=0; i<size; ++i )
|
||||
tr_peerMsgsSetChoke( peers[i]->msgs, FALSE );
|
||||
|
||||
tr_free( peers );
|
||||
}
|
||||
|
||||
static int
|
||||
rechokePulse( void * vtorrent )
|
||||
{
|
||||
Torrent * t = vtorrent;
|
||||
torrentLock( t );
|
||||
|
||||
const int done = tr_cpGetStatus( t->tor->completion ) != TR_CP_INCOMPLETE;
|
||||
if( done )
|
||||
rechokeLeech( vtorrent );
|
||||
else
|
||||
rechokeSeed( vtorrent );
|
||||
|
||||
rechoke( t );
|
||||
torrentUnlock( t );
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -1489,7 +1471,7 @@ getWeakConnections( Torrent * t, int * setmeSize )
|
|||
else if( ( now - atom->time ) < LAISSEZ_FAIRE_PERIOD_SECS )
|
||||
isWeak = FALSE;
|
||||
else
|
||||
isWeak = now - peer->pieceDataActivityDate > 180;
|
||||
isWeak = ( now - peer->pieceDataActivityDate ) > 180;
|
||||
|
||||
if( isWeak )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -145,7 +145,9 @@ struct tr_peermsgs
|
|||
**/
|
||||
|
||||
static void
|
||||
myDebug( const char * file, int line, const struct tr_peermsgs * msgs, const char * fmt, ... )
|
||||
myDebug( const char * file, int line,
|
||||
const struct tr_peermsgs * msgs,
|
||||
const char * fmt, ... )
|
||||
{
|
||||
FILE * fp = tr_getLog( );
|
||||
if( fp != NULL )
|
||||
|
|
@ -232,23 +234,24 @@ isPieceInteresting( const tr_peermsgs * peer,
|
|||
const tr_torrent * torrent = peer->torrent;
|
||||
if( torrent->info.pieces[piece].dnd ) /* we don't want it */
|
||||
return FALSE;
|
||||
if( tr_cpPieceIsComplete( torrent->completion, piece ) ) /* we already have it */
|
||||
if( tr_cpPieceIsComplete( torrent->completion, piece ) ) /* we have it */
|
||||
return FALSE;
|
||||
if( !tr_bitfieldHas( peer->info->have, piece ) ) /* peer doesn't have it */
|
||||
return FALSE;
|
||||
if( tr_bitfieldHas( peer->info->banned, piece ) ) /* peer is banned for it */
|
||||
if( tr_bitfieldHas( peer->info->banned, piece ) ) /* peer is banned */
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* "interested" means we'll ask for piece data from the peer if they unchoke us */
|
||||
/* "interested" means we'll ask for piece data if they unchoke us */
|
||||
static int
|
||||
isPeerInteresting( const tr_peermsgs * msgs )
|
||||
{
|
||||
int i;
|
||||
const tr_torrent * torrent;
|
||||
const tr_bitfield * bitfield;
|
||||
const int clientIsSeed = tr_cpGetStatus( msgs->torrent->completion ) != TR_CP_INCOMPLETE;
|
||||
const int clientIsSeed =
|
||||
tr_cpGetStatus( msgs->torrent->completion ) != TR_CP_INCOMPLETE;
|
||||
|
||||
if( clientIsSeed )
|
||||
return FALSE;
|
||||
|
|
@ -256,7 +259,7 @@ isPeerInteresting( const tr_peermsgs * msgs )
|
|||
torrent = msgs->torrent;
|
||||
bitfield = tr_cpPieceBitfield( torrent->completion );
|
||||
|
||||
if( !msgs->info->have ) /* We don't know what this peer has... what should this be? */
|
||||
if( !msgs->info->have )
|
||||
return TRUE;
|
||||
|
||||
assert( bitfield->len == msgs->info->have->len );
|
||||
|
|
@ -274,10 +277,12 @@ sendInterest( tr_peermsgs * msgs, int weAreInterested )
|
|||
assert( weAreInterested==0 || weAreInterested==1 );
|
||||
|
||||
msgs->info->clientIsInterested = weAreInterested;
|
||||
dbgmsg( msgs, ": sending an %s message", (weAreInterested ? "INTERESTED" : "NOT_INTERESTED") );
|
||||
dbgmsg( msgs, ": sending an %s message",
|
||||
weAreInterested ? "INTERESTED" : "NOT_INTERESTED");
|
||||
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages,
|
||||
weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -306,7 +311,7 @@ tr_peerMsgsSetChoke( tr_peermsgs * msgs, int choke )
|
|||
for( walk = msgs->peerAskedFor; walk != NULL; )
|
||||
{
|
||||
tr_list * next = walk->next;
|
||||
/* We shouldn't reject a peer's fast allowed requests at choke */
|
||||
/* don't reject a peer's fast allowed requests at choke */
|
||||
struct peer_request *req = walk->data;
|
||||
if ( !tr_bitfieldHas( msgs->peerAllowedPieces, req->index ) )
|
||||
{
|
||||
|
|
@ -318,7 +323,8 @@ tr_peerMsgsSetChoke( tr_peermsgs * msgs, int choke )
|
|||
|
||||
dbgmsg( msgs, "sending a %s message", (choke ? "CHOKE" : "UNCHOKE") );
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, choke ? BT_CHOKE : BT_UNCHOKE );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages,
|
||||
choke ? BT_CHOKE : BT_UNCHOKE );
|
||||
msgs->info->chokeChangedAt = time( NULL );
|
||||
}
|
||||
}
|
||||
|
|
@ -366,7 +372,8 @@ tr_peerMsgsHave( tr_peermsgs * msgs,
|
|||
{
|
||||
dbgmsg( msgs, "w00t telling them we HAVE piece #%d", pieceIndex );
|
||||
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) + sizeof(uint32_t) );
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages,
|
||||
sizeof(uint8_t) + sizeof(uint32_t) );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, BT_HAVE );
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages, pieceIndex );
|
||||
|
||||
|
|
@ -613,20 +620,6 @@ parseLtepHandshake( tr_peermsgs * msgs, int len, struct evbuffer * inbuf )
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* get peer's client name */
|
||||
sub = tr_bencDictFind( &val, "v" );
|
||||
if( tr_bencIsStr( sub ) ) {
|
||||
int i;
|
||||
tr_free( msgs->info->client );
|
||||
fprintf( stderr, "dictionary says client is [%s]\n", sub->val.s.s );
|
||||
msgs->info->client = tr_strndup( sub->val.s.s, sub->val.s.i );
|
||||
for( i=0; i<sub->val.s.i; ++i ) { fprintf( stderr, "[%c] (%d)\n", sub->val.s.s[i], (int)sub->val.s.s[i] );
|
||||
if( (int)msgs->info->client[i]==-75 ) msgs->info->client[i]='u'; }
|
||||
fprintf( stderr, "msgs->client is now [%s]\n", msgs->info->client );
|
||||
}
|
||||
#endif
|
||||
|
||||
/* get peer's listening port */
|
||||
sub = tr_bencDictFind( &val, "p" );
|
||||
if( tr_bencIsInt( sub ) ) {
|
||||
|
|
@ -723,6 +716,15 @@ readBtLength( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
|||
return READ_AGAIN;
|
||||
}
|
||||
|
||||
static void
|
||||
updatePeerProgress( tr_peermsgs * msgs )
|
||||
{
|
||||
msgs->info->progress = tr_bitfieldCountTrueBits( msgs->info->have ) / (float)msgs->torrent->info.pieceCount;
|
||||
dbgmsg( msgs, "peer progress is %f", msgs->info->progress );
|
||||
updateInterest( msgs );
|
||||
firePeerProgress( msgs );
|
||||
}
|
||||
|
||||
static int
|
||||
readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
||||
{
|
||||
|
|
@ -786,10 +788,7 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
|||
assert( msglen == 4 );
|
||||
tr_peerIoReadUint32( msgs->io, inbuf, &ui32 );
|
||||
tr_bitfieldAdd( msgs->info->have, ui32 );
|
||||
msgs->info->progress = tr_bitfieldCountTrueBits( msgs->info->have ) / (float)msgs->torrent->info.pieceCount;
|
||||
dbgmsg( msgs, "after the HAVE message, peer progress is %f", msgs->info->progress );
|
||||
updateInterest( msgs );
|
||||
firePeerProgress( msgs );
|
||||
updatePeerProgress( msgs );
|
||||
break;
|
||||
|
||||
case BT_BITFIELD: {
|
||||
|
|
@ -797,12 +796,9 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
|||
dbgmsg( msgs, "w00t peer sent us a BT_BITFIELD" );
|
||||
assert( msglen == msgs->info->have->len );
|
||||
tr_peerIoReadBytes( msgs->io, inbuf, msgs->info->have->bits, msglen );
|
||||
msgs->info->progress = tr_bitfieldCountTrueBits( msgs->info->have ) / (float)msgs->torrent->info.pieceCount;
|
||||
updatePeerProgress( msgs );
|
||||
tr_peerMsgsSetChoke( msgs, !clientIsSeed || (msgs->info->progress<1.0) );
|
||||
dbgmsg( msgs, "after the HAVE message, peer progress is %f", msgs->info->progress );
|
||||
updateInterest( msgs );
|
||||
fireNeedReq( msgs );
|
||||
firePeerProgress( msgs );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -905,10 +901,7 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
|||
assert( msglen == 0 );
|
||||
dbgmsg( msgs, "peer sent us a BT_HAVE_ALL" );
|
||||
memset( msgs->info->have->bits, 1, msgs->info->have->len );
|
||||
msgs->info->progress = tr_bitfieldCountTrueBits( msgs->info->have ) / (float)msgs->torrent->info.pieceCount;
|
||||
dbgmsg( msgs, "after the HAVE_ALL message, peer progress is %f", msgs->info->progress );
|
||||
updateInterest( msgs );
|
||||
firePeerProgress( msgs );
|
||||
updatePeerProgress( msgs );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -916,10 +909,7 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
|
|||
assert( msglen == 0 );
|
||||
dbgmsg( msgs, "peer sent us a BT_HAVE_NONE" );
|
||||
memset( msgs->info->have->bits, 1, msgs->info->have->len );
|
||||
msgs->info->progress = tr_bitfieldCountTrueBits( msgs->info->have ) / (float)msgs->torrent->info.pieceCount;
|
||||
dbgmsg( msgs, "after the HAVE_NONE message, peer progress is %f", msgs->info->progress );
|
||||
updateInterest( msgs );
|
||||
firePeerProgress( msgs );
|
||||
updatePeerProgress( msgs );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1093,9 +1083,8 @@ gotBlock( tr_peermsgs * msgs,
|
|||
*** Write the block
|
||||
**/
|
||||
|
||||
if( tr_ioWrite( tor, index, offset, length, EVBUFFER_DATA( inbuf ))) {
|
||||
if( tr_ioWrite( tor, index, offset, length, EVBUFFER_DATA( inbuf )))
|
||||
return;
|
||||
}
|
||||
|
||||
tr_cpBlockAdd( tor->completion, block );
|
||||
|
||||
|
|
@ -1298,11 +1287,12 @@ static void
|
|||
sendBitfield( tr_peermsgs * msgs )
|
||||
{
|
||||
const tr_bitfield * bitfield = tr_cpPieceBitfield( msgs->torrent->completion );
|
||||
struct evbuffer * out = msgs->outMessages;
|
||||
|
||||
dbgmsg( msgs, "sending peer a bitfield message" );
|
||||
tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) + bitfield->len );
|
||||
tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, BT_BITFIELD );
|
||||
tr_peerIoWriteBytes ( msgs->io, msgs->outMessages, bitfield->bits, bitfield->len );
|
||||
tr_peerIoWriteUint32( msgs->io, out, sizeof(uint8_t) + bitfield->len );
|
||||
tr_peerIoWriteUint8 ( msgs->io, out, BT_BITFIELD );
|
||||
tr_peerIoWriteBytes ( msgs->io, out, bitfield->bits, bitfield->len );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef TR_P_H
|
||||
#define TR_P_H
|
||||
#ifndef TR_PEER_MSGS_H
|
||||
#define TR_PEER_MSGS_H
|
||||
|
||||
#include <inttypes.h>
|
||||
#include "publish.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue