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

close connection in upnp::on_upnp_xml and added abort/closing returns

This commit is contained in:
Alden Torres 2017-10-16 16:51:41 -04:00 committed by Arvid Norberg
parent ee9e0abb1a
commit 74ecf63906
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http_connection.cpp
View File

@ -882,6 +882,8 @@ void http_connection::on_assign_bandwidth(error_code const& e)
m_limiter_timer_active = false; m_limiter_timer_active = false;
if (e) return; if (e) return;
if (m_abort) return;
if (m_download_quota > 0) return; if (m_download_quota > 0) return;
m_download_quota = m_rate_limit / 4; m_download_quota = m_rate_limit / 4;

5
src/upnp.cpp
View File

@ -955,6 +955,8 @@ void upnp::on_upnp_xml(error_code const& e
d.upnp_connection.reset(); d.upnp_connection.reset();
} }
if (m_closing) return;
if (e && e != boost::asio::error::eof) if (e && e != boost::asio::error::eof)
{ {
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
@ -1059,6 +1061,7 @@ void upnp::on_upnp_xml(error_code const& e
return; return;
} }
if (d.upnp_connection) d.upnp_connection->close();
d.upnp_connection = std::make_shared<http_connection>(m_io_service d.upnp_connection = std::make_shared<http_connection>(m_io_service
, m_resolver , m_resolver
, std::bind(&upnp::on_upnp_get_ip_address_response, self(), _1, _2 , std::bind(&upnp::on_upnp_get_ip_address_response, self(), _1, _2
@ -1566,6 +1569,8 @@ void upnp::on_expire(error_code const& ec)
COMPLETE_ASYNC("upnp::on_expire"); COMPLETE_ASYNC("upnp::on_expire");
if (ec) return; if (ec) return;
if (m_closing) return;
time_point const now = aux::time_now(); time_point const now = aux::time_now();
time_point next_expire = max_time(); time_point next_expire = max_time();