From 15582ed8cdbfd58d86fc1d92e37c87d2664450cd Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 12 Mar 2009 15:54:43 +0000 Subject: 2009-03-13 Tatsuhiro Tsujikawa Refactored BtMessage subclasses. BtCancelMessage, BtRequestMessage and BtRejectMessage are derived from RangeBtMessage class. BtAllowedFastMessage, BtHaveMessage and BtSuggestPieceMessage are derived from IndexBtMessage class. BtChokeMessage, BtHaveAllMessage, BtHaveNoneMessage, BtInterestedMessage, BtNotInterestedMessage and BtUnchokeMessage are derived from ZeroBtMessage class. * src/AbstractBtMessage.cc * src/AbstractBtMessage.h * src/BtAllowedFastMessage.cc * src/BtAllowedFastMessage.h * src/BtAllowedFastMessageValidator.h: Removed * src/BtBitfieldMessage.cc * src/BtBitfieldMessage.h * src/BtCancelMessage.cc * src/BtCancelMessage.h * src/BtCancelMessageValidator.h: Removed * src/BtChokeMessage.cc * src/BtChokeMessage.h * src/BtExtendedMessage.cc * src/BtExtendedMessage.h * src/BtHandshakeMessage.cc * src/BtHandshakeMessage.h * src/BtHaveAllMessage.cc * src/BtHaveAllMessage.h * src/BtHaveMessage.cc * src/BtHaveMessage.h * src/BtHaveMessageValidator.h: Removed * src/BtHaveNoneMessage.cc * src/BtHaveNoneMessage.h * src/BtInterestedMessage.cc * src/BtInterestedMessage.h * src/BtKeepAliveMessage.cc * src/BtKeepAliveMessage.h * src/BtNotInterestedMessage.cc * src/BtNotInterestedMessage.h * src/BtPieceMessage.cc * src/BtPieceMessage.h * src/BtPortMessage.cc * src/BtPortMessage.h * src/BtRejectMessage.cc * src/BtRejectMessage.h * src/BtRejectMessageValidator.h: Removed * src/BtRequestMessage.cc * src/BtRequestMessage.h * src/BtRequestMessageValidator.h: Removed * src/BtSuggestPieceMessage.cc * src/BtSuggestPieceMessage.h * src/BtSuggestPieceMessageValidator.h: Removed * src/BtUnchokeMessage.cc * src/BtUnchokeMessage.h * src/DefaultBtMessageFactory.cc * src/IndexBtMessage.cc * src/IndexBtMessage.h * src/IndexBtMessageValidator.h * src/Makefile.am * src/PeerMessageUtil.cc * src/PeerMessageUtil.h * src/RangeBtMessage.cc * src/RangeBtMessage.h * src/RangeBtMessageValidator.h * src/SimpleBtMessage.cc * src/SimpleBtMessage.h * src/ZeroBtMessage.cc * src/ZeroBtMessage.h * test/BtRequestMessageTest.cc --- src/BtHaveNoneMessage.h | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/BtHaveNoneMessage.h') diff --git a/src/BtHaveNoneMessage.h b/src/BtHaveNoneMessage.h index 4aaee64c..90a4619d 100644 --- a/src/BtHaveNoneMessage.h +++ b/src/BtHaveNoneMessage.h @@ -35,7 +35,7 @@ #ifndef _D_BT_HAVE_NONE_MESSAGE_H_ #define _D_BT_HAVE_NONE_MESSAGE_H_ -#include "SimpleBtMessage.h" +#include "ZeroBtMessage.h" namespace aria2 { @@ -43,29 +43,17 @@ class BtHaveNoneMessage; typedef SharedHandle BtHaveNoneMessageHandle; -class BtHaveNoneMessage : public SimpleBtMessage { -private: - unsigned char* msg; - - static const size_t MESSAGE_LENGTH = 5; +class BtHaveNoneMessage : public ZeroBtMessage { public: - BtHaveNoneMessage():SimpleBtMessage(ID), msg(0) {} - - virtual ~BtHaveNoneMessage() { - delete [] msg; - } - + BtHaveNoneMessage():ZeroBtMessage(ID, NAME) {} static const uint8_t ID = 15; - static BtHaveNoneMessageHandle create(const unsigned char* data, size_t dataLength); - - virtual void doReceivedAction(); - - virtual const unsigned char* getMessage(); + static const std::string NAME; - virtual size_t getMessageLength(); + static SharedHandle create + (const unsigned char* data, size_t dataLength); - virtual std::string toString() const; + virtual void doReceivedAction(); }; } // namespace aria2 -- cgit