Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lt bugs 145 and 122

Browse Source
This commit is contained in:
Marcos Pinto 2007-09-04 18:42:53 +00:00
parent 2214834d2b
commit c746457629
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtorrent/src/peer_connection.cpp
View File

@ -948,7 +948,7 @@ namespace libtorrent
// if this is a web seed. we don't have a peer_info struct // if this is a web seed. we don't have a peer_info struct
if (m_peer_info) m_peer_info->seed = true; if (m_peer_info) m_peer_info->seed = true;
// if we're a seed too, disconnect // if we're a seed too, disconnect
if (t->is_seed()) if (t->is_finished())
{ {
throw protocol_error("seed to seed connection redundant, disconnecting"); throw protocol_error("seed to seed connection redundant, disconnecting");
} }

5
libtorrent/src/policy.cpp
View File

@ -516,6 +516,7 @@ namespace libtorrent
int max_failcount = m_torrent->settings().max_failcount; int max_failcount = m_torrent->settings().max_failcount;
int min_reconnect_time = m_torrent->settings().min_reconnect_time; int min_reconnect_time = m_torrent->settings().min_reconnect_time;
bool finished = m_torrent->is_finished();
aux::session_impl& ses = m_torrent->session(); aux::session_impl& ses = m_torrent->session();
@ -524,7 +525,7 @@ namespace libtorrent
if (i->connection) continue; if (i->connection) continue;
if (i->banned) continue; if (i->banned) continue;
if (i->type == peer::not_connectable) continue; if (i->type == peer::not_connectable) continue;
if (i->seed && m_torrent->is_seed()) continue; if (i->seed && finished) continue;
if (i->failcount >= max_failcount) continue; if (i->failcount >= max_failcount) continue;
if (now - i->connected < seconds(i->failcount * min_reconnect_time)) if (now - i->connected < seconds(i->failcount * min_reconnect_time))
continue; continue;
@ -1179,7 +1180,7 @@ namespace libtorrent
&& m_torrent->session().num_uploads() < m_torrent->session().max_uploads() && m_torrent->session().num_uploads() < m_torrent->session().max_uploads()
&& (m_torrent->ratio() == 0 && (m_torrent->ratio() == 0
|| c.share_diff() >= -free_upload_amount || c.share_diff() >= -free_upload_amount
|| m_torrent->is_seed())) || m_torrent->is_finished()))
{ {
m_torrent->session().unchoke_peer(c); m_torrent->session().unchoke_peer(c);
} }

23
libtorrent/src/session_impl.cpp
View File

@ -785,9 +785,30 @@ namespace detail
} }
return; return;
} }
// check if we have any active torrents
// if we don't reject the connection
if (m_torrents.empty())
{
return;
}
else
{
bool has_active_torrent = false;
for (torrent_map::iterator i = m_torrents.begin()
, end(m_torrents.end()); i != end; ++i)
{
if (!i->second->is_paused())
{
has_active_torrent = true;
break;
}
}
if (!has_active_torrent)
return;
}
boost::intrusive_ptr<peer_connection> c( boost::intrusive_ptr<peer_connection> c(
new bt_peer_connection(*this, s, 0)); new bt_peer_connection(*this, s, 0));
#ifndef NDEBUG #ifndef NDEBUG
c->m_in_constructor = false; c->m_in_constructor = false;
#endif #endif