jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue where event=stopped announces wouldn't be sent when closing session

Browse Source
This commit is contained in:
Arvid Norberg
2011-09-17 21:15:42 +00:00
parent 52a0760e5b
commit 4e1af65fe0
8 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/Jamfile
View File

@@ -32,6 +32,7 @@ test-suite libtorrent :
[ run test_storage.cpp ]
[ run test_upnp.cpp ]
[ run test_tracker.cpp ]
[ run test_web_seed.cpp ]
[ run test_bdecode_performance.cpp ]
[ run test_pe_crypto.cpp ]

6
test/setup_transfer.cpp
View File

@@ -445,6 +445,9 @@ int start_tracker()
return port;
}
int g_udp_tracker_requests = 0;
int g_http_tracker_requests = 0;
void on_udp_receive(error_code const& ec, size_t bytes_transferred, udp::endpoint const* from, char* buffer, udp::socket* sock)
{
if (ec)
@@ -486,6 +489,7 @@ void on_udp_receive(error_code const& ec, size_t bytes_transferred, udp::endpoin
detail::write_uint32(1800, ptr); // interval
detail::write_uint32(1, ptr); // incomplete
detail::write_uint32(1, ptr); // complete
++g_udp_tracker_requests;
// 0 peers
sock->send_to(asio::buffer(buffer, 20), *from, 0, e);
break;
@@ -974,6 +978,7 @@ void web_server_thread(int* port, bool ssl, bool chunked)
if (path.substr(0, 9) == "/announce")
{
fprintf(stderr, "%s\n", path.c_str());
entry announce;
announce["interval"] = 1800;
announce["complete"] = 1;
@@ -981,6 +986,7 @@ void web_server_thread(int* port, bool ssl, bool chunked)
announce["peers"].string();
std::vector<char> buf;
bencode(std::back_inserter(buf), announce);
++g_http_tracker_requests;
send_response(s, ec, 200, "OK", extra_header, buf.size());
write(s, boost::asio::buffer(&buf[0], buf.size()), boost::asio::transfer_all(), ec);

3
test/setup_transfer.hpp
View File

@@ -52,6 +52,9 @@ bool print_alerts(libtorrent::session& ses, char const* name
void wait_for_listen(libtorrent::session& ses, char const* name);
void test_sleep(int millisec);
extern int g_udp_tracker_requests;
extern int g_http_tracker_requests;
boost::intrusive_ptr<libtorrent::torrent_info> create_torrent(std::ostream* file = 0
, int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true, bool encrypted = false);

66
test/test_tracker.cpp Normal file
View File

@@ -0,0 +1,66 @@
#include "test.hpp"
#include "setup_transfer.hpp"
#include "libtorrent/alert.hpp"
#include "libtorrent/session.hpp"
#include "libtorrent/error_code.hpp"
#include <fstream>
using namespace libtorrent;
int test_main()
{
int http_port = start_web_server();
int udp_port = start_tracker();
int prev_udp_announces = g_udp_tracker_requests;
int prev_http_announces = g_http_tracker_requests;
int const alert_mask = alert::all_categories
& ~alert::progress_notification
& ~alert::stats_notification;
session* s = new libtorrent::session(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48875, 49800), "0.0.0.0", 0, alert_mask);
session_settings sett;
sett.half_open_limit = 1;
sett.announce_to_all_trackers = true;
sett.announce_to_all_tiers = true;
s->set_settings(sett);
error_code ec;
create_directory("./tmp1_tracker", ec);
std::ofstream file("./tmp1_tracker/temporary");
boost::intrusive_ptr<torrent_info> t = ::create_torrent(&file, 16 * 1024, 13, false);
file.close();
char tracker_url[200];
snprintf(tracker_url, sizeof(tracker_url), "http://127.0.0.1:%d/announce", http_port);
t->add_tracker(tracker_url);
snprintf(tracker_url, sizeof(tracker_url), "udp://127.0.0.1:%d/announce", udp_port);
t->add_tracker(tracker_url);
add_torrent_params addp;
addp.paused = false;
addp.auto_managed = false;
addp.ti = t;
addp.save_path = "./tmp1_tracker";
torrent_handle h = s->add_torrent(addp);
test_sleep(2000);
// we should have announced to the tracker by now
TEST_EQUAL(g_udp_tracker_requests, prev_udp_announces + 1);
TEST_EQUAL(g_http_tracker_requests, prev_http_announces + 1);
delete s;
// we should have announced the stopped event now
TEST_EQUAL(g_udp_tracker_requests, prev_udp_announces + 2);
TEST_EQUAL(g_http_tracker_requests, prev_http_announces + 2);
stop_tracker();
stop_web_server();
}