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, 13 insertions, 1 deletions

diff --git a/src/DefaultBtInteractive.h b/src/DefaultBtInteractive.h
index c0c70077..9247c8ac 100644
--- a/src/DefaultBtInteractive.h
+++ b/src/DefaultBtInteractive.h
@@ -48,6 +48,7 @@
 #include "Logger.h"
 #include "LogFactory.h"
 #include "TimeA2.h"
+#include "DHTNodeDecl.h"
 
 class FloodingStat {
 private:
@@ -95,6 +96,7 @@ private:
   BtRequestFactoryWeakHandle btRequestFactory;
   PeerConnectionWeakHandle peerConnection;
   BtMessageFactoryWeakHandle messageFactory;
+  WeakHandle<DHTNode> _localNode;
   const Logger* logger;
   int32_t allowedFastSetSize;
   Time haveCheckPoint;
@@ -106,6 +108,7 @@ private:
   int32_t keepAliveInterval;
   int32_t maxDownloadSpeedLimit;
   bool _utPexEnabled;
+  bool _dhtEnabled;
 
   static const int32_t FLOODING_CHECK_INTERVAL = 5;
 
@@ -121,6 +124,7 @@ private:
   void detectMessageFlooding();
   void checkActiveInteraction();
   void addPeerExchangeMessage();
+  void addPortMessageToQueue();
 
 public:
   DefaultBtInteractive():peer(0),
@@ -136,7 +140,8 @@ public:
 			 allowedFastSetSize(10),
 			 keepAliveInterval(120),
 			 maxDownloadSpeedLimit(0),
-			 _utPexEnabled(false)
+			 _utPexEnabled(false),
+			 _dhtEnabled(false)
   {}
 
   virtual ~DefaultBtInteractive() {}
@@ -212,6 +217,13 @@ public:
   {
     _utPexEnabled = f;
   }
+
+  void setLocalNode(const WeakHandle<DHTNode>& node);
+
+  void setDHTEnabled(bool f)
+  {
+    _dhtEnabled = f;
+  }
 };
 
 typedef SharedHandle<DefaultBtInteractive> DefaultBtInteractiveHandle;