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

1 files changed, 0 insertions, 98 deletions

diff --git a/src/PeerMessageUtil.h b/src/PeerMessageUtil.h
deleted file mode 100644
index 1df121b0..00000000
--- a/src/PeerMessageUtil.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_PEER_MESSAGE_UTIL_H_
-#define _D_PEER_MESSAGE_UTIL_H_
-
-#include "common.h"
-#include <string>
-#include <utility>
-
-namespace aria2 {
-
-class PeerMessageUtil {
-private:
-  PeerMessageUtil() {}
-public:
-  static uint32_t getIntParam(const unsigned char* msg, size_t pos);
-
-  static uint16_t getShortIntParam(const unsigned char* msg, size_t pos);
-
-  static void setIntParam(unsigned char* dest, uint32_t param);
-
-  static void setShortIntParam(unsigned char* dest, uint16_t param);
-
-  static uint8_t getId(const unsigned char* msg);
-  
-  static void checkIndex(size_t index, size_t pieces);
-  static void checkBegin(uint32_t begin, size_t pieceLength);
-  static void checkLength(size_t length);
-  static void checkRange(uint32_t begin, size_t length, size_t pieceLength);
-  static void checkBitfield(const unsigned char* bitfield,
-			    size_t bitfieldLength,
-			    size_t pieces);
-
-  static void createPeerMessageString(unsigned char* msg,
-				      size_t msgLength,
-				      size_t payloadLength,
-				      uint8_t messageId);
-
-  /**
-   * Creates compact tracker format(6bytes for ipv4 address and port)
-   * and stores the results in compact.
-   * compact must be at least 6 bytes and pre-allocated.
-   * Returns true if creation is successful, otherwise returns false.
-   * The example of failure reason is that addr is not numbers-and-dots
-   * notation.
-   */
-  static bool createcompact(unsigned char* compact, const std::string& addr, uint16_t port);
-
-  static std::pair<std::string, uint16_t> unpackcompact(const unsigned char* compact);
-
-  // Throws exception if threshold >= actual
-  static void assertPayloadLengthGreater(size_t threshold, size_t actual,
-					 const std::string& msgName);
-
-  // Throws exception if expected != actual
-  static void assertPayloadLengthEqual(size_t expected, size_t actual,
-				       const std::string& msgName);
-
-  // Throws exception if expected is not equal to id from data.
-  static void assertID(uint8_t expected, const unsigned char* data,
-		       const std::string& msgName);
-};
-
-} // namespace aria2
-
-#endif // _D_PEER_MESSAGE_UTIL_H_