wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix bug where a choke when the last block is outstanding would cause the outstanding_bytes counter to be incorrect

This commit is contained in:
Arvid Norberg 2009-08-05 18:20:33 +00:00
parent 541ffc842e
commit 5e2254df97
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bt_peer_connection.cpp
View File

@ -894,6 +894,11 @@ namespace libtorrent
if (is_disconnecting()) return; if (is_disconnecting()) return;
if (!m_supports_fast) if (!m_supports_fast)
{ {
// we just got choked, and the peer that choked use
// doesn't support fast extensions, so we have to
// assume that the choke message implies that all
// of our requests are rejected. Go through them and
// pretend that we received reject request messages
boost::shared_ptr<torrent> t = associated_torrent().lock(); boost::shared_ptr<torrent> t = associated_torrent().lock();
TORRENT_ASSERT(t); TORRENT_ASSERT(t);
while (!download_queue().empty()) while (!download_queue().empty())
@ -903,6 +908,16 @@ namespace libtorrent
r.piece = b.piece_index; r.piece = b.piece_index;
r.start = b.block_index * t->block_size(); r.start = b.block_index * t->block_size();
r.length = t->block_size(); r.length = t->block_size();
// if it's the last piece, make sure to
// set the length of the request to not
// exceed the end of the torrent. This is
// necessary in order to maintain a correct
// m_outsanding_bytes
if (r.piece == t->torrent_file().num_pieces() - 1)
{
r.length = (std::min)(t->torrent_file().piece_size(
r.piece) - r.start, r.length);
}
incoming_reject_request(r); incoming_reject_request(r);
} }
} }