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

diff --git a/test/SocketCoreTest.cc b/test/SocketCoreTest.cc
new file mode 100644
index 00000000..279457a1
--- /dev/null
+++ b/test/SocketCoreTest.cc
@@ -0,0 +1,57 @@
+#include "SocketCore.h"
+#include "Exception.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+class SocketCoreTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(SocketCoreTest);
+  CPPUNIT_TEST(testWriteAndReadDatagram);
+  CPPUNIT_TEST_SUITE_END();
+public:
+  void setUp() {}
+
+  void tearDown() {}
+
+  void testWriteAndReadDatagram();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SocketCoreTest);
+
+void SocketCoreTest::testWriteAndReadDatagram()
+{
+  try {
+    SocketCore s(SOCK_DGRAM);
+    s.bind(0);
+    SocketCore c(SOCK_DGRAM);
+    c.bind(0);
+
+    pair<string, int32_t> svaddr;
+    s.getAddrInfo(svaddr);
+
+    string message1 = "hello world.";
+    c.writeData(message1.c_str(), message1.size(), "localhost", svaddr.second);
+    string message2 = "chocolate coated pie";
+    c.writeData(message2.c_str(), message2.size(), "localhost", svaddr.second);
+
+    char readbuffer[100];
+    pair<string, uint16_t> peer;
+    {
+      ssize_t rlength = s.readDataFrom(readbuffer, sizeof(readbuffer), peer);
+      CPPUNIT_ASSERT_EQUAL(string("127.0.0.1"), peer.first);
+      CPPUNIT_ASSERT_EQUAL((ssize_t)message1.size(), rlength);
+      readbuffer[rlength] = '\0';
+      CPPUNIT_ASSERT_EQUAL(message1, string(readbuffer));
+    }
+    {
+      ssize_t rlength = s.readDataFrom(readbuffer, sizeof(readbuffer));
+      CPPUNIT_ASSERT_EQUAL((ssize_t)message2.size(), rlength);
+      readbuffer[rlength] = '\0';
+      CPPUNIT_ASSERT_EQUAL(message2, string(readbuffer));
+    }
+  } catch(Exception* e) {
+    cerr << *e << endl;
+    delete e;
+    CPPUNIT_FAIL("exception thrown");
+  }
+}