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

(trunk libT) #4078 "Better calculation of the bitfield length while still a magnet link" -- fixed.

Browse source
This commit is contained in:
Jordan Lee 2011-03-02 15:00:12 +00:00
parent 9537b636ce
commit ab3cc08258
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libtransmission/peer-msgs.c
View file

@ -178,6 +178,7 @@ struct tr_peermsgs
uint16_t pexCount; uint16_t pexCount;
uint16_t pexCount6; uint16_t pexCount6;
size_t metadata_size_hint;
#if 0 #if 0
size_t fastsetSize; size_t fastsetSize;
tr_piece_index_t fastset[MAX_FAST_SET_SIZE]; tr_piece_index_t fastset[MAX_FAST_SET_SIZE];
@ -925,8 +926,10 @@ parseLtepHandshake( tr_peermsgs * msgs,
} }
/* look for metainfo size (BEP 9) */ /* look for metainfo size (BEP 9) */
if( tr_bencDictFindInt( &val, "metadata_size", &i ) ) if( tr_bencDictFindInt( &val, "metadata_size", &i ) ) {
tr_torrentSetMetadataSizeHint( msgs->torrent, i ); tr_torrentSetMetadataSizeHint( msgs->torrent, i );
msgs->metadata_size_hint = (size_t) i;
}
/* look for upload_only (BEP 21) */ /* look for upload_only (BEP 21) */
if( tr_bencDictFindInt( &val, "upload_only", &i ) ) if( tr_bencDictFindInt( &val, "upload_only", &i ) )
@ -1274,7 +1277,13 @@ messageLengthIsCorrect( const tr_peermsgs * msg, uint8_t id, uint32_t len )
return len == 5; return len == 5;
case BT_BITFIELD: case BT_BITFIELD:
if( tr_torrentHasMetadata( msg->torrent ) )
return len == ( msg->torrent->info.pieceCount + 7u ) / 8u + 1u; return len == ( msg->torrent->info.pieceCount + 7u ) / 8u + 1u;
/* we don't know the piece count yet,
so we can only guess whether to send TRUE or FALSE */
if( msg->metadata_size_hint > 0 )
return len <= msg->metadata_size_hint;
return TRUE;
case BT_REQUEST: case BT_REQUEST:
case BT_CANCEL: case BT_CANCEL: