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

some reordering and asserts around web seed name resolution

This commit is contained in:
Arvid Norberg 2010-10-30 07:11:04 +00:00
parent 2e05dc765a
commit 0dbef9103a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/torrent.hpp
View File

@ -359,6 +359,9 @@ namespace libtorrent
// or with something incorrect, so that we removed the web seed
// immediately, before we disconnected
if (i == m_web_seeds.end()) return;
TORRENT_ASSERT(i->resolving == false);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
(*m_ses.m_logger) << time_now_string() << " disconnect_web_seed: " << i->url << "\n";
#endif

21
src/torrent.cpp
View File

@ -3398,12 +3398,6 @@ namespace libtorrent
return;
}
if (web->endpoint.port() != 0)
{
connect_web_seed(web, web->endpoint);
return;
}
if (m_ses.m_port_filter.access(port) & port_filter::blocked)
{
if (m_ses.m_alerts.should_post<url_seed_alert>())
@ -3416,6 +3410,12 @@ namespace libtorrent
return;
}
if (web->endpoint.port() != 0)
{
connect_web_seed(web, web->endpoint);
return;
}
web->resolving = true;
proxy_settings const& ps = m_ses.proxy();
if (ps.type == proxy_settings::http
@ -3511,6 +3511,7 @@ namespace libtorrent
INVARIANT_CHECK;
TORRENT_ASSERT(web->resolving == true);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
(*m_ses.m_logger) << time_now_string() << " completed resolve: " << web->url << "\n";
#endif
@ -3545,6 +3546,9 @@ namespace libtorrent
return;
}
TORRENT_ASSERT(web->resolving == false);
TORRENT_ASSERT(web->connection == 0);
web->endpoint = a;
if (is_paused()) return;
@ -3635,11 +3639,12 @@ namespace libtorrent
TORRENT_ASSERT(!web->connection);
web->connection = c.get();
c->start();
#if defined TORRENT_VERBOSE_LOGGING
(*m_ses.m_logger) << time_now_string() << " web seed connection started " << web->url << "\n";
#endif
c->start();
m_ses.m_half_open.enqueue(
boost::bind(&peer_connection::on_connect, c, _1)
, boost::bind(&peer_connection::on_timeout, c)