github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Extend maximum BitTorrent incoming payload size to 64KiB

pull/711/merge
Tatsuhiro Tsujikawa 2016-07-20 22:42:29 +09:00
parent 537b8659d2
commit 9a63e59104
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BtConstants.h
View File

@ -46,7 +46,7 @@ constexpr size_t PIECE_HASH_LENGTH = 20;
constexpr size_t PEER_ID_LENGTH = 20; constexpr size_t PEER_ID_LENGTH = 20;
constexpr size_t MAX_BLOCK_LENGTH = 32_k; constexpr size_t MAX_BLOCK_LENGTH = 64_k;
constexpr size_t DEFAULT_MAX_OUTSTANDING_REQUEST = 6; constexpr size_t DEFAULT_MAX_OUTSTANDING_REQUEST = 6;

6
test/BtRequestMessageTest.cc
View File

@ -266,7 +266,7 @@ void BtRequestMessageTest::testValidate()
void BtRequestMessageTest::testValidate_lengthTooLong() void BtRequestMessageTest::testValidate_lengthTooLong()
{ {
BtRequestMessage msg(0, 0, 32_k + 1); BtRequestMessage msg(0, 0, MAX_BLOCK_LENGTH + 1);
msg.setBtMessageValidator( msg.setBtMessageValidator(
make_unique<RangeBtMessageValidator>(&msg, 1_k, 256_k)); make_unique<RangeBtMessageValidator>(&msg, 1_k, 256_k));
try { try {
@ -274,7 +274,9 @@ void BtRequestMessageTest::testValidate_lengthTooLong()
CPPUNIT_FAIL("exception must be thrown."); CPPUNIT_FAIL("exception must be thrown.");
} }
catch (DlAbortEx& e) { catch (DlAbortEx& e) {
CPPUNIT_ASSERT_EQUAL(std::string("Length too long: 32769 > 32KB"), CPPUNIT_ASSERT_EQUAL("Length too long: " +
util::uitos(MAX_BLOCK_LENGTH + 1) + " > " +
util::uitos(MAX_BLOCK_LENGTH / 1024) + "KB",
std::string(e.what())); std::string(e.what()));
} }
} }

2
test/PeerConnectionTest.cc
View File

@ -28,7 +28,7 @@ void PeerConnectionTest::testReserveBuffer()
CPPUNIT_ASSERT_EQUAL((size_t)MAX_BUFFER_CAPACITY, con.getBufferCapacity()); CPPUNIT_ASSERT_EQUAL((size_t)MAX_BUFFER_CAPACITY, con.getBufferCapacity());
CPPUNIT_ASSERT_EQUAL((size_t)3, con.getBufferLength()); CPPUNIT_ASSERT_EQUAL((size_t)3, con.getBufferLength());
constexpr size_t newLength = 64_k; constexpr size_t newLength = 128_k;
con.reserveBuffer(newLength); con.reserveBuffer(newLength);
CPPUNIT_ASSERT_EQUAL(newLength, con.getBufferCapacity()); CPPUNIT_ASSERT_EQUAL(newLength, con.getBufferCapacity());