mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-22 14:10:34 +00:00
Code Issues Releases Wiki Activity

back out the changes from r6415.

Browse source
This commit is contained in:
Charles Kerr 2008-08-08 22:44:32 +00:00
parent 4c7ca15f97
commit 6937164c93
3 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libtransmission/peer-io.c
View file

@ -68,8 +68,6 @@ struct tr_peerIo
void * userData; void * userData;
tr_crypto * crypto; tr_crypto * crypto;
uint64_t fromPeer;
}; };
/** /**
@ -539,11 +537,11 @@ tr_peerIoReadBytes( tr_peerIo * io,
switch( io->encryptionMode ) switch( io->encryptionMode )
{ {
case PEER_ENCRYPTION_NONE: case PEER_ENCRYPTION_NONE:
io->fromPeer += evbuffer_remove( inbuf, bytes, byteCount ); evbuffer_remove( inbuf, bytes, byteCount );
break; break;
case PEER_ENCRYPTION_RC4: case PEER_ENCRYPTION_RC4:
io->fromPeer += evbuffer_remove( inbuf, bytes, byteCount ); evbuffer_remove( inbuf, bytes, byteCount );
tr_cryptoDecrypt( io->crypto, byteCount, bytes, bytes ); tr_cryptoDecrypt( io->crypto, byteCount, bytes, bytes );
break; break;
@ -595,10 +593,3 @@ tr_peerIoGetAge( const tr_peerIo * io )
{ {
return time( NULL ) - io->timeCreated; return time( NULL ) - io->timeCreated;
} }
int64_t
tr_peerIoCountBytesFromPeer( const tr_peerIo * io )
{
return io->fromPeer;
}

1
libtransmission/peer-io.h
View file

@ -178,6 +178,5 @@ void tr_peerIoDrain ( tr_peerIo * io,
struct evbuffer * inbuf, struct evbuffer * inbuf,
size_t byteCount ); size_t byteCount );
int64_t tr_peerIoCountBytesFromPeer( const tr_peerIo * io );
#endif #endif

27
libtransmission/peer-mgr.c
View file

@ -44,7 +44,7 @@ enum
RECHOKE_PERIOD_MSEC = (10 * 1000), RECHOKE_PERIOD_MSEC = (10 * 1000),
/* minimum interval for refilling peers' request lists */ /* minimum interval for refilling peers' request lists */
REFILL_PERIOD_MSEC = 500, REFILL_PERIOD_MSEC = 333,
/* when many peers are available, keep idle ones this long */ /* when many peers are available, keep idle ones this long */
MIN_UPLOAD_IDLE_SECS = (60 * 3), MIN_UPLOAD_IDLE_SECS = (60 * 3),
@ -965,18 +965,7 @@ myHandshakeDoneCB( tr_handshake * handshake,
if( t ) { if( t ) {
struct peer_atom * atom = getExistingAtom( t, addr ); struct peer_atom * atom = getExistingAtom( t, addr );
if( atom ) if( atom )
{
/* if we talked but the connection failed, mark a failure
* in the peer's permanent record. if they didn't send
* us anything at all, mark the peer as unreachable. */
if( tr_peerIoCountBytesFromPeer( io ) ) {
++atom->numFails; ++atom->numFails;
tordbg( t, "handshake failed; incremented fail count to %d", (int)atom->numFails );
} else {
tordbg( t, "no data received at all during handshake; marking as unreachable" );
atom->myflags |= MYFLAG_UNREACHABLE;
}
}
} }
tr_peerIoFree( io ); tr_peerIoFree( io );
@ -1090,6 +1079,14 @@ tr_peerMgrCompactToPex( const void * compact,
size_t n = compactLen / 6; size_t n = compactLen / 6;
const uint8_t * walk = compact; const uint8_t * walk = compact;
tr_pex * pex = tr_new0( tr_pex, n ); tr_pex * pex = tr_new0( tr_pex, n );
if( added_f && strlen(added_f)!=n )
{
int i;
const int len = strlen( added_f );
fprintf( stderr, "compactLen is %d, n is %d, and strlen(added_f) is %d!!!\n", (int)compactLen, (int)n, len );
for( i=0; i<len; ++i )
fprintf( stderr, "added.f[%d] is %d\n", i, (int)added_f[i] );
}
for( i=0; i<n; ++i ) { for( i=0; i<n; ++i ) {
memcpy( &pex[i].in_addr, walk, 4 ); walk += 4; memcpy( &pex[i].in_addr, walk, 4 ); walk += 4;
memcpy( &pex[i].port, walk, 2 ); walk += 2; memcpy( &pex[i].port, walk, 2 ); walk += 2;
@ -1815,8 +1812,8 @@ getPeerCandidates( Torrent * t, int * setmeSize )
if( wait < minWait ) wait = minWait; if( wait < minWait ) wait = minWait;
if( wait > maxWait ) wait = maxWait; if( wait > maxWait ) wait = maxWait;
if( ( now - atom->time ) < wait ) { if( ( now - atom->time ) < wait ) {
/*tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..", tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
i, tr_peerIoAddrStr(&atom->addr,atom->port), wait );*/ i, tr_peerIoAddrStr(&atom->addr,atom->port), wait );
continue; continue;
} }
} }
@ -1896,7 +1893,7 @@ reconnectPulse( void * vtorrent )
io = tr_peerIoNewOutgoing( mgr->handle, &atom->addr, atom->port, t->hash ); io = tr_peerIoNewOutgoing( mgr->handle, &atom->addr, atom->port, t->hash );
if( io == NULL ) if( io == NULL )
{ {
/* we've temporarily exceeded our max connection limit... */ atom->myflags |= MYFLAG_UNREACHABLE;
} }
else else
{ {