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

fix bug in peer list when hitting the upper size limit

This commit is contained in:
Arvid Norberg 2011-05-16 16:37:37 +00:00
parent 6e23b9f5a6
commit 24f72b2045
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/policy.cpp
View File

@ -769,6 +769,13 @@ namespace libtorrent
if (iter != m_peers.end() && (*iter)->address() == c.remote().address()) found = true; if (iter != m_peers.end() && (*iter)->address() == c.remote().address()) found = true;
} }
// make sure the iterator we got is properly sorted relative
// to the connection's address
// TORRENT_ASSERT(m_peers.empty()
// || (iter == m_peers.end() && (*(iter-1))->address() < c.remote().address())
// || (iter != m_peers.end() && c.remote().address() < (*iter)->address())
// || (iter != m_peers.end() && iter != m_peers.begin() && (*(iter-1))->address() < c.remote().address()));
if (found) if (found)
{ {
i = *iter; i = *iter;
@ -848,12 +855,18 @@ namespace libtorrent
if (int(m_peers.size()) >= m_torrent->settings().max_peerlist_size) if (int(m_peers.size()) >= m_torrent->settings().max_peerlist_size)
{ {
// this may invalidate our iterator!
erase_peers(); erase_peers();
if (int(m_peers.size()) >= m_torrent->settings().max_peerlist_size) if (int(m_peers.size()) >= m_torrent->settings().max_peerlist_size)
{ {
c.disconnect(errors::too_many_connections); c.disconnect(errors::too_many_connections);
return false; return false;
} }
// restore it
iter = std::lower_bound(
m_peers.begin(), m_peers.end()
, c.remote().address(), peer_address_compare()
);
} }
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6