2008-02-21 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Log more detailed information about each message.
	* src/DHTQueryMessage.{h, cc}
	* src/DHTGetPeersMessage.{h, cc}
	* src/DHTFindNodeReplyMessage.{h, cc}
	* src/DHTGetPeersReplyMessage.{h, cc}
	* src/DHTAnnouncePeerMessage.{h, cc}
	* src/DHTResponseMessage.{h, cc}
	* src/DHTFindNodeMessage.{h, cc}

15 files changed, 62 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 48f11b45..721aab7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-02-21  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
+	Log more detailed information about each message.
+	* src/DHTQueryMessage.{h, cc}
+	* src/DHTGetPeersMessage.{h, cc}
+	* src/DHTFindNodeReplyMessage.{h, cc}
+	* src/DHTGetPeersReplyMessage.{h, cc}
+	* src/DHTAnnouncePeerMessage.{h, cc}
+	* src/DHTResponseMessage.{h, cc}
+	* src/DHTFindNodeMessage.{h, cc}
+
+2008-02-21  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
 	Use constants defined in prefs.h
 	* src/option_processing.cc
 
diff --git a/src/DHTAnnouncePeerMessage.cc b/src/DHTAnnouncePeerMessage.cc
index b8c321cc..4c4dd5b2 100644
--- a/src/DHTAnnouncePeerMessage.cc
+++ b/src/DHTAnnouncePeerMessage.cc
@@ -44,6 +44,7 @@
 #include "DHTPeerAnnounceStorage.h"
 #include "DHTTokenTracker.h"
 #include "DlAbortEx.h"
+#include "BtConstants.h"
 #include <cstring>
 
 namespace aria2 {
@@ -115,4 +116,11 @@ void DHTAnnouncePeerMessage::setTokenTracker(const WeakHandle<DHTTokenTracker>&
   _tokenTracker = tokenTracker;
 }
 
+std::string DHTAnnouncePeerMessage::toStringOptional() const
+{
+  return "token="+Util::toHex(_token)+
+    ", info_hash="+Util::toHex(_infoHash, INFO_HASH_LENGTH)+
+    ", tcpPort="+Util::uitos(_tcpPort);
+}
+
 } // namespace aria2
diff --git a/src/DHTAnnouncePeerMessage.h b/src/DHTAnnouncePeerMessage.h
index 6587e2cd..7d28cfff 100644
--- a/src/DHTAnnouncePeerMessage.h
+++ b/src/DHTAnnouncePeerMessage.h
@@ -54,6 +54,8 @@ private:
   WeakHandle<DHTPeerAnnounceStorage> _peerAnnounceStorage;
 
   WeakHandle<DHTTokenTracker> _tokenTracker;
