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

always check m_log before using it

This commit is contained in:
Steven Siloti 2016-07-29 13:32:28 -07:00
parent 44ce5c71e7
commit 0343bb382e
1 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kademlia/routing_table.cpp
View File

@ -670,10 +670,13 @@ routing_table::add_node_status_t routing_table::add_node_impl(node_entry e)
if (m_settings.restrict_routing_ips)
{
#ifndef TORRENT_DISABLE_LOGGING
if (m_log)
{
char hex_id[41];
aux::to_hex(reinterpret_cast<char const*>(&e.id[0]), 20, hex_id);
m_log->log(dht_logger::routing_table, "ignoring node (duplicate IP): %s %s"
, hex_id, print_address(e.addr()).c_str());
}
#endif
return failed_to_add;
}
@ -704,12 +707,15 @@ routing_table::add_node_status_t routing_table::add_node_impl(node_entry e)
// This is the same IP and port, but with a new node ID.
// This may indicate a malicious node so remove the entry.
#ifndef TORRENT_DISABLE_LOGGING
if (m_log)
{
char hex_id_new[41];
char hex_id_old[41];
aux::to_hex(e.id.data(), 20, hex_id_new);
aux::to_hex(existing->id.data(), 20, hex_id_old);
m_log->log(dht_logger::routing_table, "evicting node (changed ID): old: %s new: %s %s"
, hex_id_old, hex_id_new, print_address(e.addr()).c_str());
}
#endif
remove_node(existing, existing_bucket);
@ -798,6 +804,8 @@ routing_table::add_node_status_t routing_table::add_node_impl(node_entry e)
// close to this one. We know that it's not the same, because
// it claims a different node-ID. Ignore this to avoid attacks
#ifndef TORRENT_DISABLE_LOGGING
if (m_log)
{
char hex_id1[41];
aux::to_hex(e.id.data(), 20, hex_id1);
char hex_id2[41];
@ -805,6 +813,7 @@ routing_table::add_node_status_t routing_table::add_node_impl(node_entry e)
m_log->log(dht_logger::routing_table, "ignoring node: %s %s existing node: %s %s"
, hex_id1, print_address(e.addr()).c_str()
, hex_id2, print_address(j->addr()).c_str());
}
#endif
return failed_to_add;
}
@ -1198,6 +1207,8 @@ void routing_table::node_failed(node_id const& nid, udp::endpoint const& ep)
j->timed_out();
#ifndef TORRENT_DISABLE_LOGGING
if (m_log)
{
char hex_id[41];
aux::to_hex(nid.data(), 20, hex_id);
m_log->log(dht_logger::routing_table, "NODE FAILED id: %s ip: %s fails: %d pinged: %d up-time: %d"
@ -1205,6 +1216,7 @@ void routing_table::node_failed(node_id const& nid, udp::endpoint const& ep)
, int(j->fail_count())
, int(j->pinged())
, int(total_seconds(aux::time_now() - j->first_seen)));
}
#endif
return;
}
@ -1219,6 +1231,8 @@ void routing_table::node_failed(node_id const& nid, udp::endpoint const& ep)
j->timed_out();
#ifndef TORRENT_DISABLE_LOGGING
if (m_log)
{
char hex_id[41];
aux::to_hex(nid.data(), 20, hex_id);
m_log->log(dht_logger::routing_table, "NODE FAILED id: %s ip: %s fails: %d pinged: %d up-time: %d"
@ -1226,6 +1240,7 @@ void routing_table::node_failed(node_id const& nid, udp::endpoint const& ep)
, int(j->fail_count())
, int(j->pinged())
, int(total_seconds(aux::time_now() - j->first_seen)));
}
#endif
// if this node has failed too many times, or if this node