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

added asserts to peer allocation management

This commit is contained in:
Arvid Norberg 2010-07-15 02:27:12 +00:00
parent e4ea683c1a
commit 21e2894a4d
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/policy.cpp
View File

@ -371,6 +371,7 @@ namespace libtorrent
void policy::erase_peer(iterator i) void policy::erase_peer(iterator i)
{ {
INVARIANT_CHECK; INVARIANT_CHECK;
TORRENT_ASSERT(i != m_peers.end());
if (m_torrent->has_picker()) if (m_torrent->has_picker())
m_torrent->picker().clear_peer(*i); m_torrent->picker().clear_peer(*i);
@ -386,18 +387,30 @@ namespace libtorrent
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6
if ((*i)->is_v6_addr) if ((*i)->is_v6_addr)
{
TORRENT_ASSERT(m_torrent->session().m_ipv6_peer_pool.is_from(
static_cast<ipv6_peer*>(*i)));
m_torrent->session().m_ipv6_peer_pool.destroy( m_torrent->session().m_ipv6_peer_pool.destroy(
static_cast<ipv6_peer*>(*i)); static_cast<ipv6_peer*>(*i));
}
else else
#endif #endif
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
if ((*i)->is_i2p_addr) if ((*i)->is_i2p_addr)
{
TORRENT_ASSERT(m_torrent->session().m_i2p_peer_pool.is_from(
static_cast<i2p_peer*>(*i)));
m_torrent->session().m_i2p_peer_pool.destroy( m_torrent->session().m_i2p_peer_pool.destroy(
static_cast<i2p_peer*>(*i)); static_cast<i2p_peer*>(*i));
}
else else
#endif #endif
{
TORRENT_ASSERT(m_torrent->session().m_ipv4_peer_pool.is_from(
static_cast<ipv4_peer*>(*i)));
m_torrent->session().m_ipv4_peer_pool.destroy( m_torrent->session().m_ipv4_peer_pool.destroy(
static_cast<ipv4_peer*>(*i)); static_cast<ipv4_peer*>(*i));
}
m_peers.erase(i); m_peers.erase(i);
} }
@ -421,8 +434,8 @@ namespace libtorrent
INVARIANT_CHECK; INVARIANT_CHECK;
int max_peerlist_size = m_torrent->is_paused() int max_peerlist_size = m_torrent->is_paused()
?m_torrent->settings().max_paused_peerlist_size ? m_torrent->settings().max_paused_peerlist_size
:m_torrent->settings().max_peerlist_size; : m_torrent->settings().max_peerlist_size;
if (max_peerlist_size == 0 || m_peers.empty()) return; if (max_peerlist_size == 0 || m_peers.empty()) return;
@ -451,6 +464,7 @@ namespace libtorrent
if (should_erase_immediately(pe)) if (should_erase_immediately(pe))
{ {
if (erase_candidate > current) --erase_candidate; if (erase_candidate > current) --erase_candidate;
TORRENT_ASSERT(current >= 0 && current < m_peers.size());
erase_peer(m_peers.begin() + current); erase_peer(m_peers.begin() + current);
} }
else else
@ -464,7 +478,10 @@ namespace libtorrent
} }
if (erase_candidate > -1) if (erase_candidate > -1)
{
TORRENT_ASSERT(erase_candidate >= 0 && erase_candidate < m_peers.size());
erase_peer(m_peers.begin() + erase_candidate); erase_peer(m_peers.begin() + erase_candidate);
}
} }
void policy::ban_peer(policy::peer* p) void policy::ban_peer(policy::peer* p)