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

remove unused transaction id member of DHT observers

This commit is contained in:
arvidn 2017-11-12 12:35:06 +01:00 committed by Arvid Norberg
parent d00451994b
commit 94dcd8e14b
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libtorrent/kademlia/observer.hpp
View File

@ -101,12 +101,6 @@ struct TORRENT_EXTRA_EXPORT observer
void set_id(node_id const& id); void set_id(node_id const& id);
node_id const& id() const { return m_id; } node_id const& id() const { return m_id; }
void set_transaction_id(std::uint16_t tid)
{ m_transaction_id = tid; }
std::uint16_t transaction_id() const
{ return m_transaction_id; }
static constexpr observer_flags_t flag_queried = 0_bit; static constexpr observer_flags_t flag_queried = 0_bit;
static constexpr observer_flags_t flag_initial = 1_bit; static constexpr observer_flags_t flag_initial = 1_bit;
static constexpr observer_flags_t flag_no_id = 2_bit; static constexpr observer_flags_t flag_no_id = 2_bit;
@ -141,8 +135,6 @@ private:
std::uint16_t m_port = 0; std::uint16_t m_port = 0;
// the transaction ID for this call
std::uint16_t m_transaction_id = 0;
public: public:
observer_flags_t flags{}; observer_flags_t flags{};

9
src/kademlia/rpc_manager.cpp
View File

@ -239,11 +239,11 @@ void rpc_manager::unreachable(udp::endpoint const& ep)
TORRENT_ASSERT(i->second); TORRENT_ASSERT(i->second);
if (i->second->target_ep() != ep) { ++i; continue; } if (i->second->target_ep() != ep) { ++i; continue; }
observer_ptr o = i->second; observer_ptr o = i->second;
i = m_transactions.erase(i);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
m_log->log(dht_logger::rpc_manager, "[%u] found transaction [ tid: %d ]" m_log->log(dht_logger::rpc_manager, "[%u] found transaction [ tid: %d ]"
, o->algorithm()->id(), int(o->transaction_id())); , o->algorithm()->id(), int(i->first));
#endif #endif
i = m_transactions.erase(i);
o->timeout(); o->timeout();
break; break;
} }
@ -413,7 +413,7 @@ time_duration rpc_manager::tick()
if (m_log->should_log(dht_logger::rpc_manager)) if (m_log->should_log(dht_logger::rpc_manager))
{ {
m_log->log(dht_logger::rpc_manager, "[%u] timing out transaction id: %d from: %s" m_log->log(dht_logger::rpc_manager, "[%u] timing out transaction id: %d from: %s"
, o->algorithm()->id(), o->transaction_id() , o->algorithm()->id(), i->first
, print_endpoint(o->target_ep()).c_str()); , print_endpoint(o->target_ep()).c_str());
} }
#endif #endif
@ -430,7 +430,7 @@ time_duration rpc_manager::tick()
if (m_log->should_log(dht_logger::rpc_manager)) if (m_log->should_log(dht_logger::rpc_manager))
{ {
m_log->log(dht_logger::rpc_manager, "[%u] short-timing out transaction id: %d from: %s" m_log->log(dht_logger::rpc_manager, "[%u] short-timing out transaction id: %d from: %s"
, o->algorithm()->id(), o->transaction_id() , o->algorithm()->id(), i->first
, print_endpoint(o->target_ep()).c_str()); , print_endpoint(o->target_ep()).c_str());
} }
#endif #endif
@ -484,7 +484,6 @@ bool rpc_manager::invoke(entry& e, udp::endpoint const& target_addr
} }
o->set_target(target_addr); o->set_target(target_addr);
o->set_transaction_id(tid);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (m_log != nullptr && m_log->should_log(dht_logger::rpc_manager)) if (m_log != nullptr && m_log->should_log(dht_logger::rpc_manager))