mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-24 16:52:39 +00:00
Code Issues Releases Wiki Activity

(trunk libT) #1810: DoS vulnerability wrt incoming connections

Browse source
This commit is contained in:
Charles Kerr 2009-02-12 20:43:07 +00:00
parent 03b8d8a4b7
commit 14a400b7f6
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libtransmission/handshake.c
View file

@ -59,7 +59,10 @@ enum
VC_LENGTH = 8, VC_LENGTH = 8,
KEY_LEN = 96, KEY_LEN = 96,
CRYPTO_PROVIDE_PLAINTEXT = 1, CRYPTO_PROVIDE_PLAINTEXT = 1,
CRYPTO_PROVIDE_CRYPTO = 2 CRYPTO_PROVIDE_CRYPTO = 2,
/* how long to wait before giving up on a handshake */
HANDSHAKE_TIMEOUT_MSEC = 60 * 1000
}; };
@ -106,6 +109,7 @@ struct tr_handshake
uint8_t peer_id[PEER_ID_LEN]; uint8_t peer_id[PEER_ID_LEN];
handshakeDoneCB doneCB; handshakeDoneCB doneCB;
void * doneUserData; void * doneUserData;
tr_timer * timeout;
}; };
/** /**
@ -1099,6 +1103,8 @@ tr_handshakeFree( tr_handshake * handshake )
if( handshake->io ) if( handshake->io )
tr_peerIoUnref( handshake->io ); /* balanced by the ref in tr_handshakeNew */ tr_peerIoUnref( handshake->io ); /* balanced by the ref in tr_handshakeNew */
tr_timerFree( &handshake->timeout );
tr_free( handshake ); tr_free( handshake );
} }
@ -1160,6 +1166,13 @@ gotError( tr_peerIo * io UNUSED,
*** ***
**/ **/
static int
handshakeTimeout( void * handshake )
{
tr_handshakeAbort( handshake );
return FALSE;
}
tr_handshake* tr_handshake*
tr_handshakeNew( tr_peerIo * io, tr_handshakeNew( tr_peerIo * io,
tr_encryption_mode encryptionMode, tr_encryption_mode encryptionMode,
@ -1175,6 +1188,7 @@ tr_handshakeNew( tr_peerIo * io,
handshake->doneCB = doneCB; handshake->doneCB = doneCB;
handshake->doneUserData = doneUserData; handshake->doneUserData = doneUserData;
handshake->session = tr_peerIoGetSession( io ); handshake->session = tr_peerIoGetSession( io );
handshake->timeout = tr_timerNew( handshake->session, handshakeTimeout, handshake, HANDSHAKE_TIMEOUT_MSEC );
tr_peerIoRef( io ); /* balanced by the unref in tr_handshakeFree */ tr_peerIoRef( io ); /* balanced by the unref in tr_handshakeFree */
tr_peerIoSetIOFuncs( handshake->io, canRead, NULL, gotError, handshake ); tr_peerIoSetIOFuncs( handshake->io, canRead, NULL, gotError, handshake );

8
libtransmission/port-forwarding.c
View file

@ -165,8 +165,6 @@ bindCb( int * const socket,
static void static void
incomingPeersPulse( tr_shared * s ) incomingPeersPulse( tr_shared * s )
{ {
tr_bool allPaused;
if( s->shouldChange ) if( s->shouldChange )
{ {
tr_socketListForEach( s->bindSockets, &closeCb, s ); tr_socketListForEach( s->bindSockets, &closeCb, s );
@ -175,9 +173,6 @@ incomingPeersPulse( tr_shared * s )
tr_socketListForEach( s->bindSockets, &bindCb, s ); tr_socketListForEach( s->bindSockets, &bindCb, s );
} }
allPaused = tr_sessionGetActiveTorrentCount( s->session ) == 0;
/* if we have any running torrents, check for new incoming peer connections */
/* (jhujhiti): /* (jhujhiti):
* This has been changed from a loop that will end when the listener queue * This has been changed from a loop that will end when the listener queue
* is exhausted to one that will only check for one connection at a time. * is exhausted to one that will only check for one connection at a time.
@ -185,8 +180,7 @@ incomingPeersPulse( tr_shared * s )
* time between pulses (currently one second). However, just to be safe, * time between pulses (currently one second). However, just to be safe,
* I have increased the length of the listener queue from 5 to 10 * I have increased the length of the listener queue from 5 to 10
* (see acceptCb() above). */ * (see acceptCb() above). */
if( !allPaused ) tr_socketListForEach( s->bindSockets, &acceptCb, s );
tr_socketListForEach( s->bindSockets, &acceptCb, s );
} }
static int static int