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

verifies urls before connecting to web seeds. Fixes #301

This commit is contained in:
Arvid Norberg 2008-04-09 07:51:41 +00:00
parent ec1199fdae
commit 4eeb15c1df
1 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/torrent.cpp
View File

@ -1849,6 +1849,54 @@ namespace libtorrent
(*m_ses.m_logger) << time_now_string() << " resolving web seed: " << url << "\n"; (*m_ses.m_logger) << time_now_string() << " resolving web seed: " << url << "\n";
#endif #endif
std::string protocol;
std::string auth;
std::string hostname;
int port;
std::string path;
boost::tie(protocol, auth, hostname, port, path)
= parse_url_components(url);
#ifdef TORRENT_USE_OPENSSL
if (protocol != "http" && protocol != "https")
#else
if (protocol != "http")
#endif
{
if (m_ses.m_alerts.should_post(alert::warning))
{
m_ses.m_alerts.post_alert(
url_seed_alert(get_handle(), url, "unknown protocol"));
}
// never try it again
remove_url_seed(url);
return;
}
if (hostname.empty())
{
if (m_ses.m_alerts.should_post(alert::warning))
{
m_ses.m_alerts.post_alert(
url_seed_alert(get_handle(), url, "invalid hostname"));
}
// never try it again
remove_url_seed(url);
return;
}
if (port == 0)
{
if (m_ses.m_alerts.should_post(alert::warning))
{
m_ses.m_alerts.post_alert(
url_seed_alert(get_handle(), url, "invalid port"));
}
// never try it again
remove_url_seed(url);
return;
}
m_resolving_web_seeds.insert(url); m_resolving_web_seeds.insert(url);
proxy_settings const& ps = m_ses.web_seed_proxy(); proxy_settings const& ps = m_ses.web_seed_proxy();
if (ps.type == proxy_settings::http if (ps.type == proxy_settings::http
@ -1862,16 +1910,6 @@ namespace libtorrent
} }
else else
{ {
std::string protocol;
std::string auth;
std::string hostname;
int port;
std::string path;
boost::tie(protocol, auth, hostname, port, path)
= parse_url_components(url);
// TODO: should auth be used here?
tcp::resolver::query q(hostname, boost::lexical_cast<std::string>(port)); tcp::resolver::query q(hostname, boost::lexical_cast<std::string>(port));
m_host_resolver.async_resolve(q, m_host_resolver.async_resolve(q,
bind(&torrent::on_name_lookup, shared_from_this(), _1, _2, url bind(&torrent::on_name_lookup, shared_from_this(), _1, _2, url