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

fixed bug in web_peer_connection which could cause a hang when downloading from web servers

Browse Source
This commit is contained in:
Arvid Norberg
2010-06-22 18:09:04 +00:00
parent 996c68dfa7
commit 06190d8920
6 changed files with 108 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
test/setup_transfer.cpp
View File

@@ -613,25 +613,33 @@ void web_server_thread(int* port, bool ssl)
char buf[10000];
int len = 0;
int offset = 0;
bool connection_close = false;
stream_socket s(ios);
for (;;)
{
s.close(ec);
len = 0;
offset = 0;
accept_done = false;
acceptor.async_accept(s, &on_accept);
ios.reset();
ios.run_one();
if (!accept_done)
if (connection_close)
{
fprintf(stderr, "accept failed\n");
return;
s.close(ec);
connection_close = false;
}
if (!s.is_open()) continue;
if (!s.is_open())
{
len = 0;
offset = 0;
accept_done = false;
acceptor.async_accept(s, &on_accept);
ios.reset();
ios.run_one();
if (!accept_done)
{
fprintf(stderr, "accept failed\n");
return;
}
if (!s.is_open()) continue;
}
http_parser p;
bool failed = false;
@@ -663,9 +671,9 @@ void web_server_thread(int* port, bool ssl)
break;
}
len += received;
p.incoming(buffer::const_interval(buf + offset, buf + len), error);
TEST_CHECK(error == false);
if (error)
{
@@ -674,11 +682,27 @@ void web_server_thread(int* port, bool ssl)
break;
}
}
std::string connection = p.header("connection");
std::string via = p.header("via");
// The delegate proxy doesn't say connection close, but it expects it to be closed
// the Via: header is an indicator of delegate making the request
if (connection == "close" || !via.empty())
{
connection_close = true;
}
// fprintf(stderr, "%s", std::string(buf + offset, p.body_start()).c_str());
if (failed) break;
if (failed)
{
s.close(ec);
break;
}
offset += p.body_start() + p.content_length();
// fprintf(stderr, "offset: %d len: %d\n", offset, len);
if (p.method() != "get" && p.method() != "post")
{
@@ -770,6 +794,9 @@ void web_server_thread(int* port, bool ssl)
write(s, boost::asio::buffer(&file_buf[0], file_buf.size()), boost::asio::transfer_all(), ec);
}
// fprintf(stderr, "%d bytes left in receive buffer. offset: %d\n", len - offset, offset);
memmove(buf, buf + offset, len - offset);
len -= offset;
offset = 0;
} while (offset < len);
}
fprintf(stderr, "exiting web server thread\n");

44
test/test_web_seed.cpp
View File

@@ -92,7 +92,7 @@ void test_transfer(boost::intrusive_ptr<torrent_info> torrent_file, int proxy, i
cache_status cs;
for (int i = 0; i < 10; ++i)
for (int i = 0; i < 30; ++i)
{
torrent_status s = th.status();
session_status ss = ses.status();
@@ -118,10 +118,10 @@ void test_transfer(boost::intrusive_ptr<torrent_info> torrent_file, int proxy, i
if (th.is_seed()/* && ss.download_rate == 0.f*/)
{
TEST_CHECK(th.status().total_payload_download == total_size);
TEST_EQUAL(th.status().total_payload_download, total_size);
// we need to sleep here a bit to let the session sync with the torrent stats
test_sleep(1000);
TEST_CHECK(ses.status().total_payload_download == total_size);
TEST_EQUAL(ses.status().total_payload_download, total_size);
break;
}
test_sleep(500);
@@ -135,6 +135,7 @@ void test_transfer(boost::intrusive_ptr<torrent_info> torrent_file, int proxy, i
<< " session_rate_sum: " << ses_rate_sum
<< " session total download: " << ses.status().total_payload_download
<< " torrent total download: " << th.status().total_payload_download
<< " redundant: " << th.status().total_redundant_bytes
<< std::endl;
// the rates for each second should sum up to the total, with a 10% error margin
@@ -156,24 +157,41 @@ int test_main()
error_code ec;
create_directories("./tmp1_web_seed/test_torrent_dir", ec);
int file_sizes[] =
{ 5, 16 - 5, 16, 17, 10, 30, 30, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
,1,1,1,1,1,1,13,65,34,75,2,3,4,5,23,9,43,4,43,6, 4};
char random_data[300000];
std::srand(10);
// memset(random_data, 1, sizeof(random_data));
std::generate(random_data, random_data + sizeof(random_data), &std::rand);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test1").write(random_data, 35);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test2").write(random_data, 16536 - 35);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test3").write(random_data, 16536);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test4").write(random_data, 17);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test5").write(random_data, 16536);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test6").write(random_data, 300000);
std::ofstream("./tmp1_web_seed/test_torrent_dir/test7").write(random_data, 300000);
for (int i = 0; i != sizeof(file_sizes)/sizeof(file_sizes[0]); ++i)
{
std::generate(random_data, random_data + sizeof(random_data), &std::rand);
char filename[200];
snprintf(filename, sizeof(filename), "./tmp1_web_seed/test_torrent_dir/test%d", i);
error_code ec;
file out(filename, file::write_only, ec);
TEST_CHECK(!ec);
if (ec)
{
fprintf(stderr, "ERROR opening file '%s': %s\n", filename, ec.message().c_str());
return 1;
}
file::iovec_t b = { random_data, file_sizes[i]};
out.writev(0, &b, 1, ec);
TEST_CHECK(!ec);
if (ec)
{
fprintf(stderr, "ERROR writing file '%s': %s\n", filename, ec.message().c_str());
return 1;
}
}
file_storage fs;
add_files(fs, "./tmp1_web_seed/test_torrent_dir");
int port = start_web_server();
libtorrent::create_torrent t(fs, 16 * 1024);
libtorrent::create_torrent t(fs, 16);
char tmp[512];
snprintf(tmp, sizeof(tmp), "http://127.0.0.1:%d/tmp1_web_seed", port);
t.add_url_seed(tmp);