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

improve name of m_timer in dht_tracker

This commit is contained in:
arvidn 2016-01-01 16:42:23 -05:00
parent 01e6b93854
commit e3ba811ae4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/kademlia/dht_tracker.hpp
View File

@ -157,7 +157,7 @@ namespace libtorrent { namespace dht
std::vector<char> m_send_buf; std::vector<char> m_send_buf;
dos_blocker m_blocker; dos_blocker m_blocker;
deadline_timer m_timer; deadline_timer m_key_refresh_timer;
deadline_timer m_connection_timer; deadline_timer m_connection_timer;
deadline_timer m_refresh_timer; deadline_timer m_refresh_timer;
dht_settings const& m_settings; dht_settings const& m_settings;

8
src/kademlia/dht_tracker.cpp
View File

@ -98,7 +98,7 @@ namespace libtorrent { namespace dht
, m_dht(this, settings, extract_node_id(state), observer, cnt, storage_constructor) , m_dht(this, settings, extract_node_id(state), observer, cnt, storage_constructor)
, m_sock(sock) , m_sock(sock)
, m_log(observer) , m_log(observer)
, m_timer(sock.get_io_service()) , m_key_refresh_timer(sock.get_io_service())
, m_connection_timer(sock.get_io_service()) , m_connection_timer(sock.get_io_service())
, m_refresh_timer(sock.get_io_service()) , m_refresh_timer(sock.get_io_service())
, m_settings(settings) , m_settings(settings)
@ -145,7 +145,7 @@ namespace libtorrent { namespace dht
{ {
m_abort = true; m_abort = true;
error_code ec; error_code ec;
m_timer.cancel(ec); m_key_refresh_timer.cancel(ec);
m_connection_timer.cancel(ec); m_connection_timer.cancel(ec);
m_refresh_timer.cancel(ec); m_refresh_timer.cancel(ec);
m_host_resolver.cancel(); m_host_resolver.cancel();
@ -200,8 +200,8 @@ namespace libtorrent { namespace dht
if (e || m_abort) return; if (e || m_abort) return;
error_code ec; error_code ec;
m_timer.expires_from_now(key_refresh, ec); m_key_refresh_timer.expires_from_now(key_refresh, ec);
m_timer.async_wait(boost::bind(&dht_tracker::refresh_key, self(), _1)); m_key_refresh_timer.async_wait(boost::bind(&dht_tracker::refresh_key, self(), _1));
m_dht.new_write_key(); m_dht.new_write_key();
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING