2008-02-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

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}
This commit is contained in:
Tatsuhiro Tsujikawa 2008-02-01 17:36:33 +00:00
parent 0bce06348e
commit 0f13363229
209 changed files with 14405 additions and 117 deletions

View file

@ -5,12 +5,14 @@
#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;
@ -45,6 +47,7 @@ public:
}
void testCreateBtMessage_BtExtendedMessage();
void testCreatePortMessage();
};
@ -76,3 +79,30 @@ void DefaultBtMessageFactoryTest::testCreateBtMessage_BtExtendedMessage()
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());
}
}