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

incoming connections are now prioritized over outgoing connections with the same ip

This commit is contained in:
Arvid Norberg 2006-09-27 17:17:41 +00:00
parent 362f700906
commit 411bc4895c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/torrent.cpp
View File

@ -548,9 +548,7 @@ namespace libtorrent
tcp::endpoint a(address::from_string(i->ip), i->port);
if (a.address().is_v4()
&& (m_ses.m_ip_filter.access(a.address().to_v4())
& ip_filter::blocked))
if (m_ses.m_ip_filter.access(a.address()) & ip_filter::blocked)
{
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
debug_log("blocked ip from tracker: " + i->ip);
@ -1191,8 +1189,21 @@ namespace libtorrent
assert(p != 0);
assert(!p->is_local());
if (m_connections.find(p->remote()) != m_connections.end())
throw protocol_error("already connected to peer");
std::map<tcp::endpoint, peer_connection*>::iterator c
= m_connections.find(p->remote());
if (c != m_connections.end())
{
// we already have a peer_connection to this ip.
// It may currently be waiting for completing a
// connection attempt that might fail. So,
// prioritize this current connection since
// it has already succeeded.
if (!c->second->is_connecting())
{
throw protocol_error("already connected to peer");
}
c->second->disconnect();
}
if (m_ses.m_connections.find(p->get_socket())
== m_ses.m_connections.end())