mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 05:27:38 +03:00
286f34cb3f
Added uTorrent compatible Peer Exchange.
* src/BencodeVisitor.{h, cc}
* test/BencodeVisitorTest.cc
* src/BtConstants.h
* src/BtContext.h: Added 'private' flag.
* src/BtExtendedMessage.{h, cc}
* test/BtExtendedMessageTest.cc
* src/BtHandshakeMessage.{h, cc}: Set extended messaging bit in
reserved field.
* test/BtHandshakeMessageTest.cc
* src/BtMessageFactory.h
* src/BtRegistry.h
* src/BtRuntime.h: This class holds default extension message
IDs for
aria2. By default, aria2 uses ID 8 for ut_pex.
* src/DefaultBtContext.cc
* src/DefaultBtInteractive.{h, cc}: This class holds
_utPexEnabled.
When it is true, aria2 enables ut_pex. This value is set by
PeerInteractionCommand.
* src/DefaultBtMessageFactory.{h, cc}
* test/DefaultBtMessageFactoryTest.cc
* src/DefaultBtMessageReceiver.cc: Moved the code of fast
extension
handling to DefaultBtInteractive class.
* src/DefaultExtensionMessageFactory.{h, cc}
* test/DefaultExtensionMessageFactoryTest.cc
* src/DefaultPeerStorage.cc: Returns false if a peer is already
in
the container(peers and incomingPeers. The equality is
determined by
Peer::id).
* test/DefaultPeerStorageTest.cc
* src/ExtensionMessage.h
* test/MockExtensionMessage.h
* src/ExtensionMessageFactory.h
* test/MockExtensionMessageFactory.h
* src/HandshakeExtensionMessage.{h, cc}
* test/HandshakeExtensionMessageTest.cc
* src/MetaEntry.h
* src/Peer.{h, cc}
* src/PeerInteractionCommand.cc
* src/PeerReceiveHandshakeCommand.cc: Evaluate the return value
of
addIncomingPeer.
* src/PeerMessageUtil.{h, cc}
* src/PeerObject.h
* src/UTPexExtensionMessage.{h, cc}
* test/UTPexExtensionMessageTest.cc
* src/message.h
* src/prefs.h
Fixed the bug that returns incomplete data when it contains null
character. A convenient constructor was also added.
* src/Data.{h, cc}
Rewritten.
* src/CompactPeerListProcessor.cc
Fixed typos.
* src/message.h
* src/MetaFileUtil.cc
113 lines
3.2 KiB
C++
113 lines
3.2 KiB
C++
#include "DefaultExtensionMessageFactory.h"
|
|
#include "Peer.h"
|
|
#include "MockBtContext.h"
|
|
#include "PeerMessageUtil.h"
|
|
#include "HandshakeExtensionMessage.h"
|
|
#include "UTPexExtensionMessage.h"
|
|
#include "Exception.h"
|
|
#include "BtRegistry.h"
|
|
#include "BtRuntime.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
class DefaultExtensionMessageFactoryTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(DefaultExtensionMessageFactoryTest);
|
|
CPPUNIT_TEST(testCreateMessage_unknown);
|
|
CPPUNIT_TEST(testCreateMessage_Handshake);
|
|
CPPUNIT_TEST(testCreateMessage_UTPex);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
MockBtContextHandle _btContext;
|
|
PeerHandle _peer;
|
|
public:
|
|
DefaultExtensionMessageFactoryTest():_btContext(0), _peer(0) {}
|
|
|
|
void setUp()
|
|
{
|
|
BtRegistry::unregisterAll();
|
|
MockBtContextHandle btContext = new MockBtContext();
|
|
unsigned char infohash[20];
|
|
memset(infohash, 0, sizeof(infohash));
|
|
btContext->setInfoHash(infohash);
|
|
_btContext = btContext;
|
|
|
|
BtRuntimeHandle btRuntime = new BtRuntime();
|
|
BtRegistry::registerBtRuntime(_btContext->getInfoHashAsString(),
|
|
btRuntime);
|
|
|
|
_peer = new Peer("192.168.0.1", 6969, 16*1024, 256*1024);
|
|
_peer->setExtension("ut_pex", 1);
|
|
}
|
|
|
|
void tearDown()
|
|
{
|
|
BtRegistry::unregisterAll();
|
|
}
|
|
|
|
void testCreateMessage_unknown();
|
|
void testCreateMessage_Handshake();
|
|
void testCreateMessage_UTPex();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(DefaultExtensionMessageFactoryTest);
|
|
|
|
void DefaultExtensionMessageFactoryTest::testCreateMessage_unknown()
|
|
{
|
|
DefaultExtensionMessageFactory factory;
|
|
factory.setBtContext(_btContext);
|
|
factory.setPeer(_peer);
|
|
_peer->setExtension("foo", 255);
|
|
|
|
char id[1] = { 255 };
|
|
|
|
string data = string(&id[0], &id[1]);
|
|
try {
|
|
factory.createMessage(data.c_str(), data.size());
|
|
CPPUNIT_FAIL("exception must be thrown.");
|
|
} catch(Exception* e) {
|
|
cerr << *e << endl;
|
|
delete e;
|
|
}
|
|
}
|
|
|
|
void DefaultExtensionMessageFactoryTest::testCreateMessage_Handshake()
|
|
{
|
|
DefaultExtensionMessageFactory factory;
|
|
factory.setBtContext(_btContext);
|
|
factory.setPeer(_peer);
|
|
|
|
char id[1] = { 0 };
|
|
|
|
string data = string(&id[0], &id[1])+"d1:v5:aria2e";
|
|
HandshakeExtensionMessageHandle m = factory.createMessage(data.c_str(), data.size());
|
|
CPPUNIT_ASSERT_EQUAL(string("aria2"), m->getClientVersion());
|
|
}
|
|
|
|
void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex()
|
|
{
|
|
DefaultExtensionMessageFactory factory;
|
|
factory.setBtContext(_btContext);
|
|
factory.setPeer(_peer);
|
|
|
|
char c1[6];
|
|
char c2[6];
|
|
char c3[6];
|
|
char c4[6];
|
|
PeerMessageUtil::createcompact(c1, "192.168.0.1", 6881);
|
|
PeerMessageUtil::createcompact(c2, "10.1.1.2", 9999);
|
|
PeerMessageUtil::createcompact(c3, "192.168.0.2", 6882);
|
|
PeerMessageUtil::createcompact(c4, "10.1.1.3",10000);
|
|
|
|
char id[1] = { BT_RUNTIME(_btContext)->getExtensionMessageID("ut_pex") };
|
|
|
|
string data = string(&id[0], &id[1])+"d5:added12:"+
|
|
string(&c1[0], &c1[6])+string(&c2[0], &c2[6])+
|
|
"7:added.f2:207:dropped12:"+
|
|
string(&c3[0], &c3[6])+string(&c4[0], &c4[6])+
|
|
"e";
|
|
|
|
UTPexExtensionMessageHandle m = factory.createMessage(data.c_str(), data.size());
|
|
CPPUNIT_ASSERT_EQUAL(BT_RUNTIME(_btContext)->getExtensionMessageID("ut_pex"),
|
|
m->getExtensionMessageID());
|
|
}
|