From cd9e35bc632dd4a4bb6a543266803e34376e7964 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 25 Jan 2007 16:47:29 +0000 Subject: 2007-01-26 Tatsuhiro Tsujikawa * src/message.h: Added EX_INVALID_PAYLOAD_SIZE and EX_INVALID_BT_MESSAGE_ID. Following source files affected. * src/BtAllowedFastMessage.cc: * src/BtBitfieldMessage.cc * src/BtCancelMessage.cc * src/BtChokeMessage.cc * src/BtHaveAllMessage.cc * src/BtHaveMessage.cc * src/BtHaveNoneMessage.cc * src/BtInterestedMessage.cc * src/BtNotInterestedMessage.cc * src/BtPieceMessage.cc * src/BtPortMessage.cc * src/BtRejectMessage.cc * src/BtRequestMessage.cc * src/BtSuggestPieceMessage.cc * src/BtUnchokeMessage.cc * src/message.h: Added EX_INVALID_CHUNK_CHECKSUM. Following source files are affected. * src/ChunkChecksumValidator.cc * src/SegmentMan.cc --- src/BtSuggestPieceMessage.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/BtSuggestPieceMessage.cc') diff --git a/src/BtSuggestPieceMessage.cc b/src/BtSuggestPieceMessage.cc index 79ce496c..04f7b6ff 100644 --- a/src/BtSuggestPieceMessage.cc +++ b/src/BtSuggestPieceMessage.cc @@ -36,22 +36,22 @@ #include "PeerMessageUtil.h" #include "Util.h" #include "DlAbortEx.h" +#include "message.h" -BtSuggestPieceMessageHandle BtSuggestPieceMessage::create(const unsigned char* data, uint32_t dataLength) { +BtSuggestPieceMessageHandle BtSuggestPieceMessage::create(const unsigned char* data, int32_t dataLength) { if(dataLength != 5) { - throw new DlAbortEx("invalid payload size for %s, size = %u. It should be %d", "suggest piece", dataLength, 5); + throw new DlAbortEx(EX_INVALID_PAYLOAD_SIZE, "suggest piece", dataLength, 5); } - uint8_t id = PeerMessageUtil::getId(data); + int8_t id = PeerMessageUtil::getId(data); if(id != ID) { - throw new DlAbortEx("invalid ID=%u for %s. It should be %d.", - id, "suggest piece", ID); + throw new DlAbortEx(EX_INVALID_BT_MESSAGE_ID, id, "suggest piece", ID); } BtSuggestPieceMessageHandle message = new BtSuggestPieceMessage(); message->setIndex(PeerMessageUtil::getIntParam(data, 1)); return message; } -uint32_t BtSuggestPieceMessage::MESSAGE_LENGTH = 9; +int32_t BtSuggestPieceMessage::MESSAGE_LENGTH = 9; const unsigned char* BtSuggestPieceMessage::getMessage() { if(!msg) { @@ -68,7 +68,7 @@ const unsigned char* BtSuggestPieceMessage::getMessage() { return msg; } -uint32_t BtSuggestPieceMessage::getMessageLength() { +int32_t BtSuggestPieceMessage::getMessageLength() { return MESSAGE_LENGTH; } -- cgit