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

polish removal of web seeds logic

This commit is contained in:
arvidn 2015-08-23 11:01:55 +02:00
parent be2b1d3991
commit 82a3683f7d
2 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libtorrent/torrent.hpp
View File

@ -1240,8 +1240,10 @@ namespace libtorrent
void setup_peer_class();
// The list of web seeds in this torrent. Seeds
// with fatal errors are removed from the set
// The list of web seeds in this torrent. Seeds with fatal errors are
// removed from the set. It's important that iteratores are not
// invalidated as entries are added and removed from this list, hence the
// std::list
std::list<web_seed_t> m_web_seeds;
#ifndef TORRENT_DISABLE_EXTENSIONS

34
src/torrent.cpp
View File

@ -6023,8 +6023,13 @@ namespace libtorrent
if (web->resolving)
{
web->removed = true;
return;
}
else
{
#ifndef TORRENT_DISABLE_LOGGING
debug_log("removing web seed: \"%s\"", web->url.c_str());
#endif
peer_connection* peer = static_cast<peer_connection*>(web->peer_info.connection);
if (peer)
{
@ -6038,6 +6043,8 @@ namespace libtorrent
if (has_picker()) picker().clear_peer(&web->peer_info);
m_web_seeds.erase(web);
}
update_want_tick();
}
@ -7080,6 +7087,7 @@ namespace libtorrent
for (std::list<web_seed_t>::const_iterator i = m_web_seeds.begin()
, end(m_web_seeds.end()); i != end; ++i)
{
if (i->removed) continue;
if (i->type == web_seed_entry::url_seed)
url_list.push_back(i->url);
else if (i->type == web_seed_entry::http_seed)
@ -10111,6 +10119,7 @@ namespace libtorrent
if (w->peer_info.connection) continue;
if (w->retry > aux::time_now()) continue;
if (w->resolving) continue;
if (w->removed) continue;
connect_to_url_seed(w);
}
@ -10928,6 +10937,7 @@ namespace libtorrent
, end(m_web_seeds.end()); i != end; ++i)
{
if (i->peer_info.banned) continue;
if (i->removed) continue;
if (i->type != type) continue;
ret.insert(i->url);
}
@ -10940,6 +10950,7 @@ namespace libtorrent
, m_web_seeds.end()
, (boost::bind(&web_seed_t::url, _1)
== url && boost::bind(&web_seed_t::type, _1) == type));
if (i != m_web_seeds.end()) remove_web_seed(i);
}
@ -10957,9 +10968,6 @@ namespace libtorrent
TORRENT_ASSERT(i->resolving == false);
#ifndef TORRENT_DISABLE_LOGGING
debug_log("disconnect web seed: \"%s\"", i->url.c_str());
#endif
TORRENT_ASSERT(i->peer_info.connection);
i->peer_info.connection = 0;
}
@ -10973,11 +10981,18 @@ namespace libtorrent
, boost::bind(&web_seed_t::peer_info, _1)) == p);
TORRENT_ASSERT(i != m_web_seeds.end());
if (i == m_web_seeds.end()) return;
if (i->peer_info.connection) i->peer_info.connection->disconnect(ec, op, error);
if (has_picker()) picker().clear_peer(&i->peer_info);
m_web_seeds.erase(i);
update_want_tick();
m_need_save_resume_data = true;
peer_connection* peer = static_cast<peer_connection*>(i->peer_info.connection);
if (peer)
{
// if we have a connection for this web seed, we also need to
// disconnect it and clear its reference to the peer_info object
// that's part of the web_seed_t we're about to remove
TORRENT_ASSERT(peer->m_in_use == 1337);
peer->disconnect(ec, op, error);
peer->set_peer_info(0);
}
remove_web_seed(i);
}
void torrent::retry_web_seed(peer_connection* p, int retry)
@ -10990,6 +11005,7 @@ namespace libtorrent
TORRENT_ASSERT(i != m_web_seeds.end());
if (i == m_web_seeds.end()) return;
if (i->removed) return;
if (retry == 0) retry = settings().get_int(settings_pack::urlseed_wait_retry);
i->retry = aux::time_now() + seconds(retry);
}