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

increase default tracker timeout

This commit is contained in:
arvidn 2020-04-23 13:18:40 +02:00 committed by Arvid Norberg
parent 83d8de9123
commit 79191c3be3
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* increase default tracker timeout
* retry failed socks5 server connections * retry failed socks5 server connections
* allow UPnP lease duration to be changed after device discovery * allow UPnP lease duration to be changed after device discovery
* fix IPv6 address change detection on Windows * fix IPv6 address change detection on Windows

1
include/libtorrent/http_connection.hpp
View File

@ -178,7 +178,6 @@ private:
http_filter_handler m_filter_handler; http_filter_handler m_filter_handler;
deadline_timer m_timer; deadline_timer m_timer;
time_duration m_read_timeout;
time_duration m_completion_timeout; time_duration m_completion_timeout;
// the timer fires every 250 millisecond as long // the timer fires every 250 millisecond as long

14
src/http_connection.cpp
View File

@ -83,7 +83,6 @@ http_connection::http_connection(io_service& ios
, m_connect_handler(ch) , m_connect_handler(ch)
, m_filter_handler(fh) , m_filter_handler(fh)
, m_timer(ios) , m_timer(ios)
, m_read_timeout(seconds(5))
, m_completion_timeout(seconds(5)) , m_completion_timeout(seconds(5))
, m_limiter_timer(ios) , m_limiter_timer(ios)
, m_last_receive(aux::time_now()) , m_last_receive(aux::time_now())
@ -236,11 +235,8 @@ void http_connection::start(std::string const& hostname, int port
std::shared_ptr<http_connection> me(shared_from_this()); std::shared_ptr<http_connection> me(shared_from_this());
m_completion_timeout = timeout; m_completion_timeout = timeout;
m_read_timeout = seconds(5);
if (m_read_timeout < timeout / 5) m_read_timeout = timeout / 5;
error_code ec; error_code ec;
m_timer.expires_from_now(std::min( m_timer.expires_from_now(m_completion_timeout, ec);
m_read_timeout, m_completion_timeout), ec);
ADD_OUTSTANDING_ASYNC("http_connection::on_timeout"); ADD_OUTSTANDING_ASYNC("http_connection::on_timeout");
m_timer.async_wait(std::bind(&http_connection::on_timeout m_timer.async_wait(std::bind(&http_connection::on_timeout
, std::weak_ptr<http_connection>(me), _1)); , std::weak_ptr<http_connection>(me), _1));
@ -290,7 +286,6 @@ void http_connection::start(std::string const& hostname, int port
// quadruple the timeout for i2p destinations // quadruple the timeout for i2p destinations
// because i2p is sloooooow // because i2p is sloooooow
m_completion_timeout *= 4; m_completion_timeout *= 4;
m_read_timeout *= 4;
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
if (i2p_conn->proxy().type != settings_pack::i2p_proxy) if (i2p_conn->proxy().type != settings_pack::i2p_proxy)
@ -401,8 +396,7 @@ void http_connection::on_timeout(std::weak_ptr<http_connection> p
time_point const now = clock_type::now(); time_point const now = clock_type::now();
if (c->m_start_time + c->m_completion_timeout <= now if (c->m_start_time + c->m_completion_timeout <= now)
|| c->m_last_receive + c->m_read_timeout <= now)
{ {
// the connection timed out. If we have more endpoints to try, just // the connection timed out. If we have more endpoints to try, just
// close this connection. The on_connect handler will try the next // close this connection. The on_connect handler will try the next
@ -432,9 +426,7 @@ void http_connection::on_timeout(std::weak_ptr<http_connection> p
ADD_OUTSTANDING_ASYNC("http_connection::on_timeout"); ADD_OUTSTANDING_ASYNC("http_connection::on_timeout");
error_code ec; error_code ec;
c->m_timer.expires_at(std::min( c->m_timer.expires_at(c->m_start_time + c->m_completion_timeout, ec);
c->m_last_receive + c->m_read_timeout
, c->m_start_time + c->m_completion_timeout), ec);
c->m_timer.async_wait(std::bind(&http_connection::on_timeout, p, _1)); c->m_timer.async_wait(std::bind(&http_connection::on_timeout, p, _1));
} }