premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixed handling of dropped request

This commit is contained in:
Arvid Norberg 2009-05-31 05:50:07 +00:00
parent d230dfaf3a
commit 177a7e881c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -73,6 +73,8 @@ release 0.14.4
* fixed memory leak in disk cache * fixed memory leak in disk cache
* fixed torrent file path vulnerability * fixed torrent file path vulnerability
* fixed upnp * fixed upnp
* fixed bug when dealing with clients that drop requests (i.e. BitComet)
fixes assert as well
release 0.14.3 release 0.14.3

10
src/peer_connection.cpp
View File

@ -1939,10 +1939,13 @@ namespace libtorrent
pending_block pending_b = *b; pending_block pending_b = *b;
#endif #endif
int block_index = b - m_download_queue.begin() - 1; int block_index = b - m_download_queue.begin();
TORRENT_ASSERT(m_download_queue[block_index] == pending_b);
for (int i = 0; i < block_index; ++i) for (int i = 0; i < block_index; ++i)
{ {
pending_block& qe = m_download_queue[i]; pending_block& qe = m_download_queue[i];
TORRENT_ASSERT(m_download_queue[block_index] == pending_b);
TORRENT_ASSERT(i < block_index);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
(*m_logger) << time_now_string() (*m_logger) << time_now_string()
@ -1968,14 +1971,15 @@ namespace libtorrent
--i; --i;
--block_index; --block_index;
m_outstanding_bytes -= t->block_size(); m_outstanding_bytes -= t->block_size();
TORRENT_ASSERT(m_download_queue[block_index] == pending_b);
#if !defined TORRENT_DISABLE_INVARIANT_CHECKS && defined TORRENT_DEBUG #if !defined TORRENT_DISABLE_INVARIANT_CHECKS && defined TORRENT_DEBUG
check_invariant(); check_invariant();
#endif #endif
} }
} }
TORRENT_ASSERT(int(m_download_queue.size()) > block_index + 1); TORRENT_ASSERT(int(m_download_queue.size()) > block_index + 1);
b = m_download_queue.begin() + (block_index + 1); b = m_download_queue.begin() + block_index;
TORRENT_ASSERT(b->block == pending_b.block); TORRENT_ASSERT(*b == pending_b);
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
TORRENT_ASSERT(m_received_in_piece == p.length); TORRENT_ASSERT(m_received_in_piece == p.length);