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

fix web seed race condition when using a proxy

This commit is contained in:
Arvid Norberg 2011-09-30 09:09:33 +00:00
parent d535e6b1ee
commit f20a63e817
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/torrent.cpp
View File

@ -4437,6 +4437,7 @@ ctx->set_verify_callback(verify_function, ec);
|| ps.type == proxy_settings::http_pw) || ps.type == proxy_settings::http_pw)
{ {
// use proxy // use proxy
web->resolving = true;
tcp::resolver::query q(ps.hostname, to_string(ps.port).elems); tcp::resolver::query q(ps.hostname, to_string(ps.port).elems);
m_ses.m_host_resolver.async_resolve(q, m_ses.m_host_resolver.async_resolve(q,
boost::bind(&torrent::on_proxy_name_lookup, shared_from_this(), _1, _2, web)); boost::bind(&torrent::on_proxy_name_lookup, shared_from_this(), _1, _2, web));
@ -4464,11 +4465,22 @@ ctx->set_verify_callback(verify_function, ec);
INVARIANT_CHECK; INVARIANT_CHECK;
TORRENT_ASSERT(web->resolving == true);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
(*m_ses.m_logger) << time_now_string() << " completed resolve proxy hostname for: " << web->url << "\n"; (*m_ses.m_logger) << time_now_string() << " completed resolve proxy hostname for: " << web->url << "\n";
if (e) if (e)
*m_ses.m_logger << time_now_string() << " on_proxy_name_lookup: " << e.message() << "\n"; *m_ses.m_logger << time_now_string() << " on_proxy_name_lookup: " << e.message() << "\n";
#endif #endif
web->resolving = false;
if (web->removed)
{
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
(*m_ses.m_logger) << time_now_string() << " removed web seed\n";
#endif
remove_web_seed(web);
return;
}
if (m_abort) return; if (m_abort) return;