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, 51 insertions, 0 deletions

diff --git a/test/DHTAnnouncePeerReplyMessageTest.cc b/test/DHTAnnouncePeerReplyMessageTest.cc
new file mode 100644
index 00000000..6cf6f6e1
--- /dev/null
+++ b/test/DHTAnnouncePeerReplyMessageTest.cc
@@ -0,0 +1,51 @@
+#include "DHTAnnouncePeerReplyMessage.h"
+#include "DHTNode.h"
+#include "DHTUtil.h"
+#include "BencodeVisitor.h"
+#include "Dictionary.h"
+#include "Data.h"
+#include "Exception.h"
+#include "Util.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+class DHTAnnouncePeerReplyMessageTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(DHTAnnouncePeerReplyMessageTest);
+  CPPUNIT_TEST(testGetBencodedMessage);
+  CPPUNIT_TEST_SUITE_END();
+public:
+  void setUp() {}
+
+  void tearDown() {}
+
+  void testGetBencodedMessage();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DHTAnnouncePeerReplyMessageTest);
+
+void DHTAnnouncePeerReplyMessageTest::testGetBencodedMessage()
+{
+  DHTNodeHandle localNode = new DHTNode();
+  DHTNodeHandle remoteNode = new DHTNode();
+
+  char tid[DHT_TRANSACTION_ID_LENGTH];
+  DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
+  string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
+
+  DHTAnnouncePeerReplyMessage msg(localNode, remoteNode, transactionID);
+
+  string msgbody = msg.getBencodedMessage();
+
+  SharedHandle<Dictionary> cm = new Dictionary();
+  cm->put("t", new Data(transactionID));
+  cm->put("y", new Data("r"));
+  Dictionary* r = new Dictionary();
+  cm->put("r", r);
+  r->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
+
+  BencodeVisitor v;
+  cm->accept(&v);
+
+  CPPUNIT_ASSERT_EQUAL(v.getBencodedData(), msgbody);
+}