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

merged changes from RC_0_16

This commit is contained in:
Arvid Norberg 2014-03-07 19:19:17 +00:00
parent b889bc6dc6
commit 3c47177bfe
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -41,6 +41,7 @@
* fix uTP edge case where udp socket buffer fills up * fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP * fix nagle implementation in uTP
* fix debug logging for banning web seeds
* improve support for de-selected files in full allocation mode * improve support for de-selected files in full allocation mode
* fix dht_bootstrap_alert being posted * fix dht_bootstrap_alert being posted
* SetFileValidData fix on windows (prevents zero-fill) * SetFileValidData fix on windows (prevents zero-fill)

14
src/torrent.cpp
View File

@ -4610,6 +4610,10 @@ namespace libtorrent
if (ps.type == proxy_settings::http if (ps.type == proxy_settings::http
|| ps.type == proxy_settings::http_pw) || ps.type == proxy_settings::http_pw)
{ {
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
debug_log("resolving proxy for web seed: %s", web->url.c_str());
#endif
// use proxy // use proxy
web->resolving = true; 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);
@ -4624,6 +4628,10 @@ namespace libtorrent
} }
else else
{ {
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
debug_log("resolving web seed: %s", web->url.c_str());
#endif
web->resolving = true; web->resolving = true;
tcp::resolver::query q(hostname, to_string(port).elems); tcp::resolver::query q(hostname, to_string(port).elems);
m_host_resolver.async_resolve(q, m_host_resolver.async_resolve(q,
@ -4762,11 +4770,15 @@ namespace libtorrent
return; return;
} }
tcp::endpoint a(host->endpoint());
// fill in the peer struct's address field
web->endpoint = a;
if (int(m_connections.size()) >= m_max_connections if (int(m_connections.size()) >= m_max_connections
|| m_ses.num_connections() >= m_ses.settings().connections_limit) || m_ses.num_connections() >= m_ses.settings().connections_limit)
return; return;
tcp::endpoint a(host->endpoint());
connect_web_seed(web, a); connect_web_seed(web, a);
} }