+protected:
+  virtual std::string toStringOptional() const;
 public:
   DHTAnnouncePeerMessage(const SharedHandle<DHTNode>& localNode,
 			 const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTFindNodeMessage.cc b/src/DHTFindNodeMessage.cc
index 772d6eba..648826e0 100644
--- a/src/DHTFindNodeMessage.cc
+++ b/src/DHTFindNodeMessage.cc
@@ -40,6 +40,7 @@
 #include "DHTMessageFactory.h"
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
+#include "Util.h"
 #include <cstring>
 
 namespace aria2 {
@@ -80,4 +81,9 @@ std::string DHTFindNodeMessage::getMessageType() const
 
 void DHTFindNodeMessage::validate() const {}
 
+std::string DHTFindNodeMessage::toStringOptional() const
+{
+  return "targetNodeID="+Util::toHex(_targetNodeID, DHT_ID_LENGTH);
+}
+
 } // namespace aria2
diff --git a/src/DHTFindNodeMessage.h b/src/DHTFindNodeMessage.h
index d15132db..5a1b5686 100644
--- a/src/DHTFindNodeMessage.h
+++ b/src/DHTFindNodeMessage.h
@@ -43,6 +43,8 @@ namespace aria2 {
 class DHTFindNodeMessage:public DHTQueryMessage {
 private:
   unsigned char _targetNodeID[DHT_ID_LENGTH];
+protected:
+  virtual std::string toStringOptional() const;
 public:
   DHTFindNodeMessage(const SharedHandle<DHTNode>& localNode,
 		     const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTFindNodeReplyMessage.cc b/src/DHTFindNodeReplyMessage.cc
index 741adde1..8e5534ed 100644
--- a/src/DHTFindNodeReplyMessage.cc
+++ b/src/DHTFindNodeReplyMessage.cc
@@ -42,6 +42,7 @@
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
 #include "PeerMessageUtil.h"
+#include "Util.h"
 #include <cstring>
 
 namespace aria2 {
@@ -97,4 +98,9 @@ void DHTFindNodeReplyMessage::setClosestKNodes(const std::deque<SharedHandle<DHT
   _closestKNodes = closestKNodes;
 }
 
+std::string DHTFindNodeReplyMessage::toStringOptional() const
+{
+  return "nodes="+Util::uitos(_closestKNodes.size());
+}
+
 } // namespace aria2
diff --git a/src/DHTFindNodeReplyMessage.h b/src/DHTFindNodeReplyMessage.h
index c1792257..3d301579 100644
--- a/src/DHTFindNodeReplyMessage.h
+++ b/src/DHTFindNodeReplyMessage.h
@@ -43,6 +43,8 @@ namespace aria2 {
 class DHTFindNodeReplyMessage:public DHTResponseMessage {
 private:
   std::deque<SharedHandle<DHTNode> > _closestKNodes;
+protected:
+  virtual std::string toStringOptional() const;
 public:
   DHTFindNodeReplyMessage(const SharedHandle<DHTNode>& localNode,
 			  const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTGetPeersMessage.cc b/src/DHTGetPeersMessage.cc
index c8545fc2..a0bf1e23 100644
--- a/src/DHTGetPeersMessage.cc
+++ b/src/DHTGetPeersMessage.cc
@@ -44,6 +44,7 @@
 #include "DHTUtil.h"
 #include "Peer.h"
 #include "DHTTokenTracker.h"
+#include "Util.h"
 #include <cstring>
 
 namespace aria2 {
@@ -105,4 +106,9 @@ void DHTGetPeersMessage::setTokenTracker(const WeakHandle<DHTTokenTracker>& toke
   _tokenTracker = tokenTracker;
 }
 
+std::string DHTGetPeersMessage::toStringOptional() const
+{
+  return "info_hash="+Util::toHex(_infoHash, INFO_HASH_LENGTH);
+}
+
 } // namespace aria2
diff --git a/src/DHTGetPeersMessage.h b/src/DHTGetPeersMessage.h
index 634e1e1e..968c572a 100644
--- a/src/DHTGetPeersMessage.h
+++ b/src/DHTGetPeersMessage.h
@@ -50,6 +50,8 @@ private:
   WeakHandle<DHTPeerAnnounceStorage> _peerAnnounceStorage;
 
   WeakHandle<DHTTokenTracker> _tokenTracker;
+protected:
+  virtual std::string toStringOptional() const;
 public:
   DHTGetPeersMessage(const SharedHandle<DHTNode>& localNode,
 		     const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTGetPeersReplyMessage.cc b/src/DHTGetPeersReplyMessage.cc
index 7937c4b6..bdd6f609 100644
--- a/src/DHTGetPeersReplyMessage.cc
+++ b/src/DHTGetPeersReplyMessage.cc
@@ -45,6 +45,7 @@
 #include "PeerMessageUtil.h"
 #include "Peer.h"
 #include "DHTUtil.h"
+#include "Util.h"
 #include <cstring>
 
 namespace aria2 {
@@ -121,4 +122,10 @@ void DHTGetPeersReplyMessage::setValues(const std::deque<SharedHandle<Peer> >& p
   _values = peers;
 }
 
+std::string DHTGetPeersReplyMessage::toStringOptional() const
+{
+  return "token="+Util::toHex(_token)+", values="+Util::uitos(_values.size())+
+    ", nodes="+Util::uitos(_closestKNodes.size());
+}
+
 } // namespace aria2
diff --git a/src/DHTGetPeersReplyMessage.h b/src/DHTGetPeersReplyMessage.h
index 7b365ad2..daedc27a 100644
--- a/src/DHTGetPeersReplyMessage.h
+++ b/src/DHTGetPeersReplyMessage.h
@@ -50,6 +50,8 @@ private:
   std::deque<SharedHandle<DHTNode> > _closestKNodes;
 
   std::deque<SharedHandle<Peer> > _values;
+protected:
+  virtual std::string toStringOptional() const;
 public:
   DHTGetPeersReplyMessage(const SharedHandle<DHTNode>& localNode,
 			  const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTQueryMessage.cc b/src/DHTQueryMessage.cc
index ccc4e150..32340abe 100644
--- a/src/DHTQueryMessage.cc
+++ b/src/DHTQueryMessage.cc
@@ -69,7 +69,8 @@ std::string DHTQueryMessage::toString() const
     " TransactionID="+Util::toHex(_transactionID)+
     " Remote:"+
     _remoteNode->getIPAddress()+":"+Util::itos(_remoteNode->getPort())+
-    ", id="+Util::toHex(_remoteNode->getID(), DHT_ID_LENGTH);
+    ", id="+Util::toHex(_remoteNode->getID(), DHT_ID_LENGTH)+
+    ", "+toStringOptional();
 }
 
 } // namespace aria2
diff --git a/src/DHTQueryMessage.h b/src/DHTQueryMessage.h
index 8bb9a089..2388c515 100644
--- a/src/DHTQueryMessage.h
+++ b/src/DHTQueryMessage.h
@@ -40,6 +40,8 @@
 namespace aria2 {
 
 class DHTQueryMessage:public DHTAbstractMessage {
+protected:
+  virtual std::string toStringOptional() const { return ""; }
 public:
   DHTQueryMessage(const SharedHandle<DHTNode>& localNode,
 		  const SharedHandle<DHTNode>& remoteNode,
diff --git a/src/DHTResponseMessage.cc b/src/DHTResponseMessage.cc
index ac2b74e9..055c4c7e 100644
--- a/src/DHTResponseMessage.cc
+++ b/src/DHTResponseMessage.cc
@@ -68,7 +68,8 @@ std::string DHTResponseMessage::toString() const
     " TransactionID="+Util::toHex(_transactionID)+
     " Remote:"+
     _remoteNode->getIPAddress()+":"+Util::itos(_remoteNode->getPort())+
-    ", id="+Util::toHex(_remoteNode->getID(), DHT_ID_LENGTH);
+    ", id="+Util::toHex(_remoteNode->getID(), DHT_ID_LENGTH)+
+    ", "+toStringOptional();
 }
 
 } // namespace aria2
diff --git a/src/DHTResponseMessage.h b/src/DHTResponseMessage.h
index 099f0c73..5db6c057 100644
--- a/src/DHTResponseMessage.h
+++ b/src/DHTResponseMessage.h
@@ -40,6 +40,8 @@
 namespace aria2 {
 
 class DHTResponseMessage:public DHTAbstractMessage {
+protected:
+  virtual std::string toStringOptional() const { return ""; }
 public:
   DHTResponseMessage(const SharedHandle<DHTNode>& localNode,
 		     const SharedHandle<DHTNode>& remoteNode,