mirror of
https://github.com/aria2/aria2.git
synced 2026-04-02 18:59:20 +00:00
cd91e2ea4f
* src/Xml2MetalinkProcessor.h (xpathExists): New function. * src/Xml2MetalinkProcessor.cc (xpathExists): New function. Not to send HEAD request if filename and size are available in Metalink file: * src/UrlRequestInfo.h (filename): New variable. (totalLength): New variable. (setTotalLength): New function. (setFilename): New function. * src/MetalinkRequestInfo.cc (execute): Set filename and size to UrlRequestInfo. * src/MetalinkEntry.cc (MetalinkEntry): Initialize size with 0. * src/UrlRequestInfo.cc (execute): Set filename and size to SegmentMan. Not to download rest of the files after selected files are downloaded in BitTorrent: * src/PieceStorage.h (allDownloadFinished): New function. * src/DefaultBtAnnounce.cc (isCompleteAnnounceReady): Use allDownloadFinished instead of downloadFinished. (getAnnounceUrl): Use allDownloadFinished instead of downloadFinished. * src/DefaultPieceStorage.cc (completePiece): Use allDownloadFinished instead of downloadFinished. Commented out the call to finishSelectiveDownloadingMode(). (downloadFinished): Call isFilteredAllBitSet() instead of isAllBitSet(). (allDownloadFinished): New function. * src/DefaultBtInteractive.cc (addBitfieldMessageToQueue): Call allDownloadFinished() instead of downloadFinished(). (checkHave): Call allDownloadFinished() instead of downloadFinished(). * src/TorrentDownloadEngine.cc (onEndOfRun): Call allDownloadFinished() instead of downloadFinished(). * src/BitfieldMan.h (isFilteredAllBitSet): New function. * src/ShareRatioSeedCriteria.h (PieceStorage.h): New include. (pieceStorage): New variable. (evaluate): btContext->getTotalLength() -> pieceStorage->getCompletedLength() * src/BitfieldMan.cc (isFilteredAllBitSet): New function. (isAllBitSet): Filter is not took into account. Rename --force-truncate as --allow-overwrite: * src/TorrentRequestInfo.cc (execute): PREF_FORCE_TRUNCATE -> PREF_ALLOW_OVERWRITE * src/main.cc (showUsage): --force-truncate -> --allow-overwrite * src/message.h (EX_FILE_ALREADY_EXISTS): --force-truncate -> --allow-overwrite * src/prefs.h (PREF_FORCE_TRUNCATE): Removed. (PREF_ALLOW_OVERWRITE): New definition. * src/SegmentMan.cc (shouldCancelDownloadForSafety): --force-truncate -> --allow-overwrite * src/MetalinkRequestInfo.cc (execute): Queueing message are now logged in info level. * src/common.h (LONG_LONG_MAX): Removed. (LONG_LONG_MIN): Removed. * src/HttpResponseCommand.cc (handleDefaultEncoding): LONG_LONG_MAX -> INT64_MAX * src/FtpNegotiateCommand.cc (recvSize): LONG_LONG_MAX -> INT64_MAX * src/main.cc (showUsage): Added --check-integiry and --realtime-chunk-checksum command-line option. (main): Added --check-integiry and --realtime-chunk-checksum command-line option. --force-truncate -> --allow-overwrite Set initial value of --check-integrity option to false. Don't show usage when error occurs while persing command-line options. Removed deprecated --upload-limit option.
103 lines
3.6 KiB
C++
103 lines
3.6 KiB
C++
#include "BtHandshakeMessage.h"
|
|
#include "PeerMessageUtil.h"
|
|
#include "Util.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class BtHandshakeMessageTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(BtHandshakeMessageTest);
|
|
CPPUNIT_TEST(testCreate);
|
|
CPPUNIT_TEST(testGetMessage);
|
|
CPPUNIT_TEST(testToString);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp() {
|
|
}
|
|
|
|
void testCreate();
|
|
void testGetMessage();
|
|
void testToString();
|
|
|
|
static string BTPSTR;
|
|
};
|
|
|
|
|
|
string BtHandshakeMessageTest::BTPSTR = "BitTorrent protocol";
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(BtHandshakeMessageTest);
|
|
|
|
void createHandshakeMessageData(unsigned char* msg) {
|
|
msg[0] = 19;
|
|
memcpy(&msg[1], BtHandshakeMessageTest::BTPSTR.c_str(),
|
|
BtHandshakeMessageTest::BTPSTR.size());
|
|
unsigned char reserved[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04 };
|
|
memcpy(&msg[20], reserved, sizeof(reserved));
|
|
unsigned char infoHash[] = { 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff };
|
|
memcpy(&msg[28], infoHash, sizeof(infoHash));
|
|
unsigned char peerId[] = { 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0 };
|
|
memcpy(&msg[48], peerId, sizeof(peerId));
|
|
}
|
|
|
|
void BtHandshakeMessageTest::testCreate() {
|
|
unsigned char msg[68];
|
|
createHandshakeMessageData(msg);
|
|
BtHandshakeMessageHandle message = BtHandshakeMessage::create(&msg[0], sizeof(msg));
|
|
CPPUNIT_ASSERT_EQUAL((int8_t)INT8_MAX, message->getId());
|
|
CPPUNIT_ASSERT_EQUAL((int8_t)19, message->getPstrlen());
|
|
CPPUNIT_ASSERT_EQUAL(Util::toHex((const unsigned char*)BTPSTR.c_str(), BTPSTR.size()),
|
|
Util::toHex(message->getPstr(), BtHandshakeMessage::PSTR_LENGTH));
|
|
CPPUNIT_ASSERT_EQUAL(string("0000000000000004"),
|
|
Util::toHex(message->getReserved(), BtHandshakeMessage::RESERVED_LENGTH));
|
|
CPPUNIT_ASSERT_EQUAL(string("ffffffffffffffffffffffffffffffffffffffff"),
|
|
Util::toHex(message->getInfoHash(), INFO_HASH_LENGTH));
|
|
CPPUNIT_ASSERT_EQUAL(string("f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0"),
|
|
Util::toHex(message->getPeerId(), PEER_ID_LENGTH));
|
|
}
|
|
|
|
void BtHandshakeMessageTest::testGetMessage() {
|
|
unsigned char infoHash[] = { 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff };
|
|
unsigned char peerId[] = { 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0 };
|
|
|
|
BtHandshakeMessageHandle msg = new BtHandshakeMessage();
|
|
msg->setInfoHash(infoHash);
|
|
msg->setPeerId(peerId);
|
|
|
|
unsigned char data[68];
|
|
createHandshakeMessageData(data);
|
|
CPPUNIT_ASSERT_EQUAL(Util::toHex((const unsigned char*)data, 68),
|
|
Util::toHex((const unsigned char*)msg->getMessage(), 68));
|
|
}
|
|
|
|
void BtHandshakeMessageTest::testToString() {
|
|
unsigned char infoHash[] = { 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff };
|
|
unsigned char peerId[] = { 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
|
|
0xf0, 0xf0, 0xf0, 0xf0, 0xf0 };
|
|
|
|
BtHandshakeMessage msg;
|
|
msg.setInfoHash(infoHash);
|
|
msg.setPeerId(peerId);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(string("handshake peerId=%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0%f0, reserved=0000000000000004"), msg.toString());
|
|
}
|