2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Renamed ExtensionMessage::getBencodedData() as
	ExtensionMessage::getPayload()
	* src/BtExtendedMessage.cc
	* src/ExtensionMessage.h
	* src/HandshakeExtensionMessage.cc
	* src/HandshakeExtensionMessage.h
	* src/UTMetadataDataExtensionMessage.cc
	* src/UTMetadataDataExtensionMessage.h
	* src/UTMetadataRejectExtensionMessage.cc
	* src/UTMetadataRejectExtensionMessage.h
	* src/UTMetadataRequestExtensionMessage.cc
	* src/UTMetadataRequestExtensionMessage.h
	* src/UTPexExtensionMessage.cc
	* src/UTPexExtensionMessage.h
	* test/HandshakeExtensionMessageTest.cc
	* test/MockExtensionMessage.h
	* test/UTMetadataDataExtensionMessageTest.cc
	* test/UTMetadataRejectExtensionMessageTest.cc
	* test/UTMetadataRequestExtensionMessageTest.cc
	* test/UTPexExtensionMessageTest.cc

ChangeLog

@@ -1,3 +1,26 @@
+2009-11-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed ExtensionMessage::getBencodedData() as
+	ExtensionMessage::getPayload()
+	* src/BtExtendedMessage.cc
+	* src/ExtensionMessage.h
+	* src/HandshakeExtensionMessage.cc
+	* src/HandshakeExtensionMessage.h
+	* src/UTMetadataDataExtensionMessage.cc
+	* src/UTMetadataDataExtensionMessage.h
+	* src/UTMetadataRejectExtensionMessage.cc
+	* src/UTMetadataRejectExtensionMessage.h
+	* src/UTMetadataRequestExtensionMessage.cc
+	* src/UTMetadataRequestExtensionMessage.h
+	* src/UTPexExtensionMessage.cc
+	* src/UTPexExtensionMessage.h
+	* test/HandshakeExtensionMessageTest.cc
+	* test/MockExtensionMessage.h
+	* test/UTMetadataDataExtensionMessageTest.cc
+	* test/UTMetadataRejectExtensionMessageTest.cc
+	* test/UTMetadataRequestExtensionMessageTest.cc
+	* test/UTPexExtensionMessageTest.cc
+
 2009-11-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Updated man page for BitTorrent Magnet URI.

src/BtExtendedMessage.cc

