2007-12-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Added uTorrent compatible Peer Exchange.
	* src/BencodeVisitor.{h, cc}
	* test/BencodeVisitorTest.cc
	* src/BtConstants.h
	* src/BtContext.h: Added 'private' flag.
	* src/BtExtendedMessage.{h, cc}
	* test/BtExtendedMessageTest.cc
	* src/BtHandshakeMessage.{h, cc}: Set extended messaging bit in
	reserved field.
	* test/BtHandshakeMessageTest.cc
	* src/BtMessageFactory.h
	* src/BtRegistry.h
	* src/BtRuntime.h: This class holds default extension message 
IDs for
	aria2. By default, aria2 uses ID 8 for ut_pex.
	* src/DefaultBtContext.cc
	* src/DefaultBtInteractive.{h, cc}: This class holds 
_utPexEnabled.
	When it is true, aria2 enables ut_pex. This value is set by
	PeerInteractionCommand.
	* src/DefaultBtMessageFactory.{h, cc}
	* test/DefaultBtMessageFactoryTest.cc
	* src/DefaultBtMessageReceiver.cc: Moved the code of fast 
extension
	handling to DefaultBtInteractive class.
	* src/DefaultExtensionMessageFactory.{h, cc}
	* test/DefaultExtensionMessageFactoryTest.cc
	* src/DefaultPeerStorage.cc: Returns false if a peer is already 
in
	the container(peers and incomingPeers. The equality is 
determined by
	Peer::id).
	* test/DefaultPeerStorageTest.cc
	* src/ExtensionMessage.h
	* test/MockExtensionMessage.h
	* src/ExtensionMessageFactory.h
	* test/MockExtensionMessageFactory.h
	* src/HandshakeExtensionMessage.{h, cc}
	* test/HandshakeExtensionMessageTest.cc
	* src/MetaEntry.h
	* src/Peer.{h, cc}
	* src/PeerInteractionCommand.cc
	* src/PeerReceiveHandshakeCommand.cc: Evaluate the return value 
of
	addIncomingPeer.
	* src/PeerMessageUtil.{h, cc}
	* src/PeerObject.h
	* src/UTPexExtensionMessage.{h, cc}
	* test/UTPexExtensionMessageTest.cc
	* src/message.h
	* src/prefs.h

	Fixed the bug that returns incomplete data when it contains null
	character. A convenient constructor was also added.
	* src/Data.{h, cc}

	Rewritten.
	* src/CompactPeerListProcessor.cc

	Fixed typos.
	* src/message.h
	* src/MetaFileUtil.cc

1 files changed, 115 insertions, 0 deletions

diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc
new file mode 100644
index 00000000..257e45a2
--- /dev/null
+++ b/src/BtExtendedMessage.cc
@@ -0,0 +1,115 @@
+/* <!-- 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 --> */
+#include "BtExtendedMessage.h"
+#include "BtRegistry.h"
+#include "ExtensionMessage.h"
+#include "PeerMessageUtil.h"
+#include "DlAbortEx.h"
+#include "message.h"
+#include "Util.h"
+
+BtExtendedMessage::BtExtendedMessage(const ExtensionMessageHandle& extensionMessage):_extensionMessage(extensionMessage), _msg(0), _msgLength(0)
+{}
+
+BtExtendedMessage::~BtExtendedMessage()
+{
+  delete [] _msg;
+}
+
+const unsigned char* BtExtendedMessage::getMessage() {
+  if(!_msg) {
+    /**
+     * len --- 2+extpayload.length, 4bytes
+     * id --- 20, 1byte
+     * extmsgid --- extmsgid, 1byte
+     * extpayload --- extpayload, nbytes
+     * total: 6+extpayload.length bytes
+     */
+    string payload = _extensionMessage->getBencodedData();
+    _msgLength = 6+payload.size();
+    _msg = new unsigned char[_msgLength];
+    PeerMessageUtil::createPeerMessageString(_msg, _msgLength, 2+payload.size(), ID);
+    *(_msg+5) = _extensionMessage->getExtensionMessageID();
+    memcpy(_msg+6, payload.c_str(), payload.size());
+  }
+  return _msg;
+}
+
+int32_t BtExtendedMessage::getMessageLength() {
+  getMessage();
+  return _msgLength;
+}
+
+bool BtExtendedMessage::sendPredicate() const
+{
+  return peer->isExtendedMessagingEnabled();
+}
+
+string BtExtendedMessage::toString() const {
+  return "extended "+_extensionMessage->toString();
+}
+
+BtExtendedMessageHandle
+BtExtendedMessage::create(const BtContextHandle& btContext,
+			  const PeerHandle& peer,
+			  const char* data, size_t dataLength)
+{
+  if(dataLength < 2) {
+    throw new DlAbortEx(MSG_TOO_SMALL_PAYLOAD_SIZE, "extended", dataLength);
+  }
+  int8_t id = PeerMessageUtil::getId((const unsigned char*)data);
+  if(id != ID) {
+    throw new DlAbortEx(EX_INVALID_BT_MESSAGE_ID, id, "extended", ID);
+  }
+  ExtensionMessageFactoryHandle factory = EXTENSION_MESSAGE_FACTORY(btContext,
+								    peer);
+  assert(!factory.isNull());
+  ExtensionMessageHandle extmsg = factory->createMessage(data+1,
+							 dataLength-1);
+  BtExtendedMessageHandle message = new BtExtendedMessage(extmsg);
+  return message;
+}
+
+void BtExtendedMessage::doReceivedAction()
+{
+  if(!_extensionMessage.isNull()) {
+    _extensionMessage->doReceivedAction();
+  }
+}
+
+ExtensionMessageHandle BtExtendedMessage::getExtensionMessage() const
+{
+  return _extensionMessage;
+}