diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-01-25 16:47:29 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-01-25 16:47:29 +0000 |
| commit | cd9e35bc632dd4a4bb6a543266803e34376e7964 (patch) | |
| tree | 6042dd0473d1ca7ba845a35fb79745011f7ead7e /src/DefaultBtMessageFactory.cc | |
| parent | 139f46332e0472546cef1dcc31abf98ab0ca93f5 (diff) | |
2007-01-26 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* 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
Diffstat (limited to 'src/DefaultBtMessageFactory.cc')
| -rw-r--r-- | src/DefaultBtMessageFactory.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/DefaultBtMessageFactory.cc b/src/DefaultBtMessageFactory.cc index e2f29bbe..52c546fd 100644 --- a/src/DefaultBtMessageFactory.cc +++ b/src/DefaultBtMessageFactory.cc @@ -63,14 +63,14 @@ #include "BtHandshakeMessageValidator.h" BtMessageHandle -DefaultBtMessageFactory::createBtMessage(const unsigned char* data, uint32_t dataLength) +DefaultBtMessageFactory::createBtMessage(const unsigned char* data, int32_t dataLength) { AbstractBtMessageHandle msg(0); if(dataLength == 0) { // keep-alive msg = new BtKeepAliveMessage(); } else { - uint8_t id = PeerMessageUtil::getId(data); + int8_t id = PeerMessageUtil::getId(data); switch(id) { case BtChokeMessage::ID: msg = BtChokeMessage::create(data, dataLength); @@ -162,7 +162,7 @@ DefaultBtMessageFactory::createBtMessage(const unsigned char* data, uint32_t dat break; } default: - throw new DlAbortEx("Invalid message id. id = %u", id); + throw new DlAbortEx("Invalid message ID. id=%d", id); } } setCommonProperty(msg); @@ -180,7 +180,7 @@ void DefaultBtMessageFactory::setCommonProperty(const AbstractBtMessageHandle& m } BtMessageHandle -DefaultBtMessageFactory::createHandshakeMessage(const unsigned char* data, uint32_t dataLength) +DefaultBtMessageFactory::createHandshakeMessage(const unsigned char* data, int32_t dataLength) { BtHandshakeMessageHandle msg = BtHandshakeMessage::create(data, dataLength); BtMessageValidatorHandle validator = @@ -222,7 +222,7 @@ DefaultBtMessageFactory::createRequestMessage(const PieceHandle& piece, int32_t } BtMessageHandle -DefaultBtMessageFactory::createCancelMessage(int32_t index, int32_t begin, uint32_t length) +DefaultBtMessageFactory::createCancelMessage(int32_t index, int32_t begin, int32_t length) { BtCancelMessageHandle msg = new BtCancelMessage(index, begin, length); BtMessageValidatorHandle validator = @@ -235,7 +235,7 @@ DefaultBtMessageFactory::createCancelMessage(int32_t index, int32_t begin, uint3 } BtMessageHandle -DefaultBtMessageFactory::createPieceMessage(int32_t index, int32_t begin, uint32_t length) +DefaultBtMessageFactory::createPieceMessage(int32_t index, int32_t begin, int32_t length) { BtPieceMessageHandle msg = new BtPieceMessage(index, begin, length); BtMessageValidatorHandle validator = @@ -326,7 +326,7 @@ DefaultBtMessageFactory::createHaveNoneMessage() } BtMessageHandle -DefaultBtMessageFactory::createRejectMessage(int32_t index, int32_t begin, uint32_t length) +DefaultBtMessageFactory::createRejectMessage(int32_t index, int32_t begin, int32_t length) { BtRejectMessageHandle msg = new BtRejectMessage(index, begin, length); BtMessageValidatorHandle validator = |