@@ -73,7 +73,7 @@ const unsigned char* BtExtendedMessage::getMessage() {
      * extpayload --- extpayload, nbytes
      * total: 6+extpayload.length bytes
      */
-    std::string payload = _extensionMessage->getBencodedData();
+    std::string payload = _extensionMessage->getPayload();
     _msgLength = 6+payload.size();
     _msg = new unsigned char[_msgLength];
     bittorrent::createPeerMessageString(_msg, _msgLength, 2+payload.size(), ID);

src/ExtensionMessage.h

@@ -46,7 +46,7 @@ class ExtensionMessage {
 public:
   virtual ~ExtensionMessage() {}
 
-  virtual std::string getBencodedData() = 0;
+  virtual std::string getPayload() = 0;
 
   virtual uint8_t getExtensionMessageID() = 0;
   

src/HandshakeExtensionMessage.cc

@@ -57,7 +57,7 @@ HandshakeExtensionMessage::HandshakeExtensionMessage():
 
 HandshakeExtensionMessage::~HandshakeExtensionMessage() {}
 
-std::string HandshakeExtensionMessage::getBencodedData()
+std::string HandshakeExtensionMessage::getPayload()
 {
   BDE dict = BDE::dict();
   if(!_clientVersion.empty()) {

src/HandshakeExtensionMessage.h

@@ -68,7 +68,7 @@ public:
 
   virtual ~HandshakeExtensionMessage();
 
-  virtual std::string getBencodedData();
+  virtual std::string getPayload();
 
   virtual uint8_t getExtensionMessageID()
   {

src/UTMetadataDataExtensionMessage.cc

@@ -54,7 +54,7 @@ UTMetadataDataExtensionMessage::UTMetadataDataExtensionMessage
 (uint8_t extensionMessageID):UTMetadataExtensionMessage(extensionMessageID),
 			     _logger(LogFactory::getInstance()) {}
 
-std::string UTMetadataDataExtensionMessage::getBencodedData()
+std::string UTMetadataDataExtensionMessage::getPayload()
 {
   BDE dict = BDE::dict();
   dict["msg_type"] = 1;

src/UTMetadataDataExtensionMessage.h

@@ -63,7 +63,7 @@ private:
 public:
   UTMetadataDataExtensionMessage(uint8_t extensionMessageID);
 
-  virtual std::string getBencodedData();
+  virtual std::string getPayload();
 
   virtual std::string toString() const;
 

src/UTMetadataRejectExtensionMessage.cc

@@ -45,7 +45,7 @@ UTMetadataRejectExtensionMessage::UTMetadataRejectExtensionMessage
 (uint8_t extensionMessageID):
   UTMetadataExtensionMessage(extensionMessageID) {}
 
-std::string UTMetadataRejectExtensionMessage::getBencodedData()
+std::string UTMetadataRejectExtensionMessage::getPayload()
 {
   BDE dict = BDE::dict();
   dict["msg_type"] = 2;

src/UTMetadataRejectExtensionMessage.h

@@ -43,7 +43,7 @@ class UTMetadataRejectExtensionMessage:public UTMetadataExtensionMessage {
 public:
   UTMetadataRejectExtensionMessage(uint8_t extensionMessageID);
 
-  virtual std::string getBencodedData();
+  virtual std::string getPayload();
 
   virtual std::string toString() const;
 

src/UTMetadataRequestExtensionMessage.cc

@@ -56,7 +56,7 @@ namespace aria2 {
 UTMetadataRequestExtensionMessage::UTMetadataRequestExtensionMessage
 (uint8_t extensionMessageID):UTMetadataExtensionMessage(extensionMessageID) {}
 
-std::string UTMetadataRequestExtensionMessage::getBencodedData()
+std::string UTMetadataRequestExtensionMessage::getPayload()
 {
   BDE dict = BDE::dict();
   dict["msg_type"] = 0;

src/UTMetadataRequestExtensionMessage.h

@@ -56,7 +56,7 @@ private:
 public:
   UTMetadataRequestExtensionMessage(uint8_t extensionMessageID);
 
-  virtual std::string getBencodedData();
+  virtual std::string getPayload();
 
   virtual std::string toString() const;
 

src/UTPexExtensionMessage.cc

@@ -56,7 +56,7 @@ UTPexExtensionMessage::UTPexExtensionMessage(uint8_t extensionMessageID):
 
 UTPexExtensionMessage::~UTPexExtensionMessage() {}
 
-std::string UTPexExtensionMessage::getBencodedData()
+std::string UTPexExtensionMessage::getPayload()
 {
   std::pair<std::string, std::string> freshPeerPair =
     createCompactPeerListAndFlag(_freshPeers);

src/UTPexExtensionMessage.h

@@ -73,7 +73,7 @@ public:
 
   virtual ~UTPexExtensionMessage();
 
-  virtual std::string getBencodedData();
+  virtual std::string getPayload();
 
   virtual uint8_t getExtensionMessageID()
   {

test/HandshakeExtensionMessageTest.cc

@@ -68,11 +68,11 @@ void HandshakeExtensionMessageTest::testGetBencodedData()
 		 "13:metadata_sizei1024e"
 		 "1:pi6889e"
 		 "1:v5:aria2"
-		 "e"), msg.getBencodedData());
+		 "e"), msg.getPayload());
 
   msg.setMetadataSize(0);
   CPPUNIT_ASSERT
-    (msg.getBencodedData().find("metadata_size") == std::string::npos);
+    (msg.getPayload().find("metadata_size") == std::string::npos);
 }
 
 void HandshakeExtensionMessageTest::testToString()

test/MockExtensionMessage.h

@@ -30,7 +30,7 @@ public:
 
   virtual ~MockExtensionMessage() {}
 
-  virtual std::string getBencodedData()
+  virtual std::string getPayload()
   {
     return _data;
   }

test/UTMetadataDataExtensionMessageTest.cc

@@ -53,7 +53,7 @@ void UTMetadataDataExtensionMessageTest::testGetBencodedData()
   msg.setData(data);
   CPPUNIT_ASSERT_EQUAL
     (std::string("d8:msg_typei1e5:piecei1e10:total_sizei16384ee")+data,
-     msg.getBencodedData());
+     msg.getPayload());
 }
 
 void UTMetadataDataExtensionMessageTest::testToString()

test/UTMetadataRejectExtensionMessageTest.cc

@@ -38,7 +38,7 @@ void UTMetadataRejectExtensionMessageTest::testGetBencodedReject()
   UTMetadataRejectExtensionMessage msg(1);
   msg.setIndex(1);
   CPPUNIT_ASSERT_EQUAL
-    (std::string("d8:msg_typei2e5:piecei1ee"), msg.getBencodedData());
+    (std::string("d8:msg_typei2e5:piecei1ee"), msg.getPayload());
 }
 
 void UTMetadataRejectExtensionMessageTest::testToString()

test/UTMetadataRequestExtensionMessageTest.cc

@@ -86,7 +86,7 @@ void UTMetadataRequestExtensionMessageTest::testGetBencodedData()
   UTMetadataRequestExtensionMessage msg(1);
   msg.setIndex(99);
   CPPUNIT_ASSERT_EQUAL
-    (std::string("d8:msg_typei0e5:piecei99ee"), msg.getBencodedData());
+    (std::string("d8:msg_typei0e5:piecei99ee"), msg.getPayload());
 }
 
 void UTMetadataRequestExtensionMessageTest::testToString()

test/UTPexExtensionMessageTest.cc

@@ -93,7 +93,7 @@ void UTPexExtensionMessageTest::testGetBencodedData()
     "7:added.f2:207:dropped12:"+
     std::string(&c3[0], &c3[6])+std::string(&c4[0], &c4[6])+
     "e";
-  std::string bd = msg.getBencodedData();
+  std::string bd = msg.getPayload();
   CPPUNIT_ASSERT_EQUAL(util::urlencode(expected),
 		       util::urlencode(bd));
 }