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

fixed encryption asserts

This commit is contained in:
Arvid Norberg 2009-02-04 05:51:00 +00:00
parent 532a5f477d
commit bcd93da465
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/bt_peer_connection.hpp
View File

@ -287,7 +287,7 @@ public:
m_RC4_handler->encrypt(buffer, size); m_RC4_handler->encrypt(buffer, size);
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
m_encrypted_bytes += size; m_encrypted_bytes += size;
TORRENT_ASSERT(m_encrypted_bytes <= send_buffer_size() + size); TORRENT_ASSERT(m_encrypted_bytes == send_buffer_size() + size);
#endif #endif
} }
#endif #endif

19
src/bt_peer_connection.cpp
View File

@ -443,6 +443,8 @@ namespace libtorrent
int pad_size = rand() % 512; int pad_size = rand() % 512;
TORRENT_ASSERT(send_buffer_size() == m_encrypted_bytes);
// synchash,skeyhash,vc,crypto_provide,len(pad),pad,len(ia) // synchash,skeyhash,vc,crypto_provide,len(pad),pad,len(ia)
buffer::interval send_buf = buffer::interval send_buf =
allocate_send_buffer(20 + 20 + 8 + 4 + 2 + pad_size + 2); allocate_send_buffer(20 + 20 + 8 + 4 + 2 + pad_size + 2);
@ -506,7 +508,7 @@ namespace libtorrent
const int packet_size = 20 + 20 + 8 + 4 + 2 + pad_size + 2; const int packet_size = 20 + 20 + 8 + 4 + 2 + pad_size + 2;
TORRENT_ASSERT(send_buffer_size() - packet_size == m_encrypted_bytes); TORRENT_ASSERT(send_buffer_size() - packet_size == m_encrypted_bytes);
m_encrypted_bytes += packet_size; m_encrypted_bytes += packet_size;
TORRENT_ASSERT(m_encrypted_bytes <= send_buffer_size()); TORRENT_ASSERT(m_encrypted_bytes == send_buffer_size());
#endif #endif
TORRENT_ASSERT(send_buf.begin == send_buf.end); TORRENT_ASSERT(send_buf.begin == send_buf.end);
@ -525,6 +527,8 @@ namespace libtorrent
int pad_size =rand() % 512; int pad_size =rand() % 512;
TORRENT_ASSERT(send_buffer_size() == m_encrypted_bytes);
const int buf_size = 8 + 4 + 2 + pad_size; const int buf_size = 8 + 4 + 2 + pad_size;
buffer::interval send_buf = allocate_send_buffer(buf_size); buffer::interval send_buf = allocate_send_buffer(buf_size);
if (send_buf.begin == 0) return; // out of memory if (send_buf.begin == 0) return; // out of memory
@ -636,7 +640,6 @@ namespace libtorrent
m_RC4_handler->encrypt(const_cast<char*>(buf), size); m_RC4_handler->encrypt(const_cast<char*>(buf), size);
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
m_encrypted_bytes += size; m_encrypted_bytes += size;
TORRENT_ASSERT(m_encrypted_bytes <= send_buffer_size() + size);
#endif #endif
} }
@ -680,6 +683,7 @@ namespace libtorrent
void bt_peer_connection::setup_send() void bt_peer_connection::setup_send()
{ {
encrypt_pending_buffer(); encrypt_pending_buffer();
TORRENT_ASSERT(!m_encrypted || !m_rc4_encrypted || m_encrypted_bytes == send_buffer_size());
peer_connection::setup_send(); peer_connection::setup_send();
} }
@ -2777,9 +2781,16 @@ namespace libtorrent
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
if (m_encrypted_bytes > 0) if (m_encrypted_bytes > 0)
{ {
m_encrypted_bytes -= bytes_transferred; if (m_rc4_encrypted)
{
m_encrypted_bytes -= bytes_transferred;
TORRENT_ASSERT(m_encrypted_bytes >= 0);
}
else
{
m_encrypted_bytes -= (std::min)(int(bytes_transferred), m_encrypted_bytes);
}
TORRENT_ASSERT(m_encrypted_bytes >= 0); TORRENT_ASSERT(m_encrypted_bytes >= 0);
TORRENT_ASSERT(m_encrypted_bytes <= send_buffer_size());
} }
#endif #endif