0f13363229
Added DHT functionality, compatible with mainline.
DHT is disabled by default. To enable it, give --enable-dht to
aria2c.
You may need to specify entry point to DHT network using
--dht-entry-point. DHT uses UDP port to listen incoming message.
Use --dht-listen-port to specify port number. Make sure that
your
firewall configuration can pass through UDP traffic to the port.
The routing table is saved in $HOME/.aria2/dht.dat.
* src/DHT*
* src/BNode.{h, cc}
* src/PeerInteractionCommand.cc: enable DHT functionality for a
particular torrent.
* src/Data.cc: Rewritten ctor.
* src/OptionHandlerFactory.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/DefaultBtInteractive.cc: Send port message if dht is
enabled.
* src/RequestGroup.cc: Initialize DHT functionality. When
download
ends, remove BtContext from DHTPeerAnnounceStorage.
* src/BtPortMessage.{h, cc}: Rewritten.
* src/message.h
* src/OptionHandlerImpl.cc
* src/option_processing.cc: Added --enable-dht,
--dht-listen-port,
--dht-entry-point.
* src/Dictionary.{h, cc} (remove): New function.
* src/prefs.h
* src/DefaultBtMessageFactory.h
* src/BtHandshakeMessage.cc
* src/ActivePeerConnectionCommand.cc
* src/SocketCore.{h, cc}: Added datagram socket support.
* src/DefaultBtMessageFactory.cc
* src/BtSetup.cc: Add BtContext to DHTPeerAnnounceStorage here.
Create DHT commands.
* src/BtMessageFactory.h
* src/PeerMessageUtil.{h, cc}
109 lines
3.1 KiB
C++
109 lines
3.1 KiB
C++
#include "DefaultBtMessageFactory.h"
|
|
#include "Peer.h"
|
|
#include "PeerMessageUtil.h"
|
|
#include "BtRegistry.h"
|
|
#include "MockBtContext.h"
|
|
#include "MockExtensionMessageFactory.h"
|
|
#include "BtExtendedMessage.h"
|
|
#include "BtPortMessage.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
class DefaultBtMessageFactoryTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(DefaultBtMessageFactoryTest);
|
|
CPPUNIT_TEST(testCreateBtMessage_BtExtendedMessage);
|
|
CPPUNIT_TEST(testCreatePortMessage);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
MockBtContextHandle _btContext;
|
|
PeerHandle _peer;
|
|
public:
|
|
DefaultBtMessageFactoryTest():_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;
|
|
|
|
_peer = new Peer("192.168.0.1", 6969);
|
|
_peer->setExtendedMessagingEnabled(true);
|
|
|
|
MockExtensionMessageFactoryHandle exmsgFactory = new MockExtensionMessageFactory();
|
|
BtRegistry::registerPeerObjectCluster(_btContext->getInfoHashAsString(),
|
|
new PeerObjectCluster());
|
|
PeerObjectHandle peerObject = new PeerObject();
|
|
peerObject->extensionMessageFactory = exmsgFactory;
|
|
|
|
PEER_OBJECT_CLUSTER(_btContext)->registerHandle(_peer->getId(), peerObject);
|
|
}
|
|
|
|
void tearDown()
|
|
{
|
|
BtRegistry::unregisterAll();
|
|
}
|
|
|
|
void testCreateBtMessage_BtExtendedMessage();
|
|
void testCreatePortMessage();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(DefaultBtMessageFactoryTest);
|
|
|
|
void DefaultBtMessageFactoryTest::testCreateBtMessage_BtExtendedMessage()
|
|
{
|
|
|
|
DefaultBtMessageFactory factory;
|
|
factory.setBtContext(_btContext);
|
|
factory.setPeer(_peer);
|
|
|
|
// payload:{4:name3:foo}->11bytes
|
|
string payload = "4:name3:foo";
|
|
char msg[17];// 6+11bytes
|
|
PeerMessageUtil::createPeerMessageString((unsigned char*)msg, sizeof(msg), 13, 20);
|
|
msg[5] = 1; // Set dummy extended message ID 1
|
|
memcpy(msg+6, payload.c_str(), payload.size());
|
|
|
|
BtExtendedMessageHandle m = factory.createBtMessage((const unsigned char*)msg+4, sizeof(msg));
|
|
|
|
try {
|
|
// disable extended messaging
|
|
_peer->setExtendedMessagingEnabled(false);
|
|
factory.createBtMessage((const unsigned char*)msg+4, sizeof(msg));
|
|
CPPUNIT_FAIL("exception must be thrown.");
|
|
} catch(Exception* e) {
|
|
cerr << *e << endl;
|
|
delete e;
|
|
}
|
|
}
|
|
|
|
void DefaultBtMessageFactoryTest::testCreatePortMessage()
|
|
{
|
|
DefaultBtMessageFactory factory;
|
|
factory.setBtContext(_btContext);
|
|
factory.setPeer(_peer);
|
|
|
|
{
|
|
unsigned char data[7];
|
|
PeerMessageUtil::createPeerMessageString(data, sizeof(data), 3, 9);
|
|
PeerMessageUtil::setShortIntParam(&data[5], 6881);
|
|
try {
|
|
SharedHandle<BtPortMessage> m = factory.createBtMessage(&data[4], sizeof(data)-4);
|
|
CPPUNIT_ASSERT(!m.isNull());
|
|
CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getPort());
|
|
} catch(Exception* e) {
|
|
cerr << *e << endl;
|
|
string msg = e->getMsg();
|
|
delete e;
|
|
CPPUNIT_FAIL(msg);
|
|
}
|
|
}
|
|
{
|
|
SharedHandle<BtPortMessage> m = factory.createPortMessage(6881);
|
|
CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getPort());
|
|
}
|
|
}
|