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

make the DHT log output deterministic (#1550) 

make the DHT log output use the search ID rather than a pointer value. Make random_bytes() deterministic in simulations
This commit is contained in:
Arvid Norberg 2017-01-14 22:36:25 -05:00 committed by GitHub
parent 9b30d09099
commit b52419d4d9
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/kademlia/rpc_manager.cpp
View File

@ -222,15 +222,14 @@ void rpc_manager::unreachable(udp::endpoint const& ep)
for (auto i = m_transactions.begin(); i != m_transactions.end();)
{
TORRENT_ASSERT(i->second);
observer_ptr const& o = i->second;
if (o->target_ep() != ep) { ++i; continue; }
observer_ptr ptr = i->second;
if (i->second->target_ep() != ep) { ++i; continue; }
observer_ptr o = i->second;
i = m_transactions.erase(i);
#ifndef TORRENT_DISABLE_LOGGING
m_log->log(dht_logger::rpc_manager, "found transaction [ tid: %d ]"
, int(ptr->transaction_id()));
m_log->log(dht_logger::rpc_manager, "[%u] found transaction [ tid: %d ]"
, o->algorithm()->id(), int(o->transaction_id()));
#endif
ptr->timeout();
o->timeout();
break;
}
}
@ -289,8 +288,9 @@ bool rpc_manager::incoming(msg const& m, node_id* id)
#ifndef TORRENT_DISABLE_LOGGING
if (m_log->should_log(dht_logger::rpc_manager))
{
m_log->log(dht_logger::rpc_manager, "round trip time(ms): %" PRId64 " from %s"
, total_milliseconds(now - o->sent()), print_endpoint(m.addr).c_str());
m_log->log(dht_logger::rpc_manager, "[%u] round trip time(ms): %" PRId64 " from %s"
, o->algorithm()->id(), total_milliseconds(now - o->sent())
, print_endpoint(m.addr).c_str());
}
#endif
@ -305,15 +305,16 @@ bool rpc_manager::incoming(msg const& m, node_id* id)
&& err.list_at(0).type() == bdecode_node::int_t
&& err.list_at(1).type() == bdecode_node::string_t)
{
m_log->log(dht_logger::rpc_manager, "reply with error from %s: (%" PRId64 ") %s"
m_log->log(dht_logger::rpc_manager, "[%u] reply with error from %s: (%" PRId64 ") %s"
, o->algorithm()->id()
, print_endpoint(m.addr).c_str()
, err.list_int_value_at(0)
, err.list_string_value_at(1).to_string().c_str());
}
else
{
m_log->log(dht_logger::rpc_manager, "reply with (malformed) error from %s"
, print_endpoint(m.addr).c_str());
m_log->log(dht_logger::rpc_manager, "[%u] reply with (malformed) error from %s"
, o->algorithm()->id(), print_endpoint(m.addr).c_str());
}
}
#endif
@ -354,8 +355,8 @@ bool rpc_manager::incoming(msg const& m, node_id* id)
#ifndef TORRENT_DISABLE_LOGGING
if (m_log->should_log(dht_logger::rpc_manager))
{
m_log->log(dht_logger::rpc_manager, "[%p] reply with transaction id: %d from %s"
, static_cast<void*>(o->algorithm()), int(transaction_id.size())
m_log->log(dht_logger::rpc_manager, "[%u] reply with transaction id: %d from %s"
, o->algorithm()->id(), int(transaction_id.size())
, print_endpoint(m.addr).c_str());
}
#endif
@ -396,8 +397,8 @@ time_duration rpc_manager::tick()
#ifndef TORRENT_DISABLE_LOGGING
if (m_log->should_log(dht_logger::rpc_manager))
{
m_log->log(dht_logger::rpc_manager, "[%p] timing out transaction id: %d from: %s"
, static_cast<void*>(o->algorithm()), o->transaction_id()
m_log->log(dht_logger::rpc_manager, "[%u] timing out transaction id: %d from: %s"
, o->algorithm()->id(), o->transaction_id()
, print_endpoint(o->target_ep()).c_str());
}
#endif
@ -413,8 +414,8 @@ time_duration rpc_manager::tick()
#ifndef TORRENT_DISABLE_LOGGING
if (m_log->should_log(dht_logger::rpc_manager))
{
m_log->log(dht_logger::rpc_manager, "[%p] short-timing out transaction id: %d from: %s"
, static_cast<void*>(o->algorithm()), o->transaction_id()
m_log->log(dht_logger::rpc_manager, "[%u] short-timing out transaction id: %d from: %s"
, o->algorithm()->id(), o->transaction_id()
, print_endpoint(o->target_ep()).c_str());
}
#endif
@ -473,8 +474,8 @@ bool rpc_manager::invoke(entry& e, udp::endpoint const& target_addr
#ifndef TORRENT_DISABLE_LOGGING
if (m_log != nullptr && m_log->should_log(dht_logger::rpc_manager))
{
m_log->log(dht_logger::rpc_manager, "[%p] invoking %s -> %s"
, static_cast<void*>(o->algorithm()), e["q"].string().c_str()
m_log->log(dht_logger::rpc_manager, "[%u] invoking %s -> %s"
, o->algorithm()->id(), e["q"].string().c_str()
, print_endpoint(target_addr).c_str());
}
#endif

14
src/random.cpp
View File

@ -68,14 +68,24 @@ namespace libtorrent
void random_bytes(span<char> buffer)
{
#if TORRENT_USE_CRYPTOAPI
#ifdef TORRENT_BUILD_SIMULATOR
// simulator
for (auto& b : buffer) b = char(random(0xff));
#elif TORRENT_USE_CRYPTOAPI
// windows
aux::crypt_gen_random(buffer);
#elif defined TORRENT_USE_LIBCRYPTO
// openssl
#ifdef TORRENT_MACOS_DEPRECATED_LIBCRYPTO
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
int r = RAND_bytes(reinterpret_cast<unsigned char*>(buffer.data())
, int(buffer.size()));
if (r != 1)
@ -90,6 +100,8 @@ namespace libtorrent
#pragma clang diagnostic pop
#endif
#else
// fallback
for (auto& b : buffer) b = char(random(0xff));
#endif
}