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}

1 files changed, 66 insertions, 0 deletions

diff --git a/test/DHTRoutingTableDeserializerTest.cc b/test/DHTRoutingTableDeserializerTest.cc
new file mode 100644
index 00000000..5008b648
--- /dev/null
+++ b/test/DHTRoutingTableDeserializerTest.cc
@@ -0,0 +1,66 @@
+#include "DHTRoutingTableDeserializer.h"
+#include "DHTRoutingTableSerializer.h"
+#include "Exception.h"
+#include "Util.h"
+#include "DHTNode.h"
+#include "a2functional.h"
+#include "DHTConstants.h"
+#include "PeerMessageUtil.h"
+#include <arpa/inet.h>
+#include <cstring>
+#include <sstream>
+#include <cppunit/extensions/HelperMacros.h>
+
+class DHTRoutingTableDeserializerTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(DHTRoutingTableDeserializerTest);
+  CPPUNIT_TEST(testDeserialize);
+  CPPUNIT_TEST_SUITE_END();
+public:
+  void setUp() {}
+
+  void tearDown() {}
+
+  void testDeserialize();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DHTRoutingTableDeserializerTest);
+
+void DHTRoutingTableDeserializerTest::testDeserialize()
+{
+  DHTNodeHandle localNode = new DHTNode();
+
+  DHTNodeHandle nodesSrc[] = { 0, 0, 0 };
+  for(size_t i = 0; i < arrayLength(nodesSrc); ++i) {
+    nodesSrc[i] = new DHTNode();
+    nodesSrc[i]->setIPAddress("192.168.0."+Util::uitos(i+1));
+    nodesSrc[i]->setPort(6881+i);
+  }
+  nodesSrc[1]->setIPAddress("non-numerical-name");
+  DHTNodes nodes(&nodesSrc[0], &nodesSrc[arrayLength(nodesSrc)]);
+  
+  DHTRoutingTableSerializer s;
+  s.setLocalNode(localNode);
+  s.setNodes(nodes);
+
+  stringstream ss;
+  s.serialize(ss);
+
+  DHTRoutingTableDeserializer d;
+  d.deserialize(ss);
+
+  CPPUNIT_ASSERT(memcmp(localNode->getID(), d.getLocalNode()->getID(),
+			DHT_ID_LENGTH) == 0);
+
+  cout << d.getSerializedTime().getTime() << endl;
+
+  CPPUNIT_ASSERT_EQUAL((size_t)2, d.getNodes().size());
+  const DHTNodes& dsnodes = d.getNodes();
+  CPPUNIT_ASSERT_EQUAL(string("192.168.0.1"), dsnodes[0]->getIPAddress());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6881, dsnodes[0]->getPort());
+  CPPUNIT_ASSERT(memcmp(nodes[0]->getID(), dsnodes[0]->getID(), DHT_ID_LENGTH) == 0);
+  CPPUNIT_ASSERT_EQUAL(string("192.168.0.3"), dsnodes[1]->getIPAddress());
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6883, dsnodes[1]->getPort());
+  CPPUNIT_ASSERT(memcmp(nodes[2]->getID(), dsnodes[1]->getID(), DHT_ID_LENGTH) == 0);
+}