mirror of
https://github.com/transmission/transmission
synced 2024-12-24 16:52:39 +00:00
(trunk libT) #3894 "tr_peerIo.hasFinishedConnecting should be removed" -- committed.
This commit is contained in:
parent
e12788c626
commit
007b96a62f
2 changed files with 6 additions and 18 deletions
|
@ -214,7 +214,6 @@ event_read_cb( int fd, short event UNUSED, void * vio )
|
|||
|
||||
assert( tr_isPeerIo( io ) );
|
||||
|
||||
io->hasFinishedConnecting = TRUE;
|
||||
io->pendingEvents &= ~EV_READ;
|
||||
|
||||
curlen = evbuffer_get_length( io->inbuf );
|
||||
|
@ -290,7 +289,6 @@ event_write_cb( int fd, short event UNUSED, void * vio )
|
|||
|
||||
assert( tr_isPeerIo( io ) );
|
||||
|
||||
io->hasFinishedConnecting = TRUE;
|
||||
io->pendingEvents &= ~EV_WRITE;
|
||||
|
||||
dbgmsg( io, "libevent says this peer is ready to write" );
|
||||
|
@ -390,7 +388,6 @@ tr_peerIoNew( tr_session * session,
|
|||
io->port = port;
|
||||
io->socket = socket;
|
||||
io->isIncoming = isIncoming != 0;
|
||||
io->hasFinishedConnecting = FALSE;
|
||||
io->timeCreated = tr_time( );
|
||||
io->inbuf = evbuffer_new( );
|
||||
io->outbuf = evbuffer_new( );
|
||||
|
@ -967,15 +964,12 @@ tr_peerIoFlush( tr_peerIo * io, tr_direction dir, size_t limit )
|
|||
assert( tr_isPeerIo( io ) );
|
||||
assert( tr_isDirection( dir ) );
|
||||
|
||||
if( io->hasFinishedConnecting )
|
||||
{
|
||||
if( dir == TR_DOWN )
|
||||
bytesUsed = tr_peerIoTryRead( io, limit );
|
||||
else
|
||||
bytesUsed = tr_peerIoTryWrite( io, limit );
|
||||
}
|
||||
if( dir == TR_DOWN )
|
||||
bytesUsed = tr_peerIoTryRead( io, limit );
|
||||
else
|
||||
bytesUsed = tr_peerIoTryWrite( io, limit );
|
||||
|
||||
dbgmsg( io, "flushing peer-io, hasFinishedConnecting %d, direction %d, limit %zu, bytesUsed %d", (int)io->hasFinishedConnecting, (int)dir, limit, bytesUsed );
|
||||
dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %d", (int)dir, limit, bytesUsed );
|
||||
return bytesUsed;
|
||||
}
|
||||
|
||||
|
|
|
@ -72,11 +72,6 @@ typedef struct tr_peerIo
|
|||
tr_bool fastExtensionSupported;
|
||||
tr_bool dhtSupported;
|
||||
|
||||
/* we create the socket in a nonblocking way, so this flag is initially
|
||||
* false and then set to true when libevent says that the socket is ready
|
||||
* for reading or writing */
|
||||
tr_bool hasFinishedConnecting;
|
||||
|
||||
tr_priority_t priority;
|
||||
|
||||
short int pendingEvents;
|
||||
|
@ -340,8 +335,7 @@ tr_peerIoHasBandwidthLeft( const tr_peerIo * io, tr_direction dir )
|
|||
{
|
||||
assert( tr_isPeerIo( io ) );
|
||||
|
||||
return !io->hasFinishedConnecting
|
||||
|| ( tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0 );
|
||||
return tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0;
|
||||
}
|
||||
|
||||
static inline unsigned int
|
||||
|
|
Loading…
Reference in a new issue