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

introduced an extra invariant check in policy to make sure peers are unique

This commit is contained in:
Arvid Norberg 2007-05-12 20:25:44 +00:00
parent 57d5cf9147
commit f5c449837f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/policy.cpp
View File

@ -1340,10 +1340,12 @@ namespace libtorrent
int total_connections = 0; int total_connections = 0;
int nonempty_connections = 0; int nonempty_connections = 0;
std::set<address> unique_test;
for (const_iterator i = m_peers.begin(); for (const_iterator i = m_peers.begin();
i != m_peers.end(); ++i) i != m_peers.end(); ++i)
{ {
assert(unique_test.find(i->ip.address()) == unique_test.end());
unique_test.insert(i->ip.address());
++total_connections; ++total_connections;
if (!i->connection) continue; if (!i->connection) continue;
assert(i->connection->peer_info_struct() == 0 assert(i->connection->peer_info_struct() == 0
@ -1381,9 +1383,6 @@ namespace libtorrent
&& connected_peers > 0) && connected_peers > 0)
|| (connected_peers + 1 == num_torrent_peers || (connected_peers + 1 == num_torrent_peers
&& num_torrent_peers > 0)); && num_torrent_peers > 0));
// TODO: Make sure the number of peers in m_torrent is equal
// to the number of connected peers in m_peers.
} }
#endif #endif

6
src/torrent.cpp
View File

@ -1693,7 +1693,11 @@ namespace libtorrent
assert(peerinfo); assert(peerinfo);
assert(peerinfo->connection == 0); assert(peerinfo->connection == 0);
assert(m_connections.find(peerinfo->ip) == m_connections.end()); #ifndef NDEBUG
peer_iterator i_ = m_connections.find(peerinfo->ip);
assert(i_ == m_connections.end()
|| (i_->second->is_disconnecting()));
#endif
assert(want_more_peers()); assert(want_more_peers());