From f3d319b6776545f044af010e3819f52b5d542a88 Mon Sep 17 00:00:00 2001 From: arvidn Date: Fri, 9 Jun 2017 21:30:36 +0200 Subject: [PATCH] fix internal use of deprecated function identify_client --- include/libtorrent/identify_client.hpp | 9 ++++++++- simulation/test_dht.cpp | 2 +- simulation/test_swarm.cpp | 4 ++-- simulation/utils.cpp | 4 ++-- src/alert.cpp | 2 +- src/identify_client.cpp | 11 ++++++++++- test/test_identify_client.cpp | 16 +++++++--------- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/include/libtorrent/identify_client.hpp b/include/libtorrent/identify_client.hpp index aa8bd5161..727aefad0 100644 --- a/include/libtorrent/identify_client.hpp +++ b/include/libtorrent/identify_client.hpp @@ -48,13 +48,20 @@ POSSIBILITY OF SUCH DAMAGE. // remove its internal use namespace libtorrent { +namespace aux { + + TORRENT_EXTRA_EXPORT + std::string identify_client_impl(const peer_id& p); + +} + // these functions don't really need to be public. This mechanism of // advertising client software and version is also out-dated. // This function can can be used to extract a string describing a client // version from its peer-id. It will recognize most clients that have this // kind of identification in the peer-id. - TORRENT_DEPRECATED_EXPORT TORRENT_DEPRECATED + TORRENT_DEPRECATED_EXPORT std::string identify_client(const peer_id& p); #ifndef TORRENT_NO_DEPRECATE diff --git a/simulation/test_dht.cpp b/simulation/test_dht.cpp index 2d4eca859..adf2fc69b 100644 --- a/simulation/test_dht.cpp +++ b/simulation/test_dht.cpp @@ -128,7 +128,7 @@ TORRENT_TEST(dht_bootstrap) else if (lt::session_stats_alert const* sa = lt::alert_cast(a)) { int const dht_nodes = lt::find_metric_idx("dht.nodes"); - TEST_CHECK(sa->values[dht_nodes] > 2); + TEST_CHECK(sa->counters()[dht_nodes] > 2); } } // terminate? diff --git a/simulation/test_swarm.cpp b/simulation/test_swarm.cpp index 3d287caf3..7abff593d 100644 --- a/simulation/test_swarm.cpp +++ b/simulation/test_swarm.cpp @@ -133,8 +133,8 @@ TORRENT_TEST(session_stats) if (!ss) return; // there's one downloading torrent - TEST_EQUAL(ss->values[downloading_idx], 1); - TEST_EQUAL(ss->values[incoming_extended_idx], 1); + TEST_EQUAL(ss->counters()[downloading_idx], 1); + TEST_EQUAL(ss->counters()[incoming_extended_idx], 1); } // terminate , [](int const ticks, lt::session& ses) -> bool diff --git a/simulation/utils.cpp b/simulation/utils.cpp index 2b8563fe5..36e4de3f0 100644 --- a/simulation/utils.cpp +++ b/simulation/utils.cpp @@ -89,8 +89,8 @@ int get_cache_size(lt::session& ses) { if (auto const* st = alert_cast(a)) { - cache_size = st->values[read_cache_idx]; - cache_size += st->values[write_cache_idx]; + cache_size = st->counters()[read_cache_idx]; + cache_size += st->counters()[write_cache_idx]; break; } } diff --git a/src/alert.cpp b/src/alert.cpp index 81e41454f..9862dedc3 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -113,7 +113,7 @@ namespace libtorrent { std::string peer_alert::message() const { return torrent_alert::message() + " peer (" + print_endpoint(endpoint) - + ", " + identify_client(pid) + ")"; + + ", " + aux::identify_client_impl(pid) + ")"; } tracker_alert::tracker_alert(aux::stack_allocator& alloc diff --git a/src/identify_client.cpp b/src/identify_client.cpp index b7f8e8351..3208e842a 100644 --- a/src/identify_client.cpp +++ b/src/identify_client.cpp @@ -367,6 +367,13 @@ namespace libtorrent { #endif std::string identify_client(peer_id const& p) + { + return aux::identify_client_impl(p); + } + +namespace aux { + + std::string identify_client_impl(peer_id const& p) { char const* PID = p.data(); @@ -424,5 +431,7 @@ namespace libtorrent { unknown += "]"; return unknown; } -} + +} // aux +} // libtorrent diff --git a/test/test_identify_client.cpp b/test/test_identify_client.cpp index ccc269c35..ec3327aa6 100644 --- a/test/test_identify_client.cpp +++ b/test/test_identify_client.cpp @@ -37,14 +37,12 @@ using namespace lt; TORRENT_TEST(identify_client) { -#ifndef TORRENT_NO_DEPRECATE - TEST_EQUAL(identify_client(peer_id("-AZ123B-............")), "Azureus 1.2.3.11"); - TEST_EQUAL(identify_client(peer_id("-AZ1230-............")), "Azureus 1.2.3"); - TEST_EQUAL(identify_client(peer_id("S123--..............")), "Shadow 1.2.3"); - TEST_EQUAL(identify_client(peer_id("S\x1\x2\x3....\0...........")), "Shadow 1.2.3"); - TEST_EQUAL(identify_client(peer_id("M1-2-3--............")), "Mainline 1.2.3"); - TEST_EQUAL(identify_client(peer_id("\0\0\0\0\0\0\0\0\0\0\0\0........")), "Generic"); - TEST_EQUAL(identify_client(peer_id("-xx1230-............")), "xx 1.2.3"); -#endif + TEST_EQUAL(aux::identify_client_impl(peer_id("-AZ123B-............")), "Azureus 1.2.3.11"); + TEST_EQUAL(aux::identify_client_impl(peer_id("-AZ1230-............")), "Azureus 1.2.3"); + TEST_EQUAL(aux::identify_client_impl(peer_id("S123--..............")), "Shadow 1.2.3"); + TEST_EQUAL(aux::identify_client_impl(peer_id("S\x1\x2\x3....\0...........")), "Shadow 1.2.3"); + TEST_EQUAL(aux::identify_client_impl(peer_id("M1-2-3--............")), "Mainline 1.2.3"); + TEST_EQUAL(aux::identify_client_impl(peer_id("\0\0\0\0\0\0\0\0\0\0\0\0........")), "Generic"); + TEST_EQUAL(aux::identify_client_impl(peer_id("-xx1230-............")), "xx 1.2.3"); }