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

fixed prioritization on connections, incomming connections are now prioritized over outgoing pending connections.

This commit is contained in:
Arvid Norberg 2006-09-28 13:27:34 +00:00
parent c687c428c4
commit 861220b233
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/policy.cpp
View File

@ -909,7 +909,33 @@ namespace libtorrent
, m_peers.end() , m_peers.end()
, match_peer_ip(c.remote())); , match_peer_ip(c.remote()));
if (i == m_peers.end())
if (i != m_peers.end())
{
if (i->banned)
throw protocol_error("ip address banned, closing");
if (i->connection != 0)
{
// the new connection is a local (outgoing) connection
// or the current one is already connected
if (!i->connection->is_connecting() || c.is_local())
{
throw protocol_error("duplicate connection, closing");
}
else
{
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
m_torrent->debug_log("duplicate connection. existing connection"
" is connecting and this connection is incoming. closing existing "
"connection in favour of this one");
#endif
i->connection->disconnect();
i->connection = 0;
}
}
}
else
{ {
using namespace boost::posix_time; using namespace boost::posix_time;
using namespace boost::gregorian; using namespace boost::gregorian;
@ -923,13 +949,6 @@ namespace libtorrent
m_peers.push_back(p); m_peers.push_back(p);
i = m_peers.end()-1; i = m_peers.end()-1;
} }
else
{
if (i->connection != 0)
throw protocol_error("duplicate connection, closing");
if (i->banned)
throw protocol_error("ip address banned, closing");
}
assert(i->connection == 0); assert(i->connection == 0);
c.add_stat(i->prev_amount_download, i->prev_amount_upload); c.add_stat(i->prev_amount_download, i->prev_amount_upload);