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

connect candidate counter fix

This commit is contained in:
Arvid Norberg 2009-06-26 05:58:24 +00:00
parent c349203074
commit 356db54dce
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/policy.cpp
View File

@ -728,8 +728,6 @@ namespace libtorrent
if (iter != m_peers.end() && (*iter)->address() == c.remote().address()) found = true;
}
bool was_conn_cand = false;
if (found)
{
i = *iter;
@ -740,8 +738,6 @@ namespace libtorrent
return false;
}
was_conn_cand = is_connect_candidate(*i, m_finished);
if (i->connection != 0)
{
boost::shared_ptr<socket_type> other_socket
@ -790,6 +786,13 @@ namespace libtorrent
i->connection->disconnect(error_code(errors::duplicate_peer_id, libtorrent_category));
}
}
if (is_connect_candidate(*i, m_finished))
{
m_num_connect_candidates--;
TORRENT_ASSERT(m_num_connect_candidates >= 0);
if (m_num_connect_candidates < 0) m_num_connect_candidates = 0;
}
}
else
{
@ -852,12 +855,8 @@ namespace libtorrent
if (!c.fast_reconnect())
i->last_connected = session_time;
if (was_conn_cand != is_connect_candidate(*i, m_finished))
{
m_num_connect_candidates += was_conn_cand ? -1 : 1;
TORRENT_ASSERT(m_num_connect_candidates >= 0);
if (m_num_connect_candidates < 0) m_num_connect_candidates = 0;
}
// this cannot be a connect candidate anymore, since i->connection is set
TORRENT_ASSERT(!is_connect_candidate(*i, m_finished));
return true;
}
@ -1287,6 +1286,7 @@ namespace libtorrent
if (p == 0) return;
TORRENT_ASSERT(p->connection == &c);
TORRENT_ASSERT(!is_connect_candidate(*p, m_finished));
p->connection = 0;
p->optimistically_unchoked = false;