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

fixing bug where the trailing bits in bitfields were not set to 0. Fixes #482

This commit is contained in:
Arvid Norberg 2009-02-06 08:51:25 +00:00
parent bcd93da465
commit 7607286f50
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/libtorrent/bitfield.hpp
View File

@ -60,7 +60,7 @@ namespace libtorrent
~bitfield() { dealloc(); } ~bitfield() { dealloc(); }
void assign(char const* bytes, int bits) void assign(char const* bytes, int bits)
{ resize(bits); std::memcpy(m_bytes, bytes, (bits + 7) / 8); } { resize(bits); std::memcpy(m_bytes, bytes, (bits + 7) / 8); clear_trailing_bits(); }
bool operator[](int index) const bool operator[](int index) const
{ return get_bit(index); } { return get_bit(index); }
@ -198,6 +198,7 @@ namespace libtorrent
if (old_size_bytes && b) m_bytes[old_size_bytes - 1] |= (0xff >> b); if (old_size_bytes && b) m_bytes[old_size_bytes - 1] |= (0xff >> b);
if (old_size_bytes < new_size_bytes) if (old_size_bytes < new_size_bytes)
std::memset(m_bytes + old_size_bytes, 0xff, new_size_bytes - old_size_bytes); std::memset(m_bytes + old_size_bytes, 0xff, new_size_bytes - old_size_bytes);
clear_trailing_bits();
} }
else else
{ {
@ -209,6 +210,7 @@ namespace libtorrent
void set_all() void set_all()
{ {
std::memset(m_bytes, 0xff, (m_size + 7) / 8); std::memset(m_bytes, 0xff, (m_size + 7) / 8);
clear_trailing_bits();
} }
void clear_all() void clear_all()
@ -240,14 +242,19 @@ namespace libtorrent
m_own = true; m_own = true;
} }
m_size = bits; m_size = bits;
// clear the tail bits in the last byte clear_trailing_bits();
if (m_size && (bits & 7)) m_bytes[(m_size + 7) / 8 - 1] &= 0xff << (7 - (bits & 7));
} }
void free() { dealloc(); m_size = 0; } void free() { dealloc(); m_size = 0; }
private: private:
void clear_trailing_bits()
{
// clear the tail bits in the last byte
if (m_size & 7) m_bytes[(m_size + 7) / 8 - 1] &= 0xff << (8 - (m_size & 7));
}
void dealloc() { if (m_own) std::free(m_bytes); m_bytes = 0; } void dealloc() { if (m_own) std::free(m_bytes); m_bytes = 0; }
unsigned char* m_bytes; unsigned char* m_bytes;
int m_size:31; // in bits int m_size:31; // in bits

6
src/bt_peer_connection.cpp
View File

@ -1563,7 +1563,11 @@ namespace libtorrent
if (t->is_seed()) if (t->is_seed())
{ {
memset(i.begin, 0xff, packet_size - 5); memset(i.begin, 0xff, packet_size - 6);
// Clear trailing bits
unsigned char *p = ((unsigned char *)i.begin) + packet_size - 6;
*p = (0xff << ((8 - (num_pieces & 7)) & 7)) & 0xff;
} }
else else
{ {