diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-09-29 14:52:42 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-09-29 14:52:42 +0000 |
| commit | 99654e41602787e0083740bf8c88eee426ce4a76 (patch) | |
| tree | bfdbd10ac9c951924855f1dbd41e664d41132e40 /src/BtExtendedMessage.cc | |
| parent | 2e8b0d785e9e597cf0ee9cad9553714b1a9a4094 (diff) | |
2009-09-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Move all functions in PeerMessageUtil to bittorrent_helper.
* src/BtBitfieldMessage.cc
* src/BtBitfieldMessageValidator.h
* src/BtExtendedMessage.cc
* src/BtHandshakeMessage.cc
* src/BtHandshakeMessageValidator.h
* src/BtPieceMessage.cc
* src/BtPieceMessageValidator.h
* src/BtPortMessage.cc
* src/DHTFindNodeReplyMessage.cc
* src/DHTGetPeersReplyMessage.cc
* src/DHTMessageFactoryImpl.cc
* src/DHTRoutingTableDeserializer.cc
* src/DHTRoutingTableSerializer.cc
* src/DHTTokenTracker.cc
* src/DefaultBtMessageFactory.cc
* src/IndexBtMessage.cc
* src/IndexBtMessage.h
* src/IndexBtMessageValidator.h
* src/Makefile.am
* src/PeerMessageUtil.cc: Removed.
* src/PeerMessageUtil.h: Removed.
* src/RangeBtMessage.cc
* src/RangeBtMessage.h
* src/RangeBtMessageValidator.h
* src/UTPexExtensionMessage.cc
* src/ZeroBtMessage.cc
* src/ZeroBtMessage.h
* src/bittorrent_helper.cc
* src/bittorrent_helper.h
* test/BittorrentHelperTest.cc
* test/BtAllowedFastMessageTest.cc
* test/BtBitfieldMessageTest.cc
* test/BtCancelMessageTest.cc
* test/BtChokeMessageTest.cc
* test/BtExtendedMessageTest.cc
* test/BtHandshakeMessageTest.cc
* test/BtHaveAllMessageTest.cc
* test/BtHaveMessageTest.cc
* test/BtHaveNoneMessageTest.cc
* test/BtInterestedMessageTest.cc
* test/BtNotInterestedMessageTest.cc
* test/BtPieceMessageTest.cc
* test/BtPortMessageTest.cc
* test/BtRejectMessageTest.cc
* test/BtRequestMessageTest.cc
* test/BtSuggestPieceMessageTest.cc
* test/BtUnchokeMessageTest.cc
* test/DHTFindNodeReplyMessageTest.cc
* test/DHTGetPeersReplyMessageTest.cc
* test/DHTMessageFactoryImplTest.cc
* test/DHTRoutingTableDeserializerTest.cc
* test/DHTRoutingTableSerializerTest.cc
* test/DefaultBtMessageFactoryTest.cc
* test/DefaultExtensionMessageFactoryTest.cc
* test/Makefile.am
* test/PeerListProcessorTest.cc
* test/PeerMessageUtilTest.cc: Removed.
* test/UTPexExtensionMessageTest.cc
Diffstat (limited to 'src/BtExtendedMessage.cc')
| -rw-r--r-- | src/BtExtendedMessage.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc index 39d61028..913085ca 100644 --- a/src/BtExtendedMessage.cc +++ b/src/BtExtendedMessage.cc @@ -39,7 +39,7 @@ #include "ExtensionMessage.h" #include "ExtensionMessageFactory.h" -#include "PeerMessageUtil.h" +#include "bittorrent_helper.h" #include "Peer.h" #include "DlAbortEx.h" #include "message.h" @@ -76,7 +76,7 @@ const unsigned char* BtExtendedMessage::getMessage() { std::string payload = _extensionMessage->getBencodedData(); _msgLength = 6+payload.size(); _msg = new unsigned char[_msgLength]; - PeerMessageUtil::createPeerMessageString(_msg, _msgLength, 2+payload.size(), ID); + bittorrent::createPeerMessageString(_msg, _msgLength, 2+payload.size(), ID); *(_msg+5) = _extensionMessage->getExtensionMessageID(); memcpy(_msg+6, payload.c_str(), payload.size()); } @@ -102,8 +102,8 @@ BtExtendedMessage::create(const SharedHandle<ExtensionMessageFactory>& factory, const PeerHandle& peer, const unsigned char* data, size_t dataLength) { - PeerMessageUtil::assertPayloadLengthGreater(1, dataLength, NAME); - PeerMessageUtil::assertID(ID, data, NAME); + bittorrent::assertPayloadLengthGreater(1, dataLength, NAME); + bittorrent::assertID(ID, data, NAME); assert(!factory.isNull()); ExtensionMessageHandle extmsg = factory->createMessage(data+1, dataLength-1); |