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

expand tracker unit test to assert the session correctly receives the right peers

This commit is contained in:
arvidn 2015-08-29 16:04:35 -04:00
parent 5757b0ad13
commit 0f760d3fb4
5 changed files with 114 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/peer_info.hpp
View File

@ -404,7 +404,7 @@ namespace libtorrent
// bw_state enum.
char read_state;
char write_state;
// the two letter `ISO 3166 country code`__ for the country the peer is
// connected from. If the country hasn't been resolved yet, both chars
// are set to 0. If the resolution failed for some reason, the field is
@ -441,7 +441,7 @@ namespace libtorrent
{
banned = 1
};
// internal
tcp::endpoint ip;
// internal

2
src/http_tracker_connection.cpp
View File

@ -510,7 +510,7 @@ namespace libtorrent
p.hostname = base32encode(std::string(peers + i, 32), string::i2p);
p.hostname += ".b32.i2p";
p.port = 6881;
resp.peers.push_back (p);
resp.peers.push_back(p);
}
}
else

4
test/settings.cpp
View File

@ -59,6 +59,10 @@ libtorrent::settings_pack settings()
pack.set_int(settings_pack::aio_threads, 0);
#endif
#ifndef TORRENT_NO_DEPRECATE
pack.set_int(settings_pack::half_open_limit, 1);
#endif
return pack;
}

127
test/test_tracker.cpp
View File

@ -33,7 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
#include "test.hpp"
#include "setup_transfer.hpp"
#include "udp_tracker.hpp"
#include "settings.hpp"
#include "libtorrent/alert.hpp"
#include "libtorrent/peer_info.hpp" // for peer_list_entry
#include "libtorrent/broadcast_socket.hpp" // for supports_ipv6
#include "libtorrent/alert_types.hpp"
#include "libtorrent/session.hpp"
#include "libtorrent/error_code.hpp"
#include "libtorrent/tracker_manager.hpp"
@ -306,10 +310,6 @@ TORRENT_TEST(extract_peer)
}
}
int const alert_mask = alert::all_categories
& ~alert::progress_notification
& ~alert::stats_notification;
TORRENT_TEST(udp_tracker)
{
int http_port = start_web_server();
@ -317,17 +317,9 @@ TORRENT_TEST(udp_tracker)
int prev_udp_announces = num_udp_announces();
settings_pack pack;
#ifndef TORRENT_NO_DEPRECATE
pack.set_int(settings_pack::half_open_limit, 1);
#endif
pack.set_bool(settings_pack::enable_lsd, false);
pack.set_bool(settings_pack::enable_natpmp, false);
pack.set_bool(settings_pack::enable_upnp, false);
pack.set_bool(settings_pack::enable_dht, false);
settings_pack pack = settings();
pack.set_bool(settings_pack::announce_to_all_trackers, true);
pack.set_bool(settings_pack::announce_to_all_tiers, true);
pack.set_int(settings_pack::alert_mask, alert_mask);
pack.set_str(settings_pack::listen_interfaces, "0.0.0.0:48875");
boost::scoped_ptr<lt::session> s(new lt::session(pack));
@ -393,31 +385,23 @@ TORRENT_TEST(udp_tracker)
TEST_EQUAL(num_udp_announces(), prev_udp_announces + 2);
}
TORRENT_TEST(try_next)
{
// ========================================
// test that we move on to try the next tier if the first one fails
// ========================================
TORRENT_TEST(try_next)
{
int http_port = start_web_server();
int udp_port = start_udp_tracker();
int prev_udp_announces = num_udp_announces();
settings_pack pack;
#ifndef TORRENT_NO_DEPRECATE
pack.set_int(settings_pack::half_open_limit, 1);
#endif
pack.set_bool(settings_pack::enable_lsd, false);
pack.set_bool(settings_pack::enable_natpmp, false);
pack.set_bool(settings_pack::enable_upnp, false);
pack.set_bool(settings_pack::enable_dht, false);
settings_pack pack = settings();
pack.set_bool(settings_pack::announce_to_all_trackers, true);
pack.set_bool(settings_pack::announce_to_all_tiers, false);
pack.set_int(settings_pack::tracker_completion_timeout, 2);
pack.set_int(settings_pack::tracker_receive_timeout, 1);
pack.set_str(settings_pack::listen_interfaces, "0.0.0.0:39775");
pack.set_int(settings_pack::alert_mask, alert_mask);
boost::scoped_ptr<lt::session> s(new lt::session(pack));
@ -467,6 +451,33 @@ TORRENT_TEST(try_next)
test_sleep(100);
}
// we expect the first two trackers to have failed (because the hostname
// doesn't exist and the port isn't open),
// the second tracker to have succeeded and the third to not have been used
std::vector<announce_entry> tr = h.trackers();
TEST_EQUAL(tr.size(), 4);
if (tr.size() == 4)
{
// this tracker may not have failed yet, but just timed out (if the
// hostname lookup is slow)
if (tr[0].fails == 1)
{
TEST_EQUAL(tr[0].verified, false);
TEST_EQUAL(tr[0].last_error, boost::asio::error::netdb_errors::host_not_found);
}
TEST_EQUAL(tr[1].fails, 1);
TEST_EQUAL(tr[1].verified, false);
TEST_EQUAL(tr[1].last_error, boost::asio::error::timed_out);
TEST_EQUAL(tr[2].fails, 0);
TEST_EQUAL(tr[2].verified, true);
TEST_EQUAL(tr[3].fails, 0);
TEST_EQUAL(tr[3].verified, false);
}
test_sleep(1000);
TEST_EQUAL(num_udp_announces(), prev_udp_announces + 1);
@ -482,3 +493,71 @@ TORRENT_TEST(try_next)
fprintf(stderr, "done\n");
}
TORRENT_TEST(http_peers)
{
int http_port = start_web_server();
settings_pack pack = settings();
pack.set_bool(settings_pack::announce_to_all_trackers, true);
pack.set_bool(settings_pack::announce_to_all_tiers, false);
pack.set_int(settings_pack::tracker_completion_timeout, 2);
pack.set_int(settings_pack::tracker_receive_timeout, 1);
pack.set_str(settings_pack::listen_interfaces, "0.0.0.0:39775");
boost::scoped_ptr<lt::session> s(new lt::session(pack));
error_code ec;
remove_all("tmp2_tracker", ec);
create_directory("tmp2_tracker", ec);
std::ofstream file(combine_path("tmp2_tracker", "temporary").c_str());
boost::shared_ptr<torrent_info> t = ::create_torrent(&file, 16 * 1024, 13, false);
file.close();
char tracker_url[200];
// and this should not be announced to (since the one before it succeeded)
snprintf(tracker_url, sizeof(tracker_url), "http://127.0.0.1:%d/announce"
, http_port);
t->add_tracker(tracker_url, 0);
add_torrent_params addp;
addp.flags &= ~add_torrent_params::flag_paused;
addp.flags &= ~add_torrent_params::flag_auto_managed;
addp.flags |= add_torrent_params::flag_seed_mode;
addp.ti = t;
addp.save_path = "tmp2_tracker";
torrent_handle h = s->add_torrent(addp);
// wait to hit the tracker
wait_for_alert(*s, tracker_reply_alert::alert_type, "s");
// we expect to have certain peers in our peer list now
// these peers are hard coded in web_server.py
std::vector<peer_list_entry> peers;
h.get_full_peer_list(peers);
std::set<tcp::endpoint> expected_peers;
expected_peers.insert(tcp::endpoint(address_v4::from_string("65.65.65.65"), 16962));
expected_peers.insert(tcp::endpoint(address_v4::from_string("67.67.67.67"), 17476));
#if TORRENT_USE_IPV6
if (supports_ipv6())
{
expected_peers.insert(tcp::endpoint(address_v6::from_string("4545:4545:4545:4545:4545:4545:4545:4545"), 17990));
}
#endif
TEST_EQUAL(peers.size(), expected_peers.size());
for (std::vector<peer_list_entry>::iterator i = peers.begin()
, end(peers.end()); i != end; ++i)
{
TEST_EQUAL(expected_peers.count(i->ip), 1);
}
fprintf(stderr, "destructing session\n");
s.reset();
fprintf(stderr, "done\n");
fprintf(stderr, "stop_web_server\n");
stop_web_server();
fprintf(stderr, "done\n");
}

5
test/web_server.py
View File

@ -78,7 +78,10 @@ class http_handler(SimpleHTTPServer.SimpleHTTPRequestHandler):
s.end_headers()
elif s.path.startswith('/announce'):
s.send_response(200)
response = 'd8:intervali1800e8:completei1e10:incompletei1e5:peers0:e'
response = 'd8:intervali1800e8:completei1e10:incompletei1e' + \
'5:peers12:AAAABBCCCCDD' + \
'6:peers618:EEEEEEEEEEEEEEEEFF' + \
'e'
s.send_header("Content-Length", "%d" % len(response))
s.send_header("Connection", "close")
s.end_headers()