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}

test/BtPortMessageTest.cc

@@ -1,6 +1,10 @@
 #include "BtPortMessage.h"
 #include "PeerMessageUtil.h"
 #include "Util.h"
+#include "DHTNode.h"
+#include "MockDHTTask.h"
+#include "MockDHTTaskFactory.h"
+#include "MockDHTTaskQueue.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
@@ -10,6 +14,8 @@ class BtPortMessageTest:public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(BtPortMessageTest);
   CPPUNIT_TEST(testCreate);
   CPPUNIT_TEST(testToString);
+  CPPUNIT_TEST(testGetMessage);
+  CPPUNIT_TEST(testDoReceivedAction);
   CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -19,6 +25,17 @@ public:
 
   void testCreate();
   void testToString();
+  void testGetMessage();
+  void testDoReceivedAction();
+
+  class MockDHTTaskFactory2:public MockDHTTaskFactory {
+  public:
+    virtual DHTTaskHandle createPingTask(const DHTNodeHandle& remoteNode,
+					 size_t numRetry)
+    {
+      return new MockDHTTask(remoteNode);
+    }
+  };
 };
 
 
@@ -28,9 +45,9 @@ void BtPortMessageTest::testCreate() {
   unsigned char msg[7];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 3, 9);
   PeerMessageUtil::setShortIntParam(&msg[5], 12345);
-  BtPortMessageHandle pm = BtPortMessage::create(&msg[4], 3);
+  SharedHandle<BtPortMessage> pm = BtPortMessage::create(&msg[4], 3);
   CPPUNIT_ASSERT_EQUAL((int8_t)9, pm->getId());
-  CPPUNIT_ASSERT_EQUAL((int16_t)12345, pm->getPort());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)12345, pm->getPort());
 
   // case: payload size is wrong
   try {
@@ -49,7 +66,34 @@ void BtPortMessageTest::testCreate() {
   } catch(...) {
   }
 }
+
 void BtPortMessageTest::testToString() {
   BtPortMessage msg(1);
   CPPUNIT_ASSERT_EQUAL(string("port port=1"), msg.toString());
 }
+
+void BtPortMessageTest::testGetMessage() {
+  BtPortMessage msg(6881);
+  unsigned char data[7];
+  PeerMessageUtil::createPeerMessageString(data, sizeof(data), 3, 9);
+  PeerMessageUtil::setShortIntParam(&data[5], 6881);
+  CPPUNIT_ASSERT(memcmp(msg.getMessage(), data, 7) == 0);
+}
+
+void BtPortMessageTest::testDoReceivedAction()
+{
+  PeerHandle peer = new Peer("192.168.0.1", 6881);
+  BtPortMessage msg(6881);
+  MockDHTTaskQueue taskQueue;
+  MockDHTTaskFactory2 taskFactory;
+  msg.setTaskQueue(&taskQueue);
+  msg.setTaskFactory(&taskFactory);
+  msg.setPeer(peer);
+
+  msg.doReceivedAction();
+
+  CPPUNIT_ASSERT_EQUAL((size_t)1, taskQueue._immediateTaskQueue.size());
+  DHTNodeHandle node = SharedHandle<MockDHTTask>(taskQueue._immediateTaskQueue.front())->_remoteNode;
+  CPPUNIT_ASSERT_EQUAL(string("192.168.0.1"), node->getIPAddress());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6881, node->getPort());
+}