diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-03-12 15:54:43 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-03-12 15:54:43 +0000 |
| commit | 15582ed8cdbfd58d86fc1d92e37c87d2664450cd (patch) | |
| tree | 405e75ec596ae46ac889ae9b0ac8f611c538d0b1 /src/BtPortMessage.cc | |
| parent | 371ef954d5390ada5e9debd9652e982b1b225be7 (diff) | |
2009-03-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
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
Diffstat (limited to 'src/BtPortMessage.cc')
| -rw-r--r-- | src/BtPortMessage.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/BtPortMessage.cc b/src/BtPortMessage.cc index f4d3c6b3..4367ee6a 100644 --- a/src/BtPortMessage.cc +++ b/src/BtPortMessage.cc @@ -48,8 +48,10 @@ namespace aria2 { +const std::string BtPortMessage::NAME("port"); + BtPortMessage::BtPortMessage(uint16_t port): - SimpleBtMessage(ID), _port(port), _msg(0) {} + SimpleBtMessage(ID, NAME), _port(port), _msg(0) {} BtPortMessage::~BtPortMessage() { @@ -58,15 +60,8 @@ BtPortMessage::~BtPortMessage() SharedHandle<BtPortMessage> BtPortMessage::create(const unsigned char* data, size_t dataLength) { - if(dataLength != 3) { - throw DlAbortEx - (StringFormat(EX_INVALID_PAYLOAD_SIZE, "port", dataLength, 3).str()); - } - uint8_t id = PeerMessageUtil::getId(data); - if(id != ID) { - throw DlAbortEx - (StringFormat(EX_INVALID_BT_MESSAGE_ID, id, "piece", ID).str()); - } + PeerMessageUtil::assertPayloadLengthEqual(3, dataLength, NAME); + PeerMessageUtil::assertID(ID, data, NAME); uint16_t port = PeerMessageUtil::getShortIntParam(data, 1); SharedHandle<BtPortMessage> message(new BtPortMessage(port)); return message; @@ -114,7 +109,7 @@ size_t BtPortMessage::getMessageLength() { } std::string BtPortMessage::toString() const { - return "port port="+Util::uitos(_port); + return NAME+" port="+Util::uitos(_port); } void BtPortMessage::setLocalNode(const WeakHandle<DHTNode>& localNode